Skip to content
Snippets Groups Projects
Commit ad16dad3 authored by Alex ORLUC's avatar Alex ORLUC
Browse files

FEAT #13271 TIME 0:20 hide fields in search

parent d47f3f13
No related branches found
No related tags found
No related merge requests found
...@@ -94,7 +94,7 @@ export class CriteriaToolComponent implements OnInit { ...@@ -94,7 +94,7 @@ export class CriteriaToolComponent implements OnInit {
async ngOnInit(): Promise<void> { async ngOnInit(): Promise<void> {
this.searchTermControl.setValue(this.searchTerm); this.searchTermControl.setValue(this.searchTerm);
this.criteria = await this.indexingFields.getAllFields(); this.criteria = await this.indexingFields.getAllSearchFields();
this.criteria.forEach((element: any) => { this.criteria.forEach((element: any) => {
if (this.defaultCriteria.indexOf(element.identifier) > -1) { if (this.defaultCriteria.indexOf(element.identifier) > -1) {
......
...@@ -208,6 +208,7 @@ export class IndexingFieldsService { ...@@ -208,6 +208,7 @@ export class IndexingFieldsService {
default_value: null, default_value: null,
values: [{ 'id': '2D', 'label': this.translate.instant('lang.registeredMail_2D') }, { 'id': '2C', 'label': this.translate.instant('lang.registeredMail_2C') }, { 'id': 'RW', 'label': this.translate.instant('lang.registeredMail_RW') }], values: [{ 'id': '2D', 'label': this.translate.instant('lang.registeredMail_2D') }, { 'id': '2C', 'label': this.translate.instant('lang.registeredMail_2C') }, { 'id': 'RW', 'label': this.translate.instant('lang.registeredMail_RW') }],
enabled: true, enabled: true,
searchHide: true
}, },
{ {
identifier: 'registeredMail_issuingSite', identifier: 'registeredMail_issuingSite',
...@@ -226,6 +227,7 @@ export class IndexingFieldsService { ...@@ -226,6 +227,7 @@ export class IndexingFieldsService {
default_value: null, default_value: null,
values: [], values: [],
enabled: false, enabled: false,
searchHide: true
}, },
{ {
identifier: 'registeredMail_warranty', identifier: 'registeredMail_warranty',
...@@ -235,6 +237,7 @@ export class IndexingFieldsService { ...@@ -235,6 +237,7 @@ export class IndexingFieldsService {
default_value: null, default_value: null,
values: [{ 'id': 'R1', 'label': 'R1' }, { 'id': 'R2', 'label': 'R2' }, { 'id': 'R3', 'label': 'R3' }], values: [{ 'id': 'R1', 'label': 'R1' }, { 'id': 'R2', 'label': 'R2' }, { 'id': 'R3', 'label': 'R3' }],
enabled: true, enabled: true,
searchHide: true
}, },
{ {
identifier: 'registeredMail_letter', identifier: 'registeredMail_letter',
...@@ -244,6 +247,7 @@ export class IndexingFieldsService { ...@@ -244,6 +247,7 @@ export class IndexingFieldsService {
default_value: null, default_value: null,
values: [{ 'id': true, 'label': this.translate.instant('lang.yes') }, { 'id': false, 'label': this.translate.instant('lang.no') }], values: [{ 'id': true, 'label': this.translate.instant('lang.yes') }, { 'id': false, 'label': this.translate.instant('lang.no') }],
enabled: true, enabled: true,
searchHide: true
}, },
{ {
identifier: 'registeredMail_recipient', identifier: 'registeredMail_recipient',
...@@ -294,12 +298,12 @@ export class IndexingFieldsService { ...@@ -294,12 +298,12 @@ export class IndexingFieldsService {
private notify: NotificationService, private notify: NotificationService,
public functions: FunctionsService) { } public functions: FunctionsService) { }
getCoreFields() { getCoreFields(exclude: string = '') {
return this.coreFields; return exclude === '' ? this.coreFields : this.coreFields.filter((field: any) => field[exclude]);
} }
getFields() { getFields(exclude: string = '') {
return this.fields; return exclude === '' ? this.fields : this.fields.filter((field: any) => !field[exclude]);
} }
getCustomFields() { getCustomFields() {
...@@ -358,6 +362,17 @@ export class IndexingFieldsService { ...@@ -358,6 +362,17 @@ export class IndexingFieldsService {
return mergedFields; return mergedFields;
} }
async getAllSearchFields() {
const customFields = await this.getCustomFields();
const roleFields = await this.getRolesFields();
let mergedFields = this.getCoreFields('searchHide').concat(this.getFields('searchHide'));
mergedFields = mergedFields.concat(customFields);
mergedFields = mergedFields.concat(roleFields);
return mergedFields;
}
getRolesFields() { getRolesFields() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
this.http.get(`../rest/roles`).pipe( this.http.get(`../rest/roles`).pipe(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment