Pull request #341: RED-3268

Merge in RED/ui from RED-3268 to master

* commit '31f8b745730677e0b8b396dd7189dbb2f1f79c8d':
  annotationModificationDate instead of lastModified
  updated de.json
  file table last modified
  added column to config service

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.html

@@ -1,3 +0,0 @@
-<div [class.error]="file.isError" class="small-label">
-    {{ file.added | date: 'd MMM. yyyy, hh:mm a' }}
-</div>

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.ts

@@ -1,12 +0,0 @@
-import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
-import { File } from '@red/domain';
-
-@Component({
-    selector: 'redaction-added-column',
-    templateUrl: './added-column.component.html',
-    styleUrls: ['./added-column.component.scss'],
-    changeDetection: ChangeDetectionStrategy.OnPush,
-})
-export class AddedColumnComponent {
-    @Input() file: File;
-}

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html

@@ -0,0 +1,3 @@
+<div [class.error]="isError" class="small-label">
+    {{ date | date: 'd MMM. yyyy, hh:mm a' }}
+</div>

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts

@@ -0,0 +1,12 @@
+import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'redaction-date-column',
+    templateUrl: './date-column.component.html',
+    styleUrls: ['./date-column.component.scss'],
+    changeDetection: ChangeDetectionStrategy.OnPush,
+})
+export class DateColumnComponent {
+    @Input() isError: boolean;
+    @Input() date: string;
+}

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html

@@ -3,7 +3,11 @@
 </div>
 
 <div class="cell">
-    <redaction-added-column [file]="file"></redaction-added-column>
+    <redaction-date-column [date]="file.added" [isError]="file.isError"></redaction-date-column>
+</div>
+
+<div class="cell">
+    <redaction-date-column [date]="file.annotationModificationDate" [isError]="file.isError"></redaction-date-column>
 </div>
 
 <div *ngFor="let config of displayedAttributes" class="cell">

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts

@@ -131,6 +131,10 @@ export class ConfigService {
                 sortByKey: 'added',
                 width: '2fr',
             },
+            {
+                label: _('dossier-overview.table-col-names.last-modified'),
+                width: '2fr',
+            },
             ...dynamicColumns,
             {
                 label: _('dossier-overview.table-col-names.needs-work'),

apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts

@@ -17,7 +17,7 @@ import { WorkflowItemComponent } from './components/workflow-item/workflow-item.
 import { ScreenHeaderComponent } from './components/screen-header/screen-header.component';
 import { ViewModeSelectionComponent } from './components/view-mode-selection/view-mode-selection.component';
 import { FileNameColumnComponent } from './components/table-item/file-name-column/file-name-column.component';
-import { AddedColumnComponent } from './components/table-item/added-column/added-column.component';
+import { DateColumnComponent } from './components/table-item/date-column/date-column.component';
 import { BulkActionsService } from './services/bulk-actions.service';
 
 const routes: Routes = [
@@ -44,7 +44,7 @@ const routes: Routes = [
         ScreenHeaderComponent,
         ViewModeSelectionComponent,
         FileNameColumnComponent,
-        AddedColumnComponent,
+        DateColumnComponent,
     ],
     providers: [ConfigService, BulkActionsService],
     imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule],

apps/red-ui/src/assets/i18n/de.json

@@ -788,6 +788,7 @@
     },
     "table-col-names": {
       "added-on": "Hinzugefügt",
+      "last-modified": "",
       "assigned-to": "Zugewiesen an",
       "name": "Name",
       "needs-work": "Arbeitsvorrat",

apps/red-ui/src/assets/i18n/en.json

@@ -788,6 +788,7 @@
     },
     "table-col-names": {
       "added-on": "Added",
+      "last-modified": "Last modified on",
       "assigned-to": "Assigned to",
       "name": "Name",
       "needs-work": "Workload",

libs/red-domain/src/lib/files/file.model.ts

@@ -9,6 +9,7 @@ export class File extends Entity<IFile> implements IFile {
     readonly allManualRedactionsApplied: boolean;
     readonly analysisDuration?: number;
     readonly analysisRequired: boolean;
+    readonly annotationModificationDate?: string;
     readonly approvalDate?: string;
     readonly assignee?: string;
     readonly dictionaryVersion?: number;
@@ -60,6 +61,7 @@ export class File extends Entity<IFile> implements IFile {
         this.allManualRedactionsApplied = !!file.allManualRedactionsApplied;
         this.analysisDuration = file.analysisDuration;
         this.analysisRequired = !!file.analysisRequired && !file.excluded;
+        this.annotationModificationDate = file.annotationModificationDate;
         this.approvalDate = file.approvalDate;
         this.assignee = file.assignee;
         this.dictionaryVersion = file.dictionaryVersion;

libs/red-domain/src/lib/files/file.ts

@@ -32,6 +32,7 @@ export interface IFile {
     /**
      * Shows which dictionary versions was used during the analysis.
      */
+    readonly annotationModificationDate?: string;
     readonly dictionaryVersion?: number;
     /**
      * Shows which dossier dictionary versions was used during the analysis.