From 43f1513cedda5418f4f7c4b783c7b5d3c4a779b8 Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Thu, 27 Jan 2022 21:20:20 +0200
Subject: [PATCH] file table last modified

---
 .../added-column/added-column.component.html         |  3 ---
 .../added-column/added-column.component.ts           | 12 ------------
 .../date-column/date-column.component.html           |  3 +++
 .../date-column.component.scss}                      |  0
 .../table-item/date-column/date-column.component.ts  | 12 ++++++++++++
 .../components/table-item/table-item.component.html  |  6 +++++-
 .../screens/dossier-overview/config.service.ts       |  6 +++---
 .../dossier-overview/dossier-overview.module.ts      |  4 ++--
 8 files changed, 25 insertions(+), 21 deletions(-)
 delete mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.html
 delete mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.ts
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html
 rename apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/{added-column/added-column.component.scss => date-column/date-column.component.scss} (100%)
 create mode 100644 apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts

diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.html
deleted file mode 100644
index b26d7ba2d..000000000
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div [class.error]="file.isError" class="small-label">
-    {{ file.added | date: 'd MMM. yyyy, hh:mm a' }}
-</div>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.ts
deleted file mode 100644
index 594582c75..000000000
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.ts
+++ /dev/null
@@ -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;
-}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html
new file mode 100644
index 000000000..e534759a1
--- /dev/null
+++ b/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>
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.scss b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss
similarity index 100%
rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/added-column/added-column.component.scss
rename to apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts
new file mode 100644
index 000000000..d36317fb8
--- /dev/null
+++ b/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;
+}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html
index 501c43b8c..2d09dd745 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/table-item.component.html
+++ b/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.lastUpdated" [isError]="file.isError"></redaction-date-column>
 </div>
 
 <div *ngFor="let config of displayedAttributes" class="cell">
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
index 97879792f..564fecf6e 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
+++ b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/config.service.ts
@@ -127,12 +127,12 @@ export class ConfigService {
                 width: '3fr',
             },
             {
-                label: _('dossier-overview.table-col-name.last-modified'),
+                label: _('dossier-overview.table-col-names.added-on'),
+                sortByKey: 'added',
                 width: '2fr',
             },
             {
-                label: _('dossier-overview.table-col-names.added-on'),
-                sortByKey: 'added',
+                label: _('dossier-overview.table-col-names.last-modified'),
                 width: '2fr',
             },
             ...dynamicColumns,
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts b/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts
index 57f081d3b..0b9582d02 100644
--- a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/dossier-overview.module.ts
+++ b/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],