diff --git a/src/app/models/structure.model.ts b/src/app/models/structure.model.ts index dc197d728e941a7cdb6a9a4a3de75faf68302cf6..4a154bfaa0b46d8e0c441059ccfde8f03c0f91be 100644 --- a/src/app/models/structure.model.ts +++ b/src/app/models/structure.model.ts @@ -165,4 +165,21 @@ export class Structure { return null; } } + + public getEquipmentsTitle(equipment: Equipment): string { + switch (equipment) { + case Equipment.wifi: + return 'Wifi'; + case Equipment.bornes: + return 'Bornes'; + case Equipment.printer: + return 'Imprimantes'; + case Equipment.tablet: + return 'Tablettes'; + case Equipment.computer: + return 'Ordinateurs'; + default: + return null; + } + } } diff --git a/src/app/shared/components/logo-card/logo-card.component.scss b/src/app/shared/components/logo-card/logo-card.component.scss index 9f982ddc8a176ef1d3fd66bdaed57f922fbf733f..09946b42730ad6f57d8becaba83f23e73f62e55c 100644 --- a/src/app/shared/components/logo-card/logo-card.component.scss +++ b/src/app/shared/components/logo-card/logo-card.component.scss @@ -13,7 +13,7 @@ p { div { border: 1px solid $grey-4; box-sizing: border-box; - border-radius: 4px; + border-radius: 16px; margin-bottom: 24px; padding: 16px 25px; max-width: 172px; diff --git a/src/app/shared/components/svg-icon/svg-icon.component.html b/src/app/shared/components/svg-icon/svg-icon.component.html index 7b6734e306c9f9cc097bdf0da50bacb5a19b7c84..055f851e1d2243edd4b650b23ec510ea3ad9e9a7 100644 --- a/src/app/shared/components/svg-icon/svg-icon.component.html +++ b/src/app/shared/components/svg-icon/svg-icon.component.html @@ -1,3 +1,4 @@ <svg aria-hidden="true" class="icon" [ngClass]="iconClass" [attr.fill]="iconColor" [attr.stroke]="iconColor"> + <title *ngIf="title">{{ title }}</title> <use [attr.xlink:href]="'assets/' + type + '/sprite.svg#' + icon"></use> </svg> diff --git a/src/app/shared/components/svg-icon/svg-icon.component.ts b/src/app/shared/components/svg-icon/svg-icon.component.ts index f0dbfa5ef64916400d087bddb359ab1217478ad8..23badf796fc5f101a3262319ef4eeddec3fc7965 100644 --- a/src/app/shared/components/svg-icon/svg-icon.component.ts +++ b/src/app/shared/components/svg-icon/svg-icon.component.ts @@ -10,5 +10,6 @@ export class SvgIconComponent { @Input() iconClass: string; @Input() type: string; @Input() iconColor: string = 'none'; + @Input() title: string = null; constructor() {} } diff --git a/src/app/structure-list/components/card/card.component.html b/src/app/structure-list/components/card/card.component.html index ee7a864fc95117475642e584508a9d040eefb1be..cfc62451e984945342059e7574286bab82fb2873 100644 --- a/src/app/structure-list/components/card/card.component.html +++ b/src/app/structure-list/components/card/card.component.html @@ -8,9 +8,6 @@ fxLayoutAlign="end center" fxLayoutGap="20px" > - <div class="isntPhoneContent" fxLayout="row" fxLayoutAlign="center center"> - <span class="indicatorDistance" *ngFor="let i of [].constructor(structure.getDistanceRange())"></span> - </div> <div> {{ this.formatDistance() }} </div> @@ -23,6 +20,7 @@ [type]="'ico'" [iconColor]="'grey'" [icon]="structure.getEquipmentsIcon(equipement)" + [title]="structure.getEquipmentsTitle(equipement)" ></app-svg-icon> </div> diff --git a/src/app/structure-list/components/card/card.component.scss b/src/app/structure-list/components/card/card.component.scss index 4d3d5aa0448d62179a1804d3c6174e14136face8..4bae4df3d7107b0eec3f29ef29f99ca332bd63ea 100644 --- a/src/app/structure-list/components/card/card.component.scss +++ b/src/app/structure-list/components/card/card.component.scss @@ -3,22 +3,6 @@ @import '../../../../assets/scss/typography'; @import '../../../../assets/scss/breakpoint'; -.indicatorDistance { - width: 34px; - height: 1px; - background: $grey-3; - border-radius: 1px; - &:before { - height: 7px; - width: 33px; - content: ''; - margin-top: -3px; - display: block; - border-radius: 1px; - border-left: 1px solid $grey-3; - border-right: 1px solid $grey-3; - } -} .structure { padding: 12px 0 12px 0; border-bottom: 1px dashed $grey !important; @@ -43,9 +27,3 @@ border-bottom: none; } } - -@media #{$large-phone} { - .isntPhoneContent { - display: none !important; - } -} diff --git a/src/app/structure-list/components/structure-details/structure-details.component.html b/src/app/structure-list/components/structure-details/structure-details.component.html index 1d401c6c57c590f218a4878767dd8148dfcaaf3b..8d375d069c14dfc5a9b10194fc7fbe7c78ad4d59 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.html +++ b/src/app/structure-list/components/structure-details/structure-details.component.html @@ -94,7 +94,7 @@ </div> </div> </div> - <!-- Démarches --> + <!-- Démarches en ligne --> <div *ngIf="structure.proceduresAccompaniment.length" fxLayout="column" @@ -104,7 +104,7 @@ > <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="8px"> <app-svg-icon [type]="'ico'" [icon]="'demarches'" [iconClass]="'icon-32'"></app-svg-icon> - <h2>Démarches</h2> + <h2>Démarches en ligne</h2> </div> <div fxLayout="column"> <div fxLayout="row wrap" fxLayoutGap="24px"> @@ -206,11 +206,6 @@ fxLayoutGap="13px" *ngFor="let equipement of structure.equipmentsAndServices" > - <app-svg-icon - [type]="'ico'" - [icon]="structure.getEquipmentsIcon(equipement)" - [iconColor]="'currentColor'" - ></app-svg-icon> <p> {{ getEquipmentsLabel(equipement) }} <span *ngIf="equipement == 'ordinateurs' && structure.nbComputers"> : {{ structure.nbComputers }}</span> diff --git a/src/app/structure-list/structure-list.component.html b/src/app/structure-list/structure-list.component.html index a4d7320ed0c1ee10516512502ddf3c53371c360e..57b306f09d6a1232fd3faf304ce1f67e573adfde 100644 --- a/src/app/structure-list/structure-list.component.html +++ b/src/app/structure-list/structure-list.component.html @@ -12,6 +12,7 @@ (showDetails)="showDetails($event)" (hover)="handleCardHover($event)" ></app-card> + <p *ngIf="structureList && structureList.length <= 0">Il n'y a aucune réponse correspondant à votre recherche</p> </div> <app-structure-details