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

dist/index.html

@@ -15,6 +15,6 @@
             <img src="assets/spinner.gif"/>
         </div>
     </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>
\ No newline at end of file

src/frontend/app/contact/contact-detail/contact-detail.component.html

@@ -90,12 +90,37 @@
                         <p mat-line class="contact-content" [class.newData]="isNewValue('notes')" [title]="contact.notes">
                             {{contact.notes}} </p>
                     </mat-list-item>
-                    <mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans)"
-                        [title]="'lang.communicationMean' | translate">
-                        <mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
-                        <p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans')" [title]="contact.communicationMeans">
-                            {{contact.communicationMeans}} </p>
-                    </mat-list-item>
+                    <ng-container *ngIf="!functionsService.empty(contact.communicationMeans)">
+                        <mat-list-item class="contact-item" *ngIf="!functionsService.empty(contact.communicationMeans.url)"
+                            [title]="'lang.communicationMean' | translate">
+                            <mat-icon mat-list-icon class="contact-group fas fa-hashtag"></mat-icon>
+                            <p mat-line class="contact-content" [class.newData]="isNewValue('communicationMeans.url')" [title]="contact.communicationMeans.url">
+                                {{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"
                         *ngIf="!functionsService.empty(contact.externalId) && !functionsService.empty(contact.externalId['m2m'])"
                         [title]="'lang.IdMaarch2Maarch' | translate">

src/frontend/app/sentResource/sent-numeric-package-page/sent-numeric-package-page.component.html

@@ -46,8 +46,8 @@
                     <div>
                         {{option.label}} - <b>{{option.m2m}}</b>
                     </div>
-                    <div class="attachLabel">
-                        ({{'lang.communicationMean' | translate}} : {{option.communicationMeans}})
+                    <div *ngIf="!functions.empty(option.communicationMeans.url) || functions.empty(option.communicationMeans.login)" class="attachLabel">
+                        ({{'lang.communicationMean' | translate}} : {{getCommunicationMean(option.communicationMeans)}})
                     </div>
                 </mat-option>
             </mat-autocomplete>

src/frontend/app/sentResource/sent-numeric-package-page/sent-numeric-package-page.component.ts

@@ -565,4 +565,12 @@ export class SentNumericPackagePageComponent implements OnInit {
     canSendNumericPackage() {
         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;
+        }
+    }
 }