From b3191bc99244c59335a0d9db37054c2728bfb813 Mon Sep 17 00:00:00 2001
From: Alex ORLUC <alex.orluc@maarch.org>
Date: Wed, 6 Nov 2019 15:39:19 +0100
Subject: [PATCH] FEAT #12033 TIME 0:20 fix css ar type

---
 .../mail-resume/mail-resume.component.html    |  4 +++-
 .../mail-resume/mail-resume.component.scss    |  5 ++++
 .../mail/mail-resume/mail-resume.component.ts | 24 ++++++++++++++++++-
 src/frontend/lang/lang-en.ts                  |  2 ++
 src/frontend/lang/lang-fr.ts                  |  4 +++-
 src/frontend/lang/lang-nl.ts                  |  2 ++
 6 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/src/frontend/app/mail/mail-resume/mail-resume.component.html b/src/frontend/app/mail/mail-resume/mail-resume.component.html
index 900de435e74..a85d6ac12e7 100644
--- a/src/frontend/app/mail/mail-resume/mail-resume.component.html
+++ b/src/frontend/app/mail/mail-resume/mail-resume.component.html
@@ -15,9 +15,11 @@
                 {{lang.sendError}}
             </div>
         </ng-template>
-        <div class="info">
+
+        <div class="info" [class.arType]="mail.type === 'aknowledgement_receipt'">
             {{mail.object}}
         </div>
+
         <div class="date">
             {{mail.userInfo}}
         </div>
diff --git a/src/frontend/app/mail/mail-resume/mail-resume.component.scss b/src/frontend/app/mail/mail-resume/mail-resume.component.scss
index 5498a4d3a3b..40fe56af2f0 100644
--- a/src/frontend/app/mail/mail-resume/mail-resume.component.scss
+++ b/src/frontend/app/mail/mail-resume/mail-resume.component.scss
@@ -51,4 +51,9 @@
     padding: 5px;
     font-style: italic;
     color: $warn
+}
+
+.arType {
+    color: #666;
+    font-style: italic;
 }
\ No newline at end of file
diff --git a/src/frontend/app/mail/mail-resume/mail-resume.component.ts b/src/frontend/app/mail/mail-resume/mail-resume.component.ts
index 5adea2cf954..ac48549fcc9 100644
--- a/src/frontend/app/mail/mail-resume/mail-resume.component.ts
+++ b/src/frontend/app/mail/mail-resume/mail-resume.component.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, Input, EventEmitter, Output } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
 import { LANG } from '../../translate.component';
-import { catchError, tap, finalize } from 'rxjs/operators';
+import { catchError, tap, finalize, map } from 'rxjs/operators';
 import { of } from 'rxjs';
 import { NotificationService } from '../../notification.service';
 
@@ -39,6 +39,28 @@ export class MailResumeComponent implements OnInit {
     loadMails(resId: number) {
         this.loading = true;
         this.http.get(`../../rest/externalSummary/${resId}?limit=3`).pipe(
+            map((data: any) => {
+                data.elementsSend = data.elementsSend.map((elem: any) => {
+                    let object = elem.object;
+                    let type = elem.type;
+                    if (elem.object === '') {
+                        object = this.lang.ARPaper;
+                        type = 'aknowledgement_receipt';
+                    } else if (elem.object.startsWith("[AR]")) {
+                        object = this.lang.ARelectronic;
+                        type = 'aknowledgement_receipt';
+                    }
+
+                    return {
+                        object: object,
+                        send_date: elem.send_date,
+                        status: elem.status,
+                        userInfo: elem.userInfo,
+                        type: type
+                    }
+                });
+                return data;
+            }),
             tap((data: any) => {
                 this.mails = data.elementsSend;
             }),
diff --git a/src/frontend/lang/lang-en.ts b/src/frontend/lang/lang-en.ts
index ead9bf29b53..c3bbaede391 100755
--- a/src/frontend/lang/lang-en.ts
+++ b/src/frontend/lang/lang-en.ts
@@ -1255,4 +1255,6 @@ export const LANG_EN = {
     "newsFeed" : "News feed",
     "sendError" : "Send error",
     "historyDisabled" : "History disabled",
+    "ARPaper" : "Paper acknowledgement of receipt",
+    "ARelectronic" : "Electronic acknowledgement of receipt",
 };
diff --git a/src/frontend/lang/lang-fr.ts b/src/frontend/lang/lang-fr.ts
index 5ffacb77beb..8853489284a 100755
--- a/src/frontend/lang/lang-fr.ts
+++ b/src/frontend/lang/lang-fr.ts
@@ -1291,5 +1291,7 @@ export const LANG_FR = {
     "mailsSentAlt" : "Éléments envoyés",
     "newsFeed" : "Fil d'actualité",
     "sendError" : "Erreur d'envoi",
-    "historyDisabled" : "Historique désactivé",    
+    "historyDisabled" : "Historique désactivé",
+    "ARPaper" : "Accusé de réception papier",
+    "ARelectronic" : "Accusé de réception électronique",
 };
diff --git a/src/frontend/lang/lang-nl.ts b/src/frontend/lang/lang-nl.ts
index ef1f951721c..650cd973b3b 100755
--- a/src/frontend/lang/lang-nl.ts
+++ b/src/frontend/lang/lang-nl.ts
@@ -1280,4 +1280,6 @@ export const LANG_NL = {
     "newsFeed" : "News feed", //_TO_TRANSLATE
     "sendError" : "Send error", //_TO_TRANSLATE
     "historyDisabled" : "History disabled", //_TO_TRANSLATE
+    "ARPaper" : "Paper acknowledgement of receipt", //_TO_TRANSLATE
+    "ARelectronic" : "Electronic acknowledgement of receipt", //_TO_TRANSLATE
 };
-- 
GitLab