diff --git a/src/app/home/home.component.ts b/src/app/home/home.component.ts index 873be218ab9441be8e729aa92a2e4d01cb8c93a7..b2e80e6b82952b17f5a800121af18a85d860dc76 100644 --- a/src/app/home/home.component.ts +++ b/src/app/home/home.component.ts @@ -96,7 +96,7 @@ export class HomeComponent implements OnInit { private getStructurePosition(structure: Structure): Promise<Structure> { return new Promise((resolve, reject) => { this.getCoord(structure.n, structure.voie, structure.commune).subscribe((coord: GeoJson) => { - structure.address = coord.properties.name + ' - ' + coord.properties.postcode + ' ' + coord.properties.city; + structure.address = structure.voie + ' - ' + coord.properties.postcode + ' ' + coord.properties.city; structure.distance = parseInt( this.geoJsonService.getDistance( coord.geometry.getLon(), @@ -135,7 +135,7 @@ export class HomeComponent implements OnInit { (location) => { this.currentLocation = location; }, - (err) => console.error(err) + (err) => error(err) ); } 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 1dbd4399afd9cebf521272b2d49e5a962b85bfa1..15e99c89685f7298e7ee17ef46401e57b1d1fb96 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 @@ -3,7 +3,7 @@ <div fxLayout="row" fxLayoutAlign="end center"> <div (click)="close()" class="ico-close-details"></div> </div> - <div fxLayout="row" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> + <div fxLayout="row" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> <div fxLayout="column" fxLayoutGap="10px" fxFlex="100%"> <div fxLayout="row" fxLayoutAlign="space-between start"> <div fxLayout="column"> @@ -60,7 +60,7 @@ <div *ngIf="structure.accompagnementDesDemarches[0] !== ''" fxLayout="column" - class="structrue-details-block" + class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px" > @@ -85,7 +85,7 @@ <div *ngIf="isBaseSkills() || isAccessRights()" fxLayout="column" - class="structrue-details-block" + class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px" > @@ -105,7 +105,7 @@ </div> </div> <!-- Accueil --> - <div fxLayout="column" class="structrue-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> + <div fxLayout="column" class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px"> <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px"> <app-svg-icon [type]="'ico'" [icon]="'accueil'" [iconClass]="'icon-32'"></app-svg-icon> <h2>Accueil</h2> @@ -149,7 +149,7 @@ <div *ngIf="structure.hasEquipments()" fxLayout="column" - class="structrue-details-block" + class="structure-details-block" fxLayoutAlign="baseline baseline" > <div fxLayout="row" fxLayoutAlign="none flex-end" fxLayoutGap="20px"> @@ -169,7 +169,7 @@ <div *ngIf="structure.labelsEtQualifications[0] !== ''" fxLayout="column" - class="structrue-details-block" + class="structure-details-block" fxLayoutAlign="baseline baseline" fxLayoutGap="20px" > diff --git a/src/app/structure-list/components/structure-details/structure-details.component.scss b/src/app/structure-list/components/structure-details/structure-details.component.scss index 17dde04366aa40e77af234f5185ee53745d28e37..5e622e0772105b722aadad011f81b10b2398956a 100644 --- a/src/app/structure-list/components/structure-details/structure-details.component.scss +++ b/src/app/structure-list/components/structure-details/structure-details.component.scss @@ -17,16 +17,20 @@ overflow: auto; } -.structrue-details-block { +.structrue-details-container > .structure-details-block { + padding: 0px 68px 24px 0; border-bottom: 1px dashed $grey-2; - padding-bottom: 24px; - padding-right: 68px; .subtitle { text-transform: uppercase; @include cn-bold-16; } } -.structrue-details-block:last-child { + +.structrue-details-container > .structure-details-block ~ .structure-details-block { + padding: 24px 68px 24px 0; +} + +.structure-details-block:last-child { border-bottom: none; }