From 9d97e961e7cf3fa872136d3637b410989f96b85e Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Wed, 26 Jan 2022 20:34:12 +0200 Subject: [PATCH 1/4] added column to config service --- .../dossier/screens/dossier-overview/config.service.ts | 4 ++++ apps/red-ui/src/assets/i18n/en.json | 1 + 2 files changed, 5 insertions(+) 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 21df3658c..97879792f 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 @@ -126,6 +126,10 @@ export class ConfigService { sortByKey: 'searchKey', width: '3fr', }, + { + label: _('dossier-overview.table-col-name.last-modified'), + width: '2fr', + }, { label: _('dossier-overview.table-col-names.added-on'), sortByKey: 'added', diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index b17b42042..b0a867be1 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -786,6 +786,7 @@ }, "table-col-names": { "added-on": "Added", + "last-modified": "Last modified on", "assigned-to": "Assigned to", "name": "Name", "needs-work": "Workload", From 43f1513cedda5418f4f7c4b783c7b5d3c4a779b8 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Thu, 27 Jan 2022 21:20:20 +0200 Subject: [PATCH 2/4] 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 @@ -
- {{ file.added | date: 'd MMM. yyyy, hh:mm a' }} -
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 @@ +
+ {{ date | date: 'd MMM. yyyy, hh:mm a' }} +
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 @@
- + +
+ +
+
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], From 47fd10bc11e0d36a4ac655dd19eba958ff2f5bb1 Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Thu, 27 Jan 2022 21:47:37 +0200 Subject: [PATCH 3/4] updated de.json --- apps/red-ui/src/assets/i18n/de.json | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 5ab3ee049..33bd2c739 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/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", From 31f8b745730677e0b8b396dd7189dbb2f1f79c8d Mon Sep 17 00:00:00 2001 From: Edi Cziszter Date: Thu, 27 Jan 2022 21:57:45 +0200 Subject: [PATCH 4/4] annotationModificationDate instead of lastModified --- .../components/table-item/table-item.component.html | 2 +- libs/red-domain/src/lib/files/file.model.ts | 2 ++ libs/red-domain/src/lib/files/file.ts | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) 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 2d09dd745..23d443a1f 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 @@ -7,7 +7,7 @@
- +
diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index f57b0131a..ad1c1e501 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -9,6 +9,7 @@ export class File extends Entity 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 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; diff --git a/libs/red-domain/src/lib/files/file.ts b/libs/red-domain/src/lib/files/file.ts index fc40856ea..a93082aa8 100644 --- a/libs/red-domain/src/lib/files/file.ts +++ b/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.