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 0b9582d02..ea69fa71e 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,6 @@ 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 { DateColumnComponent } from './components/table-item/date-column/date-column.component'; import { BulkActionsService } from './services/bulk-actions.service'; const routes: Routes = [ @@ -44,7 +43,6 @@ const routes: Routes = [ ScreenHeaderComponent, ViewModeSelectionComponent, FileNameColumnComponent, - DateColumnComponent, ], providers: [ConfigService, BulkActionsService], imports: [RouterModule.forChild(routes), CommonModule, SharedModule, SharedDossiersModule, IqserIconsModule, TranslateModule], 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 7ad67122e..7ada1bb64 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,6 +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 10a207470..98f52a70a 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,6 +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.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/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html similarity index 55% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.html rename to apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.html index e534759a1..3de0431fa 100644 --- 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/shared/components/date-column/date-column.component.html @@ -1,3 +1,3 @@
- {{ date | date: 'd MMM. yyyy, hh:mm a' }} + {{ date | date: 'd MMM. yyyy' }}
diff --git a/apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss b/apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.scss similarity index 100% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.scss rename to apps/red-ui/src/app/modules/dossier/shared/components/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/shared/components/date-column/date-column.component.ts similarity index 80% rename from apps/red-ui/src/app/modules/dossier/screens/dossier-overview/components/table-item/date-column/date-column.component.ts rename to apps/red-ui/src/app/modules/dossier/shared/components/date-column/date-column.component.ts index d36317fb8..75b421297 100644 --- 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/shared/components/date-column/date-column.component.ts @@ -1,12 +1,12 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; @Component({ - selector: 'redaction-date-column', + selector: 'redaction-date-column [date]', templateUrl: './date-column.component.html', styleUrls: ['./date-column.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, }) export class DateColumnComponent { - @Input() isError: boolean; + @Input() isError = false; @Input() date: string; } diff --git a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts index 085e242e1..b7cded317 100644 --- a/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts +++ b/apps/red-ui/src/app/modules/dossier/shared/shared-dossiers.module.ts @@ -5,8 +5,9 @@ import { FileActionsComponent } from './components/file-actions/file-actions.com import { IqserIconsModule } from '@iqser/common-ui'; import { SharedModule } from '@shared/shared.module'; import { RedactionImportService } from './services/redaction-import.service'; +import { DateColumnComponent } from './components/date-column/date-column.component'; -const components = [FileActionsComponent]; +const components = [FileActionsComponent, DateColumnComponent]; @NgModule({ declarations: [...components], diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 13d247c4f..bae39df99 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -733,6 +733,7 @@ "documents-status": "", "dossier-status": "", "name": "Name", + "last-modified": "", "needs-work": "Arbeitsvorrat", "owner": "Besitzer" }, diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index 64b9b6b74..9e18757a8 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -733,6 +733,7 @@ "documents-status": "Documents Status", "dossier-status": "Dossier Status", "name": "Name", + "last-modified": "Last modified", "needs-work": "Workload", "owner": "Owner" }, 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 10899e1ca..9b70b00f3 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,6 +42,7 @@ export class DossierStats implements IDossierStats { readonly numberOfFiles: number; readonly numberOfProcessingFiles: number; readonly processingStats: ProcessingStats; + readonly annotationLastModified: string; readonly hasFiles: boolean; @@ -54,6 +55,7 @@ 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) 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 022673a00..23f8b3a88 100644 --- a/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts +++ b/libs/red-domain/src/lib/dossier-stats/dossier-stats.ts @@ -11,4 +11,5 @@ export interface IDossierStats { hasUpdatesFilePresent: boolean; numberOfPages: number; numberOfFiles: number; + annotationLastModified: string; }