Skip to content
Snippets Groups Projects
Commit ec70e6e1 authored by Hugo SUBTIL's avatar Hugo SUBTIL
Browse files

fix: small fix

parent 91e9f74a
No related branches found
No related tags found
3 merge requests!14Recette,!13Dev,!6Topic search
[1021/094448.838:ERROR:directory_reader_win.cc(43)] FindFirstFile: Le chemin daccs spcifi est introuvable. (0x3)
......@@ -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())
......
......@@ -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;
}
/**
......
......@@ -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,
});
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment