From c321209c321c8d3222e5b10f8185208444d4ca17 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Sat, 5 Mar 2022 20:51:36 +0200 Subject: [PATCH] show last redaction modification date --- .../components/table-item/table-item.component.html | 2 +- .../components/table-item/table-item.component.html | 7 ++++--- .../dossier/screens/dossiers-listing/config.service.ts | 2 +- apps/red-ui/src/assets/i18n/en.json | 2 +- .../src/lib/dossier-stats/dossier-stats.model.ts | 6 ++---- libs/red-domain/src/lib/dossier-stats/dossier-stats.ts | 1 - libs/red-domain/src/lib/files/file.model.ts | 6 +++--- libs/red-domain/src/lib/files/file.ts | 4 ++-- 8 files changed, 14 insertions(+), 16 deletions(-) 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 ac30d92cd..57dd7229a 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/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html index 7ada1bb64..606997852 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/components/table-item/table-item.component.html @@ -3,9 +3,10 @@
-
- -
+ + + +
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts index 98f52a70a..19ad1c220 100644 --- a/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts +++ b/apps/red-ui/src/app/modules/dossier/screens/dossiers-listing/config.service.ts @@ -26,7 +26,7 @@ export class ConfigService { get tableConfig(): TableColumnConfig[] { return [ { label: _('dossier-listing.table-col-names.name'), sortByKey: 'searchKey', width: '2fr' }, - { label: _('dossier-listing.table-col-names.last-modified') }, + // { label: _('dossier-listing.table-col-names.last-modified') }, { label: _('dossier-listing.table-col-names.needs-work') }, { label: _('dossier-listing.table-col-names.owner'), class: 'user-column' }, { label: _('dossier-listing.table-col-names.documents-status'), class: 'flex-end', width: 'auto' }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 9e18757a8..a729e9227 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -827,7 +827,7 @@ "table-col-names": { "added-on": "Added", "assigned-to": "Assigned to", - "last-modified": "Last modified on", + "last-modified": "Last modified", "name": "Name", "needs-work": "Workload", "pages": "Pages", diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts index 9b70b00f3..da29c0042 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.model.ts @@ -42,7 +42,6 @@ export class DossierStats implements IDossierStats { readonly numberOfFiles: number; readonly numberOfProcessingFiles: number; readonly processingStats: ProcessingStats; - readonly annotationLastModified: string; readonly hasFiles: boolean; @@ -55,12 +54,11 @@ export class DossierStats implements IDossierStats { this.hasRedactionsFilePresent = stats.hasRedactionsFilePresent; this.hasSuggestionsFilePresent = stats.hasSuggestionsFilePresent; this.hasUpdatesFilePresent = stats.hasUpdatesFilePresent; - this.annotationLastModified = /*stats.annotationLastModified;*/ new Date().toDateString(); this.numberOfPages = stats.numberOfPages; this.numberOfFiles = stats.numberOfFiles; this.numberOfProcessingFiles = Object.entries(this.fileCountPerProcessingStatus) - .filter(([key, _]) => isProcessingStatuses.includes(key as ProcessingFileStatus)) - .reduce((count, [_, value]) => count + value, 0); + .filter(([key]) => isProcessingStatuses.includes(key as ProcessingFileStatus)) + .reduce((count, [, value]) => count + value, 0); this.processingStats = this.#processingStats; this.hasFiles = this.numberOfFiles > 0; } diff --git a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts index 23f8b3a88..022673a00 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts @@ -11,5 +11,4 @@ export interface IDossierStats { hasUpdatesFilePresent: boolean; numberOfPages: number; numberOfFiles: number; - annotationLastModified: string; } diff --git a/libs/red-domain/src/lib/files/file.model.ts b/libs/red-domain/src/lib/files/file.model.ts index 9e040d999..ef369ad6f 100644 --- a/libs/red-domain/src/lib/files/file.model.ts +++ b/libs/red-domain/src/lib/files/file.model.ts @@ -9,7 +9,6 @@ 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; @@ -41,6 +40,7 @@ export class File extends Entity implements IFile { readonly processingStatus: ProcessingFileStatus; readonly workflowStatus: WorkflowFileStatus; readonly fileManipulationDate: string; + readonly redactionModificationDate: string; readonly statusSort: number; readonly cacheIdentifier?: string; @@ -65,7 +65,6 @@ 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; @@ -98,7 +97,8 @@ export class File extends Entity implements IFile { this.uploader = file.uploader; this.excludedPages = file.excludedPages || []; this.hasSuggestions = !!file.hasSuggestions; - this.fileManipulationDate = file.fileManipulationDate; + this.fileManipulationDate = file.fileManipulationDate ?? ''; + this.redactionModificationDate = file.redactionModificationDate ?? ''; this.statusSort = StatusSorter[this.workflowStatus]; this.cacheIdentifier = btoa(this.fileManipulationDate ?? ''); diff --git a/libs/red-domain/src/lib/files/file.ts b/libs/red-domain/src/lib/files/file.ts index 8f8c29446..26dac2ec5 100644 --- a/libs/red-domain/src/lib/files/file.ts +++ b/libs/red-domain/src/lib/files/file.ts @@ -32,7 +32,6 @@ 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. @@ -151,5 +150,6 @@ export interface IFile { /** * Last time the actual file was touched */ - readonly fileManipulationDate: string; + readonly fileManipulationDate: string | null; + readonly redactionModificationDate: string | null; }