diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html index d3dc3d53e..513b08b53 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html +++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.html @@ -12,10 +12,10 @@
- {{ dossier.isSoftDeleted ? dossierStats.numberOfSoftDeletedFiles : dossierStats.numberOfFiles }} + {{ isSoftDeleted ? dossierStats.numberOfSoftDeletedFiles : dossierStats.numberOfFiles }}
-
+
{{ dossierStats.numberOfPages }}
@@ -27,11 +27,11 @@
- {{ dossier.date | date : 'mediumDate' }} + {{ dossier.date | date: 'mediumDate' }}
- {{ dossier.dueDate | date : 'mediumDate' }} + {{ dossier.dueDate | date: 'mediumDate' }}
diff --git a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts index b2178e0c7..5e70b9258 100644 --- a/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts +++ b/apps/red-ui/src/app/modules/shared/components/dossier-name-column/dossier-name-column.component.ts @@ -16,7 +16,7 @@ export interface PartialDossier extends Partial { readonly dueDate?: string; readonly date?: string; readonly memberIds: List; - readonly isSoftDeleted: boolean; + readonly softDeletedTime?: string; } @Component({ @@ -40,6 +40,10 @@ export class DossierNameColumnComponent { return this.#dueDateDaysDiff < 0; } + get isSoftDeleted(): boolean { + return !!this.dossier.softDeletedTime; + } + get #dueDateDaysDiff(): number { return dateWithoutTime(dayjs(this.dossier.dueDate)).diff(dateWithoutTime(dayjs()), 'day'); }