RED-4714: fix
This commit is contained in:
parent
208bf94092
commit
d7657e4d54
@ -106,8 +106,10 @@ export class ConfigService {
|
||||
const dossierStatesFilters = [...allDistinctDossierStates].map(
|
||||
id =>
|
||||
new NestedFilter({
|
||||
id: id,
|
||||
label: id ? this._dossierStatesMapService.get(stateToTemplateMap.get(id), id).name : 'Undefined',
|
||||
id: id ?? 'undefined',
|
||||
label: id
|
||||
? this._dossierStatesMapService.get(stateToTemplateMap.get(id), id).name
|
||||
: this._translateService.instant('dossier-state.placeholder'),
|
||||
}),
|
||||
);
|
||||
|
||||
|
||||
@ -83,7 +83,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
|
||||
return this._translateService.instant(
|
||||
this.states.length === 1
|
||||
? 'edit-dossier-dialog.general-info.form.dossier-state.no-state-placeholder'
|
||||
: 'edit-dossier-dialog.general-info.form.dossier-state.placeholder',
|
||||
: 'dossier-state.placeholder',
|
||||
) as string;
|
||||
}
|
||||
|
||||
@ -174,7 +174,7 @@ export class EditDossierGeneralInfoComponent implements OnInit, EditDossierSecti
|
||||
|
||||
getStateName(stateId: string): string {
|
||||
return (this._dossierStatesMapService.get(this.dossier.dossierTemplateId, stateId)?.name ||
|
||||
this._translateService.instant('edit-dossier-dialog.general-info.form.dossier-state.placeholder')) as string;
|
||||
this._translateService.instant('dossier-state.placeholder')) as string;
|
||||
}
|
||||
|
||||
getStateColor(stateId: string): string {
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<div class="flex-align-items-center dossier-state-container">
|
||||
<div class="dossier-state-text clamp-1">
|
||||
{{ (dossierState$ | async)?.name || ('edit-dossier-dialog.general-info.form.dossier-state.placeholder' | translate) }}
|
||||
{{ (dossierState$ | async)?.name || ('dossier-state.placeholder' | translate) }}
|
||||
</div>
|
||||
<redaction-small-chip [color]="(dossierState$ | async)?.color || '#E2E4E9'"></redaction-small-chip>
|
||||
</div>
|
||||
|
||||
@ -17,7 +17,7 @@ export class TranslateChartService {
|
||||
|
||||
translateDossierStates(config: DonutChartConfig[], dossierTemplateId: string): DonutChartConfig[] {
|
||||
return config.map(val => {
|
||||
if (!val.key) {
|
||||
if (val.key === 'undefined') {
|
||||
return { ...val, label: this._translateService.instant(val.label) };
|
||||
}
|
||||
const dossierState = this._dossierStatesMapService.get(dossierTemplateId, val.key);
|
||||
|
||||
@ -13,5 +13,5 @@ export const auditCategoriesTranslations = {
|
||||
DOCUMENT: _('audit-screen.categories.document'),
|
||||
AUDIT: _('audit-screen.categories.audit'),
|
||||
DOSSIER_TEMPLATE: _('audit-screen.categories.dossier-template'),
|
||||
// SETTINGS: _('audit-screen.categories.settings'),
|
||||
SETTINGS: _('audit-screen.categories.settings'),
|
||||
} as const;
|
||||
|
||||
@ -77,7 +77,8 @@ export const dossierMemberChecker = (dw: Dossier, filter: INestedFilter) => dw.h
|
||||
|
||||
export const dossierTemplateChecker = (dw: Dossier, filter: INestedFilter) => dw.dossierTemplateId === filter.id;
|
||||
|
||||
export const dossierStateChecker = (dw: Dossier, filter: INestedFilter) => dw.dossierStatusId === filter.id;
|
||||
export const dossierStateChecker = (dw: Dossier, filter: INestedFilter) =>
|
||||
dw.dossierStatusId === (filter.id === 'undefined' ? null : filter.id);
|
||||
|
||||
export const dossierApproverChecker = (dw: Dossier, filter: INestedFilter) => dw.approverIds.includes(filter.id);
|
||||
|
||||
|
||||
@ -911,6 +911,9 @@
|
||||
"upload-files": "Sie können Dateien überall per Drag and Drop platzieren..."
|
||||
},
|
||||
"dossier-permissions": "",
|
||||
"dossier-state": {
|
||||
"placeholder": ""
|
||||
},
|
||||
"dossier-states-listing": {
|
||||
"action": {
|
||||
"delete": "",
|
||||
@ -1084,8 +1087,7 @@
|
||||
},
|
||||
"dossier-state": {
|
||||
"label": "",
|
||||
"no-state-placeholder": "",
|
||||
"placeholder": ""
|
||||
"no-state-placeholder": ""
|
||||
},
|
||||
"due-date": "Termin",
|
||||
"name": {
|
||||
|
||||
@ -911,6 +911,9 @@
|
||||
"upload-files": "Drag & drop files anywhere..."
|
||||
},
|
||||
"dossier-permissions": "Dossier Permissions",
|
||||
"dossier-state": {
|
||||
"placeholder": "Undefined"
|
||||
},
|
||||
"dossier-states-listing": {
|
||||
"action": {
|
||||
"delete": "Delete State",
|
||||
@ -1084,8 +1087,7 @@
|
||||
},
|
||||
"dossier-state": {
|
||||
"label": "Dossier State",
|
||||
"no-state-placeholder": "This dossier template has no states",
|
||||
"placeholder": "Undefined"
|
||||
"no-state-placeholder": "This dossier template has no states"
|
||||
},
|
||||
"due-date": "Due Date",
|
||||
"name": {
|
||||
|
||||
@ -59,8 +59,8 @@ export class DashboardStats implements IListable, IDashboardStats {
|
||||
return this.dossierCountByStatus.map(d => ({
|
||||
value: d.count,
|
||||
color: '#e2e4e9',
|
||||
label: 'edit-dossier-dialog.general-info.form.dossier-state.placeholder',
|
||||
key: d.statusId,
|
||||
label: 'dossier-state.placeholder',
|
||||
key: d.statusId ?? 'undefined',
|
||||
}));
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user