diff --git a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.html b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.html index 0a06b6205714b2205a6825c8ee0810b4b9140c46..221d34f19c32daaaea0050bcaf47e68a1e1b1d06 100644 --- a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.html +++ b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.html @@ -42,8 +42,8 @@ [title]="lang.contactsParameters_department"></mat-icon> <p mat-line class="contact-content" [title]="option.department"> {{option.department}} </p> - <p mat-line class="contact-content" *ngIf="!empty(option.occupancy)" - [title]="option.occupancy"> ({{option.occupancy}}) </p> + <p mat-line class="contact-content" *ngIf="!empty(option.addressAdditional1)" + [title]="option.addressAdditional1"> ({{option.addressAdditional1}}) </p> </mat-list-item> <mat-list-item class="contact-item" *ngIf="!empty(option.email)"> <mat-icon mat-list-icon class="contact-group far fa-envelope" [title]="lang.email"> @@ -57,19 +57,19 @@ <p mat-line class="contact-content" [title]="option.phone"> {{option.phone}} </p> </mat-list-item> <mat-list-item class="contact-address" [title]="lang.address" - *ngIf="!empty(option.number) || !empty(option.street) || !empty(option.complement) || !empty(option.postalCode) || !empty(option.town) || !empty(option.country)"> + *ngIf="!empty(option.number) || !empty(option.addressStreet) || !empty(option.addressAdditional2) || !empty(option.addressPostcode) || !empty(option.addressTown) || !empty(option.addressCountry)"> <mat-icon mat-list-icon class="contact-group fas fa-map-marker-alt"></mat-icon> <p mat-line class="contact-content" - *ngIf="!empty(option.number) || !empty(option.street)" [title]="option.street"> - {{option.number}} {{option.street}} </p> - <p mat-line class="contact-content" *ngIf="!empty(option.complement)" - [title]="option.complement"> ({{option.complement}}) </p> + *ngIf="!empty(option.number) || !empty(option.addressStreet)" [title]="option.addressStreet"> + {{option.number}} {{option.addressStreet}} </p> + <p mat-line class="contact-content" *ngIf="!empty(option.addressAdditional2)" + [title]="option.addressAdditional2"> ({{option.addressAdditional2}}) </p> <p mat-line class="contact-content" - *ngIf="!empty(option.postalCode) || !empty(option.town)" - [title]="option.postalCode + ' ' + option.town"> {{option.postalCode}} - {{option.town}} </p> - <p mat-line class="contact-content" *ngIf="!empty(option.country)" - [title]="option.country"> {{option.country}} </p> + *ngIf="!empty(option.addressPostcode) || !empty(option.addressTown)" + [title]="option.addressPostcode + ' ' + option.addressTown"> {{option.addressPostcode}} + {{option.addressTown}} </p> + <p mat-line class="contact-content" *ngIf="!empty(option.addressCountry)" + [title]="option.addressCountry"> {{option.addressCountry}} </p> </mat-list-item> </mat-list> </mat-card-content> diff --git a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss index 893828a20843d3cd6c2ce0a121535516cfd29655..3a91f95a54a7944b916f2468ccd5af0ab8674d37 100644 --- a/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss +++ b/src/frontend/app/contact/autocomplete/contact-autocomplete.component.scss @@ -150,6 +150,9 @@ } .contact-address { + height: auto !important; + padding-top: 5px; + padding-bottom: 5px; ::ng-deep.mat-list-item-content { padding-top: 0px !important; padding-bottom: 0px !important; @@ -159,4 +162,6 @@ .contact-filling { position: absolute; right: 8px; + border-radius: 10px; + box-shadow: 0px 0px 1px 0px rgba(0,0,0,0.75); } \ No newline at end of file