diff --git a/debug.log b/debug.log deleted file mode 100644 index e4874e229aee32f3a6afa9820a8a79aff1ba0bad..0000000000000000000000000000000000000000 --- a/debug.log +++ /dev/null @@ -1 +0,0 @@ -[1021/094448.838:ERROR:directory_reader_win.cc(43)] FindFirstFile: Le chemin d�acc�s sp�cifi� est introuvable. (0x3) diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 1c41605d4d8b4c6b9329857673013bc5cbe1e379..090ae1018adc283c418a068292517ce2a555db82 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -22,7 +22,7 @@ export class HomeComponent implements OnInit { }); } - fetchResults(filters: Filter[]) { + public fetchResults(filters: Filter[]): void { this.structureService.getStructures(filters).subscribe((structures) => { this.structures = structures.map((structure) => this.structureService.updateOpeningStructure(structure, DateTime.local()) diff --git a/src/app/services/structure-list.service.ts b/src/app/services/structure-list.service.ts index 745a69a5425556704cde460c37d125cf449bb090..9f2425166a388e66775f1c4727766c89bef5156e 100644 --- a/src/app/services/structure-list.service.ts +++ b/src/app/services/structure-list.service.ts @@ -18,35 +18,34 @@ export class StructureService { constructor(private http: HttpClient) {} public getStructures(filters: Filter[]): Observable<Structure[]> { - console.log(this.constructApi(filters)); return this.http - .get('/api/Structures?' + this.constructApi(filters)) + .get('/api/Structures?' + this.constructSearchRequest(filters)) .pipe(map((data: any[]) => data.map((item) => new Structure(item)))); } - private constructApi(filters: Filter[]): string { - let api: string = ''; + private constructSearchRequest(filters: Filter[]): string { + let requestParam = ''; if (filters) { filters.forEach((filter) => { - if (api) { - api = api + '&'; + if (requestParam) { + requestParam = requestParam + '&'; } if (filter.isStrict) { - if (api.includes(filter.name)) { - api = api + '=' + filter.value; + if (requestParam.includes(filter.name)) { + requestParam = requestParam + '=' + filter.value; } else { - api = api + filter.name + '=' + filter.value; + requestParam = requestParam + filter.name + '=' + filter.value; } } else { - if (api.includes(filter.name)) { - api = api + filter.value; + if (requestParam.includes(filter.name)) { + requestParam = requestParam + filter.value; } else { - api = api + filter.name + '_like=' + filter.value; + requestParam = requestParam + filter.name + '_like=' + filter.value; } } }); } - return api; + return requestParam; } /** diff --git a/src/app/structure-list/models/category.model.ts b/src/app/structure-list/models/category.model.ts index cb5a96eeedce438d3d4e07f714ad42531d82908d..0ffaec8dc7926d5db7fba0e622f189e82b49351b 100644 --- a/src/app/structure-list/models/category.model.ts +++ b/src/app/structure-list/models/category.model.ts @@ -5,6 +5,8 @@ export class Category { modules: Module[]; constructor(obj?: any) { - Object.assign(this, obj); + Object.assign(this, obj, { + modules: obj && obj.modules ? obj.modules.map((module) => new Module(module.id, module.text)) : null, + }); } }