dossier template fixes

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

View File

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

View File

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