diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html index 6dec76bb6..c37bd2a84 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-actions/dossiers-listing-actions.component.html @@ -12,7 +12,7 @@ *ngIf="currentUser.isUser" [tooltip]="(currentUser.isManager ? 'dossier-listing.edit.action' : 'dossier-listing.dossier-info.action') | translate" [type]="circleButtonTypes.dark" - [icon]="currentUser.isManager ? 'iqser:edit' : 'iqser:dossier-info'" + [icon]="currentUser.isManager ? 'iqser:edit' : 'red:info'" iqserHelpMode="edit-dossier-from-list" > diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html index 7f8d42a1e..c12eabe47 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.html @@ -9,28 +9,28 @@ -
-
+
+
{{ dossierStats.numberOfFiles }}
-
+
{{ dossierStats.numberOfPages }}
-
+
{{ dossier.memberIds.length }}
-
+
{{ dossier.date | date: 'mediumDate' }}
-
+
{{ dossier.dueDate | date: 'mediumDate' }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts index 5a270d9fc..3e5d2afc9 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/dossiers-listing-dossier-name/dossiers-listing-dossier-name.component.ts @@ -3,6 +3,9 @@ import { Dossier, DossierStats } from '@red/domain'; import { DossierTemplatesService } from '@services/entity-services/dossier-templates.service'; import { DossierStatsService } from '@services/entity-services/dossier-stats.service'; import { DossiersService } from '@services/entity-services/dossiers.service'; +import * as moment from 'moment'; + +const DUE_DATE_WARN_DAYS = 14; @Component({ selector: 'redaction-dossiers-listing-dossier-name', @@ -20,6 +23,18 @@ export class DossiersListingDossierNameComponent { private readonly _dossiersService: DossiersService, ) {} + get approachingDueDate(): boolean { + return this._dueDateDaysDiff >= 0 && this._dueDateDaysDiff <= DUE_DATE_WARN_DAYS; + } + + get passedDueDate(): boolean { + return this._dueDateDaysDiff < 0; + } + + private get _dueDateDaysDiff(): number { + return moment(this.dossier.dueDate).diff(moment(), 'days') + 1; + } + getDossierTemplateNameFor(dossierTemplateId: string): string { return this._dossierTemplatesService.find(dossierTemplateId).name; } diff --git a/libs/common-ui b/libs/common-ui index 3f1c419e0..5341338d3 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 3f1c419e0acdc92514b615611bdaa29e000a0b32 +Subproject commit 5341338d36d55b63fb0ff08b0d5779b80ed5902f diff --git a/package.json b/package.json index 3fb6881a0..e43b3cad2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "redaction", - "version": "3.143.0", + "version": "3.145.0", "private": true, "license": "MIT", "scripts": { diff --git a/paligo-theme.tar.gz b/paligo-theme.tar.gz index e07249f0a..64245b546 100644 Binary files a/paligo-theme.tar.gz and b/paligo-theme.tar.gz differ diff --git a/paligo-theme/paligo-styles/redacto-theme.css b/paligo-theme/paligo-styles/redacto-theme.css index 5ceef3777..fc5511db6 100644 --- a/paligo-theme/paligo-styles/redacto-theme.css +++ b/paligo-theme/paligo-styles/redacto-theme.css @@ -324,6 +324,7 @@ li.searchresultitem { --iqser-green-2: #5ce594; --iqser-yellow-1: #ffb83b; --iqser-yellow-2: #fdbd00; + --iqser-yellow-rgb: 253, 189, 0; --iqser-red-1: #dd4d50; --iqser-blue-5: #c5d3eb; --iqser-helpmode-primary: green;