Merge branch 'master' of ssh://git.iqser.com:2222/red/ui

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"
     ></iqser-circle-button>
 

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 @@
     </div>
 </div>
 
-<div class="small-label stats-subtitle">
+<div class="stats-subtitle">
-    <div>
+    <div class="small-label">
         <mat-icon svgIcon="iqser:document"></mat-icon>
         {{ dossierStats.numberOfFiles }}
     </div>
 
-    <div>
+    <div class="small-label">
         <mat-icon svgIcon="iqser:pages"></mat-icon>
         {{ dossierStats.numberOfPages }}
     </div>
 
-    <div>
+    <div class="small-label">
         <mat-icon svgIcon="red:user"></mat-icon>
         {{ dossier.memberIds.length }}
     </div>
 
-    <div>
+    <div class="small-label">
         <mat-icon svgIcon="red:calendar"></mat-icon>
         {{ dossier.date | date: 'mediumDate' }}
     </div>
 
-    <div *ngIf="dossier.dueDate">
+    <div *ngIf="dossier.dueDate" [class.error]="passedDueDate" [class.warn]="approachingDueDate" class="small-label">
         <mat-icon svgIcon="red:lightning"></mat-icon>
         {{ dossier.dueDate | date: 'mediumDate' }}
     </div>

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;
     }

libs/common-ui

@@ -1 +1 @@
-Subproject commit 3f1c419e0acdc92514b615611bdaa29e000a0b32
+Subproject commit 5341338d36d55b63fb0ff08b0d5779b80ed5902f

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.143.0",
+  "version": "3.145.0",
   "private": true,
   "license": "MIT",
   "scripts": {

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;