Commit 860549ab authored by Guillaume Heurtier's avatar Guillaume Heurtier

FEAT #13339 TIME 3:40 fix contact list height + added message if no duplicates found

parent aad14a4e
......@@ -52,6 +52,9 @@
</mat-expansion-panel>
</mat-accordion>
</div>
<div *ngIf="duplicatesContactsCount === 0" style="padding: 10px;text-align: center;color: rgba(0,0,0,0.54);">
<em>{{lang.noDuplicatesFound}}</em>
</div>
<div *ngIf="duplicatesContacts.length > 0" style="padding: 10px;text-align: right;color: rgba(0,0,0,0.54);">
{{lang.duplicatesContactDisplayed | scan: [duplicatesContactsRealCount, duplicatesContactsCount]}}
</div>
......@@ -92,4 +95,4 @@
</div>
</div>
</mat-sidenav-content>
</mat-sidenav-container>
\ No newline at end of file
</mat-sidenav-container>
......@@ -68,7 +68,7 @@ export class ContactDuplicateComponent implements OnInit {
duplicatesContacts: any[] = [];
duplicatesContactsCount: number = 0;
duplicatesContactsCount: number = -1;
duplicatesContactsRealCount: number = 0;
displayedColumns = ['lastname', 'company', 'address'];
......
<div class="mat-dialog-content-container">
<div mat-dialog-content class="contact-list-container" [class.contact-list-container-1]="data.duplicate.length == 1" [class.contact-list-container-2]="data.duplicate.length == 2">
<div *ngFor="let contact of data.duplicate;let i=index">
<app-contact-detail #appContactDetail [class.merged]="contactSelected!==i && contactSelected!==null" [contact]="contact" [selectable]="contactSelected===i || contactSelected===null" (afterSelectedEvent)="mergeContact($event, i)" (afterDeselectedEvent)="resetContact($event, i)"></app-contact-detail>
<app-contact-detail #appContactDetail [class.merged]="contactSelected!==i && contactSelected!==null" [contact]="contact"
[selectable]="contactSelected===i || contactSelected===null" (afterSelectedEvent)="mergeContact($event, i)"
(afterDeselectedEvent)="resetContact($event, i)" style="height: 100%">
</app-contact-detail>
</div>
</div>
<span class="divider-modal"></span>
......
......@@ -3,7 +3,7 @@
}
.contact-list-container {
padding: 10px;
padding: 20px;
display: grid;
grid-template-columns: repeat(3, 33%);
grid-gap: 10px;
......@@ -15,4 +15,4 @@
.contact-list-container-2 {
grid-template-columns: repeat(2, 1fr);
}
\ No newline at end of file
}
......@@ -19,11 +19,12 @@
.contact-card {
//min-width: 350px;
//width: 100%;
margin-top: 10px;
margin-bottom: 10px;
//margin-top: 10px;
//margin-bottom: 10px;
padding: 0px;
box-shadow: none;
border: solid 1px rgba(0, 0, 0, 0.12);
height: 100%;
::ng-deep.mat-expansion-panel-body {
padding-left: 0px;
......@@ -140,4 +141,4 @@
.selected {
opacity: 1 !important;
}
\ No newline at end of file
}
......@@ -1704,4 +1704,5 @@ export const LANG_EN = {
"modificationsProcessed": "Modifications processed",
'updateIndexingFieldWarning': 'Warning: if you remove a field from the model, this field will be reset for <b>ALL</b> resources linked to this model. Do you want to continue ?',
'selectDuplicatedContact': 'Merge with this contact',
'noDuplicatesFound': 'No duplicates found',
};
......@@ -1706,4 +1706,5 @@ export const LANG_FR = {
"modificationsProcessed": "Modifications effectuées",
'updateIndexingFieldWarning': 'Attention si vous supprimez un champ du modèle, ce champ sera réinitialisé pour <b>TOUS</b> les courriers associés au modèle. Voulez-vous continuer ?',
'selectDuplicatedContact': 'Fusionner vers ce contact',
'noDuplicatesFound': 'Aucun doublons trouvés'
};
......@@ -1688,4 +1688,5 @@ export const LANG_NL = {
"modificationsProcessed": "Modifications processed", //_TO_TRANSLATE,
'updateIndexingFieldWarning': 'Warning: if you remove a field from the model, this field will be reset for <b>ALL</b> resources linked to this model. Do you want to continue ?', //_TO_TRANSLATE
'selectDuplicatedContact': 'Merge with this contact', // _TO_TRANSLATE
'noDuplicatesFound': 'No duplicates found', // _TO_TRANSLATE
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment