From cf4b84c47d6c4745be89e4400e94e76960ac0466 Mon Sep 17 00:00:00 2001 From: Dan Percic Date: Thu, 27 Jan 2022 11:44:56 +0200 Subject: [PATCH] add dossier template status column --- .../dossier-template-breadcrumbs.component.html | 2 +- .../dossier-templates-listing-screen.component.ts | 1 + .../dossier-templates-listing.module.ts | 1 - .../table-item/table-item.component.html | 6 ++++++ .../table-item/table-item.component.ts | 2 ++ .../translations/admin-side-nav-translations.ts | 2 +- .../translations/audit-categories-translations.ts | 4 ++-- .../translations/default-colors-translations.ts | 4 ++-- .../dossier-attribute-types-translations.ts | 4 ++-- .../dossier-template-status-translations.ts | 6 ++++++ .../file-attribute-types-translations.ts | 4 ++-- .../placeholders-descriptions-translations.ts | 8 ++++---- apps/red-ui/src/assets/i18n/de.json | 12 ++++++++++-- apps/red-ui/src/assets/i18n/en.json | 12 ++++++++++-- .../lib/dossier-templates/dossier-template.model.ts | 2 ++ .../src/lib/dossier-templates/dossier-template.ts | 1 + 16 files changed, 52 insertions(+), 19 deletions(-) create mode 100644 apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts diff --git a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html index 4378310a0..b91797330 100644 --- a/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html +++ b/apps/red-ui/src/app/modules/admin/components/dossier-template-breadcrumbs/dossier-template-breadcrumbs.component.html @@ -3,7 +3,7 @@ *ngIf="root || !!dossierTemplatesService.activeDossierTemplate" [routerLink]="'/main/admin/dossier-templates'" class="breadcrumb" - translate="dossier-templates" + translate="dossier-templates.label" > diff --git a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts index 5387ae178..58ad942ef 100644 --- a/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts +++ b/apps/red-ui/src/app/modules/admin/screens/dossier-templates-listing/dossier-templates-listing-screen/dossier-templates-listing-screen.component.ts @@ -40,6 +40,7 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent {{ dossierTemplate.dateModified | date: 'd MMM. yyyy' }} + + +
+
+ {{ translations[dossierTemplate.dossierTemplateStatus] | translate }} +
; private readonly _ngOnChanges$ = new BehaviorSubject(undefined); diff --git a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts b/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts index 7103ed3be..ac6364a98 100644 --- a/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/admin-side-nav-translations.ts @@ -3,4 +3,4 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; export const adminSideNavTranslations = { settings: _('admin-side-nav.settings'), dossierTemplates: _('admin-side-nav.dossier-templates'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts index b0bbb0552..bf7560b38 100644 --- a/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/audit-categories-translations.ts @@ -1,6 +1,6 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const auditCategoriesTranslations: { [key: string]: string } = { +export const auditCategoriesTranslations = { allCategories: _('audit-screen.categories.all-categories'), LICENSE: _('audit-screen.categories.license'), DOWNLOAD: _('audit-screen.categories.download'), @@ -13,4 +13,4 @@ export const auditCategoriesTranslations: { [key: string]: string } = { DOCUMENT: _('audit-screen.categories.document'), AUDIT: _('audit-screen.categories.audit'), DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts index f40ebd20b..ecc426d8c 100644 --- a/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/default-colors-translations.ts @@ -1,7 +1,7 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DefaultColorType } from '@red/domain'; -export const defaultColorsTranslations: { [key in DefaultColorType]: string } = { +export const defaultColorsTranslations: { readonly [key in DefaultColorType]: string } = { analysisColor: _('default-colors-screen.types.analysisColor'), defaultColor: _('default-colors-screen.types.defaultColor'), dictionaryRequestColor: _('default-colors-screen.types.dictionaryRequestColor'), @@ -12,4 +12,4 @@ export const defaultColorsTranslations: { [key in DefaultColorType]: string } = requestRemove: _('default-colors-screen.types.requestRemove'), updatedColor: _('default-colors-screen.types.updatedColor'), ignoredHintColor: _('default-colors-screen.types.ignoredHintColor'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts index f37ed8473..cfd268a36 100644 --- a/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/dossier-attribute-types-translations.ts @@ -1,9 +1,9 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { DossierAttributeConfigType } from '@red/domain'; -export const dossierAttributeTypesTranslations: { [key in DossierAttributeConfigType]: string } = { +export const dossierAttributeTypesTranslations: { readonly [key in DossierAttributeConfigType]: string } = { TEXT: _('dossier-attribute-types.text'), NUMBER: _('dossier-attribute-types.number'), DATE: _('dossier-attribute-types.date'), IMAGE: _('dossier-attribute-types.image'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts b/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts new file mode 100644 index 000000000..a9de7a50b --- /dev/null +++ b/apps/red-ui/src/app/modules/admin/translations/dossier-template-status-translations.ts @@ -0,0 +1,6 @@ +import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; + +export const dossierTemplateStatusTranslations = { + ACTIVE: _('dossier-templates.status.active'), + INCOMPLETE: _('dossier-templates.status.incomplete'), +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts index bbef380b6..fc13a865f 100644 --- a/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/file-attribute-types-translations.ts @@ -1,8 +1,8 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; import { FileAttributeConfigType } from '@red/domain'; -export const fileAttributeTypesTranslations: { [key in FileAttributeConfigType]: string } = { +export const fileAttributeTypesTranslations: { readonly [key in FileAttributeConfigType]: string } = { TEXT: _('file-attribute-types.text'), NUMBER: _('file-attribute-types.number'), DATE: _('file-attribute-types.date'), -}; +} as const; diff --git a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts b/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts index 3050c5996..366aaa667 100644 --- a/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts +++ b/apps/red-ui/src/app/modules/admin/translations/placeholders-descriptions-translations.ts @@ -1,11 +1,11 @@ import { marker as _ } from '@biesbjerg/ngx-translate-extract-marker'; -export const placeholdersDescriptionsTranslations: { [key: string]: string } = { +export const placeholdersDescriptionsTranslations = { dossierAttributePlaceholders: _('reports-screen.descriptions.dossier-attributes'), fileAttributePlaceholders: _('reports-screen.descriptions.file-attributes'), -}; +} as const; -export const generalPlaceholdersDescriptionsTranslations: { [key: string]: string } = { +export const generalPlaceholdersDescriptionsTranslations = { 'file.name': _('reports-screen.descriptions.general.file.name'), 'redaction.page': _('reports-screen.descriptions.general.redaction.page'), 'redaction.paragraph': _('reports-screen.descriptions.general.redaction.paragraph'), @@ -18,4 +18,4 @@ export const generalPlaceholdersDescriptionsTranslations: { [key: string]: strin 'date.MM/dd/yyyy': _('reports-screen.descriptions.general.date.m-d-y'), 'time.HH:mm': _('reports-screen.descriptions.general.time.h-m'), 'dossier.name': _('reports-screen.descriptions.general.dossier.name'), -}; +} as const; diff --git a/apps/red-ui/src/assets/i18n/de.json b/apps/red-ui/src/assets/i18n/de.json index 7dd9ec900..0d8eb9e41 100644 --- a/apps/red-ui/src/assets/i18n/de.json +++ b/apps/red-ui/src/assets/i18n/de.json @@ -785,7 +785,14 @@ "under-review": "In Review", "upload-files": "Sie können Dateien überall per Drag and Drop platzieren..." }, - "dossier-templates": "Dossier-Vorlagen", + "dossier-templates": { + "label": "Dossier-Vorlagen", + "status": { + "label": "", + "active": "", + "incomplete": "" + } + }, "dossier-templates-listing": { "action": { "delete": "Dossier-Vorlage", @@ -811,7 +818,8 @@ "created-by": "Erstellt von", "created-on": "Erstellt am", "modified-on": "Geändert am", - "name": "Name" + "name": "Name", + "status": "" }, "table-header": { "title": "{length} {length, plural, one{Dossier-Vorlage} other{Dossier-Vorlagen}}" diff --git a/apps/red-ui/src/assets/i18n/en.json b/apps/red-ui/src/assets/i18n/en.json index bd83e6e96..8ec7a3d3f 100644 --- a/apps/red-ui/src/assets/i18n/en.json +++ b/apps/red-ui/src/assets/i18n/en.json @@ -801,7 +801,14 @@ "entries": "{count} {count, plural, one{entry} other{entries}}", "modified-on": "Modified on: {date}" }, - "dossier-templates": "Dossier Templates", + "dossier-templates": { + "label": "Dossier Templates", + "status": { + "label": "Status", + "active": "Active", + "incomplete": "Incomplete" + } + }, "dossier-templates-listing": { "action": { "delete": "Delete Template", @@ -827,7 +834,8 @@ "created-by": "Created by", "created-on": "Created on", "modified-on": "Modified on", - "name": "Name" + "name": "Name", + "status": "Status" }, "table-header": { "title": "{length} dossier {length, plural, one{template} other{templates}}" diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts index 3e9e58ae9..d4b58a5ac 100644 --- a/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts +++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.model.ts @@ -14,6 +14,7 @@ export class DossierTemplate implements IDossierTemplate, IListable { readonly reportTemplateIds?: List; readonly validFrom?: string; readonly validTo?: string; + readonly dossierTemplateStatus: string; constructor(dossierTemplate: IDossierTemplate) { this.createdBy = dossierTemplate.createdBy; @@ -27,6 +28,7 @@ export class DossierTemplate implements IDossierTemplate, IListable { this.reportTemplateIds = dossierTemplate.reportTemplateIds; this.validFrom = dossierTemplate.validFrom; this.validTo = dossierTemplate.validTo; + this.dossierTemplateStatus = dossierTemplate.dossierTemplateStatus; } get id(): string { diff --git a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts index 5dd184b39..cf2b60574 100644 --- a/libs/red-domain/src/lib/dossier-templates/dossier-template.ts +++ b/libs/red-domain/src/lib/dossier-templates/dossier-template.ts @@ -46,4 +46,5 @@ export interface IDossierTemplate { * Validity of end this dossierTemplate. */ readonly validTo?: string; + readonly dossierTemplateStatus: string; }