Commit 34fd28f0 authored by Hamza HRAMCHI's avatar Hamza HRAMCHI
Browse files

FIX #18428 TIME 0:15 sent numeric package: display communicationMean + contact detail

parent a31edf45
...@@ -15,6 +15,6 @@ ...@@ -15,6 +15,6 @@
<img src="assets/spinner.gif"/> <img src="assets/spinner.gif"/>
</div> </div>
</app-root> </app-root>
<script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.8c2a86db22bc37211976.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.65def4c6e35150a25546.js" type="module"></script><script src="main-es5.65def4c6e35150a25546.js" nomodule defer></script></body> <script src="runtime-es2015.4ac42fef445445e6f3d0.js" type="module"></script><script src="runtime-es5.4ac42fef445445e6f3d0.js" nomodule defer></script><script src="polyfills-es5.8c2a86db22bc37211976.js" nomodule defer></script><script src="polyfills-es2015.f8f86766446f4344eec7.js" type="module"></script><script src="scripts.3f995a62571f9f668311.js" defer></script><script src="main-es2015.577b6fec6023ae20a6a1.js" type="module"></script><script src="main-es5.577b6fec6023ae20a6a1.js" nomodule defer></script></body>
</html> </html>
\ No newline at end of file
...@@ -90,12 +90,37 @@ ...@@ -90,12 +90,37 @@
<p mat-line class="contact-content" [class.newData]="isNewValue('notes')" [title]="contact.notes"> <p mat-line class="contact-content" [class.newData]="isNewValue('notes')" [title]="contact.notes">
{{contact.notes}} </p> {{contact.notes}} </p>
</mat-list-item> </mat-list-item>
<mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans)" <ng-container *ngIf="!functionsService.empty(contact.communicationMeans)">
[title]="'lang.communicationMean' | translate"> <mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans.url)"
<mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon> [title]="'lang.communicationMean' | translate">
<p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans')" [title]="contact.communicationMeans"> <mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
{{contact.communicationMeans}} </p> <p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans.url')" [title]="contact.communicationMeans.url">
</mat-list-item> {{contact.communicationMeans.url}}
</p>
</mat-list-item>
<mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans.email)"
[title]="'lang.m2mEmailDesc' | translate">
<mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
<p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans.email')" [title]="contact.communicationMeans.email">
{{contact.communicationMeans.email}}
</p>
</mat-list-item>
<mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans.login)"
[title]="'lang.userIdMaarch2MaarchDesc' | translate">
<mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
<p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans.login')" [title]="contact.communicationMeans.login">
{{contact.communicationMeans.login}}
</p>
</mat-list-item>
<mat-list-item class="contact-item"
*ngIf="!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])"
[title]="'lang.IdMaarch2Maarch' | translate">
<mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
<p mat-line class="contact-content" [title]="contact.externalId['m2m']">
{{contact.externalId['m2m']}} </p>
</mat-list-item>
</ng-container>
<mat-list-item class="contact-item" <mat-list-item class="contact-item"
*ngIf="!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])" *ngIf="!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])"
[title]="'lang.IdMaarch2Maarch' | translate"> [title]="'lang.IdMaarch2Maarch' | translate">
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
<div> <div>
{{option.label}} - <b>{{option.m2m}}</b> {{option.label}} - <b>{{option.m2m}}</b>
</div> </div>
<div class="attachLabel"> <div *ngIf="!functions.empty(option.communicationMeans.url) || functions.empty(option.communicationMeans.login)" class="attachLabel">
({{'lang.communicationMean' | translate}} : {{option.communicationMeans}}) ({{'lang.communicationMean' | translate}} : {{getCommunicationMean(option.communicationMeans)}})
</div> </div>
</mat-option> </mat-option>
</mat-autocomplete> </mat-autocomplete>
......
...@@ -565,4 +565,12 @@ export class SentNumericPackagePageComponent implements OnInit { ...@@ -565,4 +565,12 @@ export class SentNumericPackagePageComponent implements OnInit {
canSendNumericPackage() { canSendNumericPackage() {
return this.privilegeService.getCurrentUserMenus().filter((item: any) => item.id === 'manage_numeric_package').length > 0; return this.privilegeService.getCurrentUserMenus().filter((item: any) => item.id === 'manage_numeric_package').length > 0;
} }
getCommunicationMean(value: any) {
if (!this.functions.empty(value.url)) {
return value.url;
} else if (!this.functions.empty(value.email)) {
return value.email;
}
}
} }
Supports Markdown
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