Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

dossier template fixes

Browse Source
This commit is contained in:
Dan Percic 2021-09-26 11:17:05 +03:00
parent 0ac286d193
commit 103234c9b0
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/red-ui/src/app/models/file/dossier-template.ts
View File

@ -16,21 +16,25 @@ export class DossierTemplate implements IDossierTemplate, IListable {
dictionariesCount = 0; dictionariesCount = 0;
totalDictionaryEntries = 0; totalDictionaryEntries = 0;
constructor(dossierTemplateModel: IDossierTemplate, public fileAttributesConfig: FileAttributesConfig) { constructor(dossierTemplate: IDossierTemplate, public fileAttributesConfig: FileAttributesConfig) {
this.createdBy = dossierTemplateModel.createdBy; this.createdBy = dossierTemplate.createdBy;
this.dateAdded = dossierTemplateModel.dateAdded; this.dateAdded = dossierTemplate.dateAdded;
this.dateModified = dossierTemplateModel.dateModified; this.dateModified = dossierTemplate.dateModified;
this.description = dossierTemplateModel.description; this.description = dossierTemplate.description;
this.dossierTemplateId = dossierTemplateModel.dossierTemplateId; this.dossierTemplateId = dossierTemplate.dossierTemplateId;
this.downloadFileTypes = dossierTemplateModel.downloadFileTypes; this.downloadFileTypes = dossierTemplate.downloadFileTypes;
this.modifiedBy = dossierTemplateModel.modifiedBy; this.modifiedBy = dossierTemplate.modifiedBy;
this.name = dossierTemplateModel.name; this.name = dossierTemplate.name;
this.reportTemplateIds = dossierTemplateModel.reportTemplateIds; this.reportTemplateIds = dossierTemplate.reportTemplateIds;
this.validFrom = dossierTemplateModel.validFrom; this.validFrom = dossierTemplate.validFrom;
this.validTo = dossierTemplateModel.validTo; this.validTo = dossierTemplate.validTo;
} }
get id(): string { get id(): string {
return this.dossierTemplateId; return this.dossierTemplateId;
} }
get searchKey(): string {
return this.name;
}
} }

11
apps/red-ui/src/app/modules/admin/screens/dossier-template-listing/dossier-templates-listing-screen.component.ts
View File

@ -32,11 +32,10 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
readonly currentUser = this._userService.currentUser; readonly currentUser = this._userService.currentUser;
readonly tableHeaderLabel = _('dossier-templates-listing.table-header.title'); readonly tableHeaderLabel = _('dossier-templates-listing.table-header.title');
tableColumnConfigs: TableColumnConfig<DossierTemplate>[]; tableColumnConfigs: TableColumnConfig<DossierTemplate>[];
@ViewChild('nameTemplate', { static: true }) nameTemplate: TemplateRef<never>; @ViewChild('nameTemplate', { static: true }) nameTemplate: TemplateRef<unknown>;
@ViewChild('userTemplate', { static: true }) userTemplate: TemplateRef<never>; @ViewChild('userTemplate', { static: true }) userTemplate: TemplateRef<unknown>;
@ViewChild('dateAddedTemplate', { static: true }) dateAddedTemplate: TemplateRef<never>; @ViewChild('dateAddedTemplate', { static: true }) dateAddedTemplate: TemplateRef<unknown>;
@ViewChild('dateModifiedTemplate', { static: true }) dateModifiedTemplate: TemplateRef<never>; @ViewChild('dateModifiedTemplate', { static: true }) dateModifiedTemplate: TemplateRef<unknown>;
protected readonly _primaryKey = 'name';
constructor( constructor(
protected readonly _injector: Injector, protected readonly _injector: Injector,
@ -81,7 +80,7 @@ export class DossierTemplatesListingScreenComponent extends ListingComponent<Dos
this.tableColumnConfigs = [ this.tableColumnConfigs = [
{ {
label: _('dossier-templates-listing.table-col-names.name'), label: _('dossier-templates-listing.table-col-names.name'),
sortByKey: 'name', sortByKey: 'searchKey',
template: this.nameTemplate template: this.nameTemplate
}, },
{ {