Skip to content
Snippets Groups Projects
Commit 90ee2a54 authored by Jérémie BRISON's avatar Jérémie BRISON
Browse files

fix(details) : fix and add enum to correct display

parent 6c7a3c1d
No related branches found
No related tags found
3 merge requests!68Recette,!67Dev,!37Fix model structure and fix equipments in details
export enum Demarches { export enum Demarches {
caf = 'Accompagnant CAF', caf = 'accompagnantCaf',
carsat = 'CARSAT', carsat = 'carsat',
cpam = 'CPAM', cpam = 'cpam',
epn = 'Espace public numérique (EPN)', epn = 'espacePublicNumeriqueepn',
impots = 'Impôts', impots = 'impots',
logements = 'Logement', logements = 'logement',
gd_lyon = 'Grand lyon', gd_lyon = 'Grand lyon',
pole_emploi = 'le Emploi', pole_emploi = 'poleEmploi',
other = 'Autres', other = 'autres',
} }
export enum Labels { export enum Labels {
pass_numerique = 'Pass numérique', pass_numerique = 'passNumerique',
maison_france_service = 'Maison France Service', maison_france_service = 'maisonFranceService',
aidants_connect = 'Aidants Connect', aidants_connect = 'aidantsConnect',
territoire = 'Fabrique de territoire', territoire = 'fabriqueDeTerritoire',
} }
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
fxLayoutGap="20px" fxLayoutGap="20px"
> >
<app-svg-icon [type]="'ico'" [icon]="getAccessIcon(acces)"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="getAccessIcon(acces)"></app-svg-icon>
<p>{{ acces }}</p> <p>{{ getAccessLabel(acces) }}</p>
</div> </div>
</div> </div>
</div> </div>
...@@ -161,13 +161,17 @@ ...@@ -161,13 +161,17 @@
<app-svg-icon [type]="'ico'" [icon]="'equipement'" [iconClass]="'icon-32'"></app-svg-icon> <app-svg-icon [type]="'ico'" [icon]="'equipement'" [iconClass]="'icon-32'"></app-svg-icon>
<h2>Équipements</h2> <h2>Équipements</h2>
</div> </div>
<div *ngIf="structure.wifi" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px"> <div
<app-svg-icon [type]="'ico'" [icon]="'wifi'"></app-svg-icon> fxLayout="row"
<p>Wifi en accès libre</p> fxLayoutAlign="none flex-end"
</div> fxLayoutGap="13px"
<div *ngIf="structure.ordinateurs" fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="13px"> *ngFor="let equipement of structure.equipementsEtServicesProposes"
<app-svg-icon [type]="'ico'" [icon]="'computer'"></app-svg-icon> >
<p>Ordinateurs à disposition : {{ structure.nombre }}</p> <app-svg-icon [type]="'ico'" [icon]="getEquipmentsIcon(equipement)"></app-svg-icon>
<p>
{{ getEquipmentsLabel(equipement) }}
<span *ngIf="equipement == 'ordinateurs'; else otherEquipments"> : {{ structure.ordinateurs }}</span>
</p>
</div> </div>
</div> </div>
<!-- Labels --> <!-- Labels -->
......
...@@ -7,6 +7,7 @@ import { SearchService } from '../../services/search.service'; ...@@ -7,6 +7,7 @@ import { SearchService } from '../../services/search.service';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { ActivatedRoute } from '@angular/router'; import { ActivatedRoute } from '@angular/router';
import { PrintService } from '../../../shared/service/print.service'; import { PrintService } from '../../../shared/service/print.service';
import { Equipment } from '../../enum/equipment.enum';
@Component({ @Component({
selector: 'app-structure-details', selector: 'app-structure-details',
templateUrl: './structure-details.component.html', templateUrl: './structure-details.component.html',
...@@ -54,6 +55,40 @@ export class StructureDetailsComponent implements OnInit { ...@@ -54,6 +55,40 @@ export class StructureDetailsComponent implements OnInit {
} }
} }
public getEquipmentsIcon(equipment: Equipment): string {
switch (equipment) {
case Equipment.wifi:
return 'wifi';
case Equipment.bornes:
return 'tel';
case Equipment.printer:
return 'print';
case Equipment.tablet:
return 'tel';
case Equipment.computer:
return 'computer';
default:
return null;
}
}
public getEquipmentsLabel(equipment: Equipment): string {
switch (equipment) {
case Equipment.wifi:
return 'Wifi';
case Equipment.bornes:
return 'Bornes numériques';
case Equipment.printer:
return 'Imprimantes';
case Equipment.tablet:
return 'Téléphone';
case Equipment.computer:
return 'Ordinateurs à disposition';
default:
return null;
}
}
public close(): void { public close(): void {
this.closeDetails.emit(true); this.closeDetails.emit(true);
} }
...@@ -77,6 +112,21 @@ export class StructureDetailsComponent implements OnInit { ...@@ -77,6 +112,21 @@ export class StructureDetailsComponent implements OnInit {
} }
} }
public getAccessLabel(accessModality: AccessModality): string {
switch (accessModality) {
case AccessModality.free:
return 'Accès libre';
case AccessModality.meeting:
return 'Sur rendez-vous';
case AccessModality.meetingOnly:
return 'Uniquement sur RDV';
case AccessModality.numeric:
return 'Téléphone / Visio';
default:
return null;
}
}
public setServiceCategories(): void { public setServiceCategories(): void {
this.baseSkills = this.structure.lesCompetencesDeBase.map((skill) => this.baseSkills = this.structure.lesCompetencesDeBase.map((skill) =>
_.find(this.baseSkillssReferentiel.modules, { id: skill }) _.find(this.baseSkillssReferentiel.modules, { id: skill })
......
export enum AccessModality { export enum AccessModality {
free = 'Accès libre', free = 'accesLibre',
numeric = 'Téléphone / Visio', numeric = 'telephoneVisio',
meetingOnly = 'Uniquement sur RDV', meetingOnly = 'uniquementSurRdv',
meeting = 'Sur RDV', meeting = 'Sur RDV',
} }
export enum Equipment {
wifi = 'wifiEnAccesLibre',
bornes = 'bornesNumeriques',
printer = 'imprimantes',
tablet = 'tablettes',
computer = 'ordinateurs',
}
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