No status assigned
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
index 96710947d..61f1e16da 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-status/dossiers-listing-status.component.ts
@@ -1,7 +1,7 @@
import { ChangeDetectionStrategy, Component, Input, OnChanges } from '@angular/core';
import { Dossier, DossierStats } from '../../../../../../../../../../libs/red-domain/src';
import { DossierStateService } from '../../../../../../services/entity-services/dossier-state.service';
-import { DossierState } from '../../../../../../../../../../libs/red-domain/src/lib/dossier-state';
+import { DossierState } from '@red/domain';
@Component({
selector: 'redaction-dossiers-listing-status',
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
index 44a82f9ee..a3c2edc54 100644
--- 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
@@ -1,6 +1,6 @@
import { Injectable, Injector } from '@angular/core';
-import { EntitiesService, mapEach, RequiredParam, Validate } from '../../../../../../libs/common-ui/src';
-import { DossierState, IDossierState } from '../../../../../../libs/red-domain/src/lib/dossier-state';
+import { EntitiesService, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
+import { DossierState, IDossierState } from '@red/domain';
import { forkJoin, Observable, switchMap } from 'rxjs';
import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service';
import { map, tap } from 'rxjs/operators';
diff --git a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
index 234707713..4787fdb30 100644
--- a/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
+++ b/apps/red-ui/src/app/services/entity-services/dossiers.service.ts
@@ -62,17 +62,7 @@ export class DossiersService extends EntitiesService
{
}
loadAllIfChanged(): Observable {
- return this.hasChangesDetails$().pipe(
- catchError(err => {
- console.log('aaa', err);
- return of(err);
- }),
- switchMap(changes => this.loadAll().pipe(mapTo(changes))),
- catchError(err => {
- console.log('bbb', err);
- return of(err);
- }),
- );
+ return this.hasChangesDetails$().pipe(switchMap(changes => this.loadAll().pipe(mapTo(changes))));
}
hasChangesDetails$(): Observable {
diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json
index bcc13bfb7..8b5820cf6 100644
--- a/apps/red-ui/src/assets/i18n/en.json
+++ b/apps/red-ui/src/assets/i18n/en.json
@@ -73,8 +73,8 @@
},
"add-edit-dossier-state": {
"form": {
- "description": "Hex Color",
- "description-placeholder": "#",
+ "color": "Hex Color",
+ "color-placeholder": "#",
"name": "Status Name",
"name-placeholder": "Enter Name"
},
@@ -411,6 +411,7 @@
"confirm-delete-dossier-state": {
"cancel": "Cancel",
"delete-replace": "Delete and Replace",
+ "delete": "Delete only",
"form": {
"status": "Replace Status",
"status-placeholder": "Choose another status"
diff --git a/libs/red-domain/src/index.ts b/libs/red-domain/src/index.ts
index aee8ff159..e2d4bf0e4 100644
--- a/libs/red-domain/src/index.ts
+++ b/libs/red-domain/src/index.ts
@@ -19,3 +19,4 @@ export * from './lib/configuration';
export * from './lib/signature';
export * from './lib/legal-basis';
export * from './lib/dossier-stats';
+export * from './lib/dossier-state';
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
index 070171643..242a34ace 100644
--- a/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.model.ts
@@ -6,6 +6,7 @@ export class DossierState implements IDossierState, IListable {
readonly dossierStatusId: string;
readonly dossierTemplateId: string;
readonly name: string;
+ readonly color: string;
dossierCount?: number;
constructor(dossierState: IDossierState) {
@@ -13,6 +14,7 @@ export class DossierState implements IDossierState, IListable {
this.dossierStatusId = dossierState.dossierStatusId;
this.dossierTemplateId = dossierState.dossierTemplateId;
this.name = dossierState.name;
+ this.color = dossierState.color;
this.dossierCount = dossierState.dossierCount;
}
diff --git a/libs/red-domain/src/lib/dossier-state/dossier-state.ts b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
index 7ebd532e8..f7491e23b 100644
--- a/libs/red-domain/src/lib/dossier-state/dossier-state.ts
+++ b/libs/red-domain/src/lib/dossier-state/dossier-state.ts
@@ -3,5 +3,6 @@ export interface IDossierState {
dossierStatusId: string;
dossierTemplateId: string;
name: string;
+ color: string;
dossierCount?: number;
}