From 08c72f420ab88fe862f38318bc093b8f3c0ad0b5 Mon Sep 17 00:00:00 2001 From: Charles Barnes Date: Tue, 7 Jan 2020 14:30:50 -0600 Subject: [PATCH] fix empty state, translations, and search --- .../apply-modal/apply-modal.component.ts | 14 +++++++------- src/app/services/search/search.service.ts | 6 +++--- src/app/sidebar/sidebar.component.ts | 2 +- src/static/i18n/en.json | 2 +- src/static/i18n/fr.json | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/app/job-list/job-details/apply-modal/apply-modal.component.ts b/src/app/job-list/job-details/apply-modal/apply-modal.component.ts index f6115220..ed2f0133 100644 --- a/src/app/job-list/job-details/apply-modal/apply-modal.component.ts +++ b/src/app/job-list/job-details/apply-modal/apply-modal.component.ts @@ -110,13 +110,13 @@ export class ApplyModalComponent implements OnInit { placeholder: TranslateService.translate('EEOC.SELECT_ALL'), config: { options: [ - { value: 'HL', label: TranslateService.translate('EEOC.RACE_ETHNICTY_HL') }, - { value: 'WH', label: TranslateService.translate('EEOC.RACE_ETHNICTY_WH')}, - { value: 'BL', label: TranslateService.translate('EEOC.RACE_ETHNICTY_BL')}, - { value: 'AS', label: TranslateService.translate('EEOC.RACE_ETHNICTY_AS') }, - { value: 'NP', label: TranslateService.translate('EEOC.RACE_ETHNICTY_NP')}, - { value: 'IA', label: TranslateService.translate('EEOC.RACE_ETHNICTY_IA')}, - { value: 'DN', label: TranslateService.translate('EEOC.RACE_ETHNICTY_DN')}, + { value: 'HL', label: TranslateService.translate('EEOC.RACE_ETHNICITY_HL') }, + { value: 'WH', label: TranslateService.translate('EEOC.RACE_ETHNICITY_WH') }, + { value: 'BL', label: TranslateService.translate('EEOC.RACE_ETHNICITY_BL') }, + { value: 'AS', label: TranslateService.translate('EEOC.RACE_ETHNICITY_AS') }, + { value: 'NP', label: TranslateService.translate('EEOC.RACE_ETHNICITY_NP') }, + { value: 'IA', label: TranslateService.translate('EEOC.RACE_ETHNICITY_IA') }, + { value: 'DN', label: TranslateService.translate('EEOC.RACE_ETHNICITY_DN') }, ], }, }), diff --git a/src/app/services/search/search.service.ts b/src/app/services/search/search.service.ts index 008f60cf..7433ead6 100644 --- a/src/app/services/search/search.service.ts +++ b/src/app/services/search/search.service.ts @@ -18,7 +18,7 @@ export class SearchService { public getjobs(filter?: any, params: any = {}, count: number = 30): Observable { let queryArray: string[] = []; - params.where = `(isOpen=true) AND (isDeleted=false)${this.formatAdditionalCriteria(false)}${this.formatFilter(filter, false)}`; + params.query = `(isOpen:1) AND (isDeleted:0)${this.formatAdditionalCriteria(true)}${this.formatFilter(filter, true)}`; params.fields = SettingsService.settings.service.fields; params.count = count; params.sort = SettingsService.settings.additionalJobCriteria.sort; @@ -29,7 +29,7 @@ export class SearchService { } let queryString: string = queryArray.join('&'); - return this.http.get(`${this.baseUrl}/query/JobBoardPost?${queryString}`); + return this.http.get(`${this.baseUrl}/search/JobOrder?${queryString}`); } public openJob(id: string | number): Observable { @@ -119,7 +119,7 @@ export class SearchService { } } } - + return additionalFilter.replace(/{\?\^\^equals}/g, isSearch ? ':' : '=').replace(/{\?\^\^delimiter}/g, isSearch ? '"' : '\''); } diff --git a/src/app/sidebar/sidebar.component.ts b/src/app/sidebar/sidebar.component.ts index 18fc69a2..2921de90 100644 --- a/src/app/sidebar/sidebar.component.ts +++ b/src/app/sidebar/sidebar.component.ts @@ -79,7 +79,7 @@ export class SidebarComponent { private handleJobIdsOnSuccess(res: any): void { let resultIds: string[] = res.data.map((result: any) => { return `id{?^^equals}${result.id}`; }); if (resultIds.length === 0) { - resultIds.push(`id{?^^equals}${-1}`); + resultIds.push(`id{?^^equals}${0}`); } this.updateFilter('ids', resultIds); } diff --git a/src/static/i18n/en.json b/src/static/i18n/en.json index fcaf6122..2d466cd8 100644 --- a/src/static/i18n/en.json +++ b/src/static/i18n/en.json @@ -36,7 +36,7 @@ "GENDER_ND": "I do not wish to self-identify", "RACE_ETHNICITY_LABEL": "Ethnicity / Race", "SELECT_ALL": "Select all that apply", - "RACE_ETHNICTY_HL": "Hispanic or Latino", + "RACE_ETHNICITY_HL": "Hispanic or Latino", "RACE_ETHNICITY_WH": "White", "RACE_ETHNICITY_BL": "Black or African American", "RACE_ETHNICITY_AS": "Asian", diff --git a/src/static/i18n/fr.json b/src/static/i18n/fr.json index 04f17498..5080bfff 100644 --- a/src/static/i18n/fr.json +++ b/src/static/i18n/fr.json @@ -36,7 +36,7 @@ "GENDER_ND": "Je ne veux pas d'auto-identification", "RACE_ETHNICITY_LABEL": "Ethnicité / Race", "SELECT_ALL": "Sélectionnez toutes les réponses pertinentes", - "RACE_ETHNICTY_HL": "Hispanique ou Latino", + "RACE_ETHNICITY_HL": "Hispanique ou Latino", "RACE_ETHNICITY_WH": "Blanc", "RACE_ETHNICITY_BL": "Noir ou Afro-Américain", "RACE_ETHNICITY_AS": "Asiatique",