Skip to content

Commit

Permalink
fix empty state, translations, and search
Browse files Browse the repository at this point in the history
  • Loading branch information
charlesabarnes committed Jan 7, 2020
1 parent 5c26ea7 commit 08c72f4
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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') },
],
},
}),
Expand Down
6 changes: 3 additions & 3 deletions src/app/services/search/search.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class SearchService {

public getjobs(filter?: any, params: any = {}, count: number = 30): Observable<any> {
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;
Expand All @@ -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<any> {
Expand Down Expand Up @@ -119,7 +119,7 @@ export class SearchService {
}
}
}

return additionalFilter.replace(/{\?\^\^equals}/g, isSearch ? ':' : '=').replace(/{\?\^\^delimiter}/g, isSearch ? '"' : '\'');
}

Expand Down
2 changes: 1 addition & 1 deletion src/app/sidebar/sidebar.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down
2 changes: 1 addition & 1 deletion src/static/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/static/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 08c72f4

Please sign in to comment.