From 4c67355bb4e9061eaa101a75cdf6eae8cf351ad3 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Wed, 2 Feb 2022 14:13:27 +0200 Subject: [PATCH] wip states screen --- .../app/modules/admin/admin-routing.module.ts | 9 ++ .../admin-side-nav.component.ts | 1 + .../src/app/modules/admin/admin.module.ts | 16 +++- ...d-edit-dossier-state-dialog.component.html | 55 ++++++++++++ ...d-edit-dossier-state-dialog.component.scss | 5 ++ ...add-edit-dossier-state-dialog.component.ts | 45 ++++++++++ ...ssier-states-listing-screen.component.html | 78 +++++++++++++++++ ...ssier-states-listing-screen.component.scss | 14 ++++ ...dossier-states-listing-screen.component.ts | 84 +++++++++++++++++++ .../admin/services/admin-dialog.service.ts | 8 +- .../entity-services/dossier-state.service.ts | 17 ++++ .../entity-services/dossier-status.service.ts | 12 --- apps/red-ui/src/assets/i18n/de.json | 1 + apps/red-ui/src/assets/i18n/en.json | 33 ++++++++ .../lib/dossier-state/dossier-state.model.ts | 26 ++++++ .../dossier-state.ts} | 3 +- .../red-domain/src/lib/dossier-state/index.ts | 2 + .../dossier-status/dossier-status.model.ts | 24 ------ .../src/lib/dossier-status/index.ts | 2 - .../src/lib/dossiers/dossier.model.ts | 2 + libs/red-domain/src/lib/dossiers/dossier.ts | 1 + 21 files changed, 396 insertions(+), 42 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss create mode 100644 apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts create mode 100644 apps/red-ui/src/app/services/entity-services/dossier-state.service.ts delete mode 100644 apps/red-ui/src/app/services/entity-services/dossier-status.service.ts create mode 100644 libs/red-domain/src/lib/dossier-state/dossier-state.model.ts rename libs/red-domain/src/lib/{dossier-status/dossier-status.ts => dossier-state/dossier-state.ts} (63%) create mode 100644 libs/red-domain/src/lib/dossier-state/index.ts delete mode 100644 libs/red-domain/src/lib/dossier-status/dossier-status.model.ts delete mode 100644 libs/red-domain/src/lib/dossier-status/index.ts diff --git a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts index f4351eaed..6ce27d21f 100644 --- a/apps/red-ui/src/app/modules/admin/admin-routing.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin-routing.module.ts @@ -21,6 +21,7 @@ import { DossierTemplatesGuard } from '../../guards/dossier-templates.guard'; import { DICTIONARY_TYPE, DOSSIER_TEMPLATE_ID } from '@utils/constants'; import { DossierTemplateExistsGuard } from '../../guards/dossier-template-exists.guard'; import { DictionaryExistsGuard } from '../../guards/dictionary-exists.guard'; +import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component'; const routes: Routes = [ { path: '', redirectTo: 'dossier-templates', pathMatch: 'full' }, @@ -114,6 +115,14 @@ const routes: Routes = [ routeGuards: [AuthGuard, RedRoleGuard], }, }, + { + path: 'dossier-states', + component: DossierStatesListingScreenComponent, + canActivate: [CompositeRouteGuard], + data: { + routeGuards: [AuthGuard, RedRoleGuard, AppStateGuard], + }, + }, { path: 'default-colors', component: DefaultColorsScreenComponent, diff --git a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts index 7578ddd03..0be9e0c68 100644 --- a/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts +++ b/apps/red-ui/src/app/modules/admin/admin-side-nav/admin-side-nav.component.ts @@ -62,6 +62,7 @@ export class AdminSideNavComponent implements OnInit { { screen: 'watermark', label: _('watermark') }, { screen: 'file-attributes', label: _('file-attributes') }, { screen: 'dossier-attributes', label: _('dossier-attributes') }, + { screen: 'dossier-states', label: _('dossier-states') }, { screen: 'reports', label: _('reports') }, { screen: 'justifications', label: _('justifications') }, ], diff --git a/apps/red-ui/src/app/modules/admin/admin.module.ts b/apps/red-ui/src/app/modules/admin/admin.module.ts index c36811d81..10c37878c 100644 --- a/apps/red-ui/src/app/modules/admin/admin.module.ts +++ b/apps/red-ui/src/app/modules/admin/admin.module.ts @@ -46,6 +46,9 @@ import { SmtpFormComponent } from './screens/general-config/smtp-form/smtp-form. import { FileAttributesConfigurationsDialogComponent } from './dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; import { SharedAdminModule } from './shared/shared-admin.module'; import { BaseDossierTemplateScreenComponent } from './base-dossier-templates-screen/base-dossier-template-screen.component'; +import { DossierStatesListingScreenComponent } from './screens/dossier-states-listing/dossier-states-listing-screen.component'; +import { AddEditDossierStateDialogComponent } from './dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; +import { A11yModule } from '@angular/cdk/a11y'; const dialogs = [ AddEditDossierTemplateDialogComponent, @@ -95,8 +98,17 @@ const components = [ ]; @NgModule({ - declarations: [...components], + declarations: [...components, DossierStatesListingScreenComponent, AddEditDossierStateDialogComponent], providers: [AdminDialogService, AuditService, DigitalSignatureService, LicenseReportService, RulesService, SmtpConfigService], - imports: [CommonModule, SharedModule, AdminRoutingModule, SharedAdminModule, NgxChartsModule, ColorPickerModule, MonacoEditorModule], + imports: [ + CommonModule, + SharedModule, + AdminRoutingModule, + SharedAdminModule, + NgxChartsModule, + ColorPickerModule, + MonacoEditorModule, + A11yModule, + ], }) export class AdminModule {} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html new file mode 100644 index 000000000..7c0c7d695 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.html @@ -0,0 +1,55 @@ +
+
+ +
+
+
+ + +
+ +
+ + +
+ +
+
+
+ +
+ +
+
+ + +
diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss new file mode 100644 index 000000000..8bd9b16aa --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.scss @@ -0,0 +1,5 @@ +.iqser-input-group:nth-child(2) { + width: fit-content; + margin-top: 0; + margin-left: 16px; +} diff --git a/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts new file mode 100644 index 000000000..6e3193355 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component.ts @@ -0,0 +1,45 @@ +import { ChangeDetectionStrategy, Component, Inject, Injector } from '@angular/core'; +import { BaseDialogComponent } from '../../../../../../../../libs/common-ui/src'; +import { FormBuilder, FormGroup, Validators } from '@angular/forms'; +import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog'; +import { IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state'; + +interface DialogData { + dossierState: IDossierState; + dossierTemplateId: string; +} + +@Component({ + selector: 'redaction-add-edit-dossier-state-dialog', + templateUrl: './add-edit-dossier-state-dialog.component.html', + styleUrls: ['./add-edit-dossier-state-dialog.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class AddEditDossierStateDialogComponent extends BaseDialogComponent { + constructor( + private readonly _formBuilder: FormBuilder, + protected readonly _injector: Injector, + protected readonly _dialogRef: MatDialogRef, + @Inject(MAT_DIALOG_DATA) public data: DialogData, + ) { + super(_injector, _dialogRef); + this.form = this._getForm(data.dossierState); + this.initialFormValue = this.form.getRawValue(); + } + + save(): void { + const dossierState: IDossierState = { + dossierStatusId: this.data.dossierState?.dossierStatusId, + dossierTemplateId: this.data.dossierTemplateId, + ...this.form.getRawValue(), + }; + this._dialogRef.close(dossierState); + } + + private _getForm(dossierState: IDossierState): FormGroup { + return this._formBuilder.group({ + name: [dossierState?.name, Validators.required], + description: [dossierState?.description, Validators.required], + }); + } +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html new file mode 100644 index 000000000..74fd22735 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.html @@ -0,0 +1,78 @@ +
+
+ + +
+ + + +
+
+ +
+
+ + + +
+ +
+
+
+ + +
+ + + +
+ + + +
+
+
+
+
{{ state.name }}
+
+
+ +
+ {{ state.dossierCount }} +
+ +
+
+ +
+
+
+ diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss new file mode 100644 index 000000000..1df526cd4 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.scss @@ -0,0 +1,14 @@ +@use 'variables'; + +.dossier-state-square { + height: 16px; + width: 16px; + margin-right: 16px; +} + +.state-name { + font-size: 16px; + font-weight: 600; + line-height: 20px; + color: variables.$grey-1; +} diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts new file mode 100644 index 000000000..6aaa067f9 --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-states-listing/dossier-states-listing-screen.component.ts @@ -0,0 +1,84 @@ +import { ChangeDetectionStrategy, Component, forwardRef, Injector, OnDestroy, OnInit } from '@angular/core'; +import { + CircleButtonTypes, + DefaultListingServices, + IconButtonTypes, + ListingComponent, + LoadingService, + TableColumnConfig, +} from '../../../../../../../../libs/common-ui/src'; +import { DossierState, IDossierState } from '../../../../../../../../libs/red-domain/src/lib/dossier-state'; +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; +import { DossiersService } from '../../../../services/entity-services/dossiers.service'; +import { DossierStateService } from '../../../../services/entity-services/dossier-state.service'; +import { firstValueFrom } from 'rxjs'; +import { DossierTemplatesService } from '../../../../services/entity-services/dossier-templates.service'; +import { AdminDialogService } from '../../services/admin-dialog.service'; +import { UserService } from '../../../../services/user.service'; +import { AppStateService } from '../../../../state/app-state.service'; + +@Component({ + templateUrl: './dossier-states-listing-screen.component.html', + styleUrls: ['./dossier-states-listing-screen.component.scss'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + ...DefaultListingServices, + { provide: ListingComponent, useExisting: forwardRef(() => DossierStatesListingScreenComponent) }, + ], +}) +export class DossierStatesListingScreenComponent extends ListingComponent implements OnInit, OnDestroy { + readonly iconButtonTypes = IconButtonTypes; + readonly circleButtonTypes = CircleButtonTypes; + readonly currentUser = this._userService.currentUser; + readonly tableHeaderLabel = _('dossier-states-listing.table-header.title'); + readonly tableColumnConfigs: TableColumnConfig[] = [ + { label: _('dossier-states-listing.table-col-names.name'), sortByKey: 'searchKey' }, + { label: _('dossier-states-listing.table-col-names.dossiers-count'), sortByKey: 'dossierCount' }, + ]; + + constructor( + protected readonly _injector: Injector, + private readonly _loadingService: LoadingService, + private readonly _dossiersService: DossiersService, + private readonly _dossierStateService: DossierStateService, + private readonly _dossierTemplatesService: DossierTemplatesService, + private readonly _dialogService: AdminDialogService, + private readonly _userService: UserService, + private readonly _appStateService: AppStateService, + ) { + super(_injector); + } + + async ngOnInit(): Promise { + await this._loadData(); + } + + openAddEditStateDialog($event: MouseEvent, dossierState?: IDossierState) { + const data = { + dossierState, + dossierTemplateId: this._dossierTemplatesService.activeDossierTemplateId, + }; + this._dialogService.openDialog('addEditDossierState', $event, data, async (newValue: IDossierState) => { + await firstValueFrom(this._dossierStateService.setDossierState(newValue)); + await this._appStateService.refreshDossierTemplate(this._dossierTemplatesService.activeDossierTemplateId); + await this._loadData(); + }); + } + + private async _loadData() { + this._loadingService.start(); + + try { + const templateId = this._dossierTemplatesService.activeDossierTemplateId; + const dossierStates = await firstValueFrom(this._dossierStateService.loadAll(`dossier-status/dossier-template/${templateId}`)); + const dossiers = this._dossiersService.all; + dossierStates.forEach(state => { + state.dossierCount = dossiers.filter( + dossier => dossier.dossierStatusId === state.dossierStatusId && dossier.dossierTemplateId === templateId, + ).length; + }); + this.entitiesService.setEntities(dossierStates || []); + } catch (e) {} + this._loadingService.stop(); + } +} diff --git a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts index 1ee12ff67..ff3c3fb67 100644 --- a/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts +++ b/apps/red-ui/src/app/modules/admin/services/admin-dialog.service.ts @@ -13,6 +13,7 @@ import { AddEditDossierAttributeDialogComponent } from '../dialogs/add-edit-doss import { ConfirmationDialogComponent, DialogConfig, DialogService, largeDialogConfig } from '@iqser/common-ui'; import { UploadDictionaryDialogComponent } from '../dialogs/upload-dictionary-dialog/upload-dictionary-dialog.component'; import { FileAttributesConfigurationsDialogComponent } from '../dialogs/file-attributes-configurations-dialog/file-attributes-configurations-dialog.component'; +import { AddEditDossierStateDialogComponent } from '../dialogs/add-edit-dossier-state-dialog/add-edit-dossier-state-dialog.component'; type DialogType = | 'confirm' @@ -27,7 +28,9 @@ type DialogType = | 'smtpAuthConfig' | 'addEditDossierTemplate' | 'addEditDossierAttribute' - | 'uploadDictionary'; + | 'addEditJustification' + | 'uploadDictionary' + | 'addEditDossierState'; @Injectable() export class AdminDialogService extends DialogService { @@ -82,6 +85,9 @@ export class AdminDialogService extends DialogService { uploadDictionary: { component: UploadDictionaryDialogComponent, }, + addEditDossierState: { + component: AddEditDossierStateDialogComponent, + }, }; constructor(protected readonly _dialog: MatDialog) { diff --git a/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts new file mode 100644 index 000000000..d3be59e74 --- /dev/null +++ b/apps/red-ui/src/app/services/entity-services/dossier-state.service.ts @@ -0,0 +1,17 @@ +import { Injectable, Injector } from '@angular/core'; +import { EntitiesService, RequiredParam, Validate } from '../../../../../../libs/common-ui/src'; +import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state'; + +@Injectable({ + providedIn: 'root', +}) +export class DossierStateService extends EntitiesService { + constructor(protected readonly _injector: Injector) { + super(_injector, DossierState, 'dossier-status'); + } + + @Validate() + setDossierState(@RequiredParam() body: IDossierState) { + return this._post(body, this._defaultModelPath); + } +} diff --git a/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts b/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts deleted file mode 100644 index 7a97df2f7..000000000 --- a/apps/red-ui/src/app/services/entity-services/dossier-status.service.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Injectable, Injector } from '@angular/core'; -import { EntitiesService } from '../../../../../../libs/common-ui/src'; -import { DossierStatus, IDossierStatus } from '../../../../../../libs/red-domain/src/lib/dossier-status'; - -@Injectable({ - providedIn: 'root', -}) -export class DossierStatusService extends EntitiesService { - constructor(protected readonly _injector: Injector) { - super(_injector, DossierStatus, 'dossier-status'); - } -} diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 21819e941..b228549e1 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -605,6 +605,7 @@ "title": "Datei-Attribute anlegen" }, "dossier": "Dossier", + "dossier-states": "", "dossier-attribute-types": { "date": "Datum", "image": "Bild", diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 9a64201c7..993a08598 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -88,6 +88,16 @@ "save": "Save Dossier Template", "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Template" }, + "add-edit-dossier-state": { + "form": { + "name": "Status Name", + "name-placeholder": "Enter Name", + "description": "Hex Color", + "description-placeholder": "#" + }, + "save": "Save Status", + "title": "{type, select, edit{Edit {name}} create{Create} other{}} Dossier Status" + }, "add-edit-file-attribute": { "form": { "column-header": "CSV Column Header", @@ -612,6 +622,29 @@ "title": "Introduce File Attributes" }, "dossier": "Dossier", + "dossier-states": "Dossier States", + "dossier-states-listing": { + "action": { + "delete": "Delete Status", + "edit": "Edit Status" + }, + "search": "Search...", + "table-col-names": { + "name": "Name", + "dossiers-count": "Dossiers Count" + }, + "add-new": "New Status", + "table-header": { + "title": "{length} dossier {length, plural, one{state} other{states}}" + }, + "no-data": { + "action": "New State", + "title": "There are no dossier states." + }, + "no-match": { + "title": "No dossier states match your current filters." + } + }, "dossier-attribute-types": { "date": "Date", "image": "Image", diff --git a/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts new file mode 100644 index 000000000..070171643 --- /dev/null +++ b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts @@ -0,0 +1,26 @@ +import { IListable } from '@iqser/common-ui'; +import { IDossierState } from './dossier-state'; + +export class DossierState implements IDossierState, IListable { + readonly description: string; + readonly dossierStatusId: string; + readonly dossierTemplateId: string; + readonly name: string; + dossierCount?: number; + + constructor(dossierState: IDossierState) { + this.description = dossierState.description; + this.dossierStatusId = dossierState.dossierStatusId; + this.dossierTemplateId = dossierState.dossierTemplateId; + this.name = dossierState.name; + this.dossierCount = dossierState.dossierCount; + } + + get id(): string { + return this.dossierStatusId; + } + + get searchKey(): string { + return this.name; + } +} diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.ts similarity index 63% rename from libs/red-domain/src/lib/dossier-status/dossier-status.ts rename to libs/red-domain/src/lib/dossier-state/dossier-state.ts index ed8338a6a..7ebd532e8 100644 --- a/libs/red-domain/src/lib/dossier-status/dossier-status.ts +++ b/libs/red-domain/src/lib/dossier-state/dossier-state.ts @@ -1,6 +1,7 @@ -export interface IDossierStatus { +export interface IDossierState { description: string; dossierStatusId: string; dossierTemplateId: string; name: string; + dossierCount?: number; } diff --git a/libs/red-domain/src/lib/dossier-state/index.ts b/libs/red-domain/src/lib/dossier-state/index.ts new file mode 100644 index 000000000..166b90570 --- /dev/null +++ b/libs/red-domain/src/lib/dossier-state/index.ts @@ -0,0 +1,2 @@ +export * from './dossier-state'; +export * from './dossier-state.model'; diff --git a/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts b/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts deleted file mode 100644 index 1a5ed6609..000000000 --- a/libs/red-domain/src/lib/dossier-status/dossier-status.model.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { IDossierStatus } from './dossier-status'; -import { IListable } from '@iqser/common-ui'; - -export class DossierStatus implements IDossierStatus, IListable { - readonly description: string; - readonly dossierStatusId: string; - readonly dossierTemplateId: string; - readonly name: string; - - constructor(dossierStatus: IDossierStatus) { - this.description = dossierStatus.description; - this.dossierStatusId = dossierStatus.dossierStatusId; - this.dossierTemplateId = dossierStatus.dossierTemplateId; - this.name = dossierStatus.name; - } - - get id(): string { - return this.dossierStatusId; - } - - get searchKey(): string { - return this.name; - } -} diff --git a/libs/red-domain/src/lib/dossier-status/index.ts b/libs/red-domain/src/lib/dossier-status/index.ts deleted file mode 100644 index 1ec59b1ae..000000000 --- a/libs/red-domain/src/lib/dossier-status/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dossier-status'; -export * from './dossier-status.model'; diff --git a/libs/red-domain/src/lib/dossiers/dossier.model.ts b/libs/red-domain/src/lib/dossiers/dossier.model.ts index 8c8ab6e5b..e2a79d550 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.model.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.model.ts @@ -11,6 +11,7 @@ export class Dossier implements IDossier, IListable { readonly approverIds: List; readonly reportTemplateIds: List; readonly dossierName: string; + readonly dossierStatusId: string; readonly date: string; readonly dueDate?: string; readonly description?: string; @@ -29,6 +30,7 @@ export class Dossier implements IDossier, IListable { this.date = dossier.date; this.description = dossier.description; this.dossierName = dossier.dossierName; + this.dossierStatusId = dossier.dossierStatusId; this.dossierTemplateId = dossier.dossierTemplateId; this.downloadFileTypes = dossier.downloadFileTypes; this.dueDate = dossier.dueDate; diff --git a/libs/red-domain/src/lib/dossiers/dossier.ts b/libs/red-domain/src/lib/dossiers/dossier.ts index 9b4883801..1ff219033 100644 --- a/libs/red-domain/src/lib/dossiers/dossier.ts +++ b/libs/red-domain/src/lib/dossiers/dossier.ts @@ -7,6 +7,7 @@ export interface IDossier { readonly date: string; readonly description?: string; readonly dossierId: string; + readonly dossierStatusId: string; readonly dossierName: string; readonly dossierTemplateId: string; readonly downloadFileTypes?: List;