From a576a292212f9f3746f8eb414e0d12372417ff59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandre=20D=C3=ADaz?= <alexandre.diaz@tecnativa.com>
Date: Tue, 23 Jul 2019 17:50:45 +0200
Subject: [PATCH] [IMP] mail_tracking: Cc name & check if mail is Cc

---
 mail_tracking/models/mail_message.py          |  5 ++--
 .../static/src/xml/mail_tracking.xml          | 23 ++++++++++---------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/mail_tracking/models/mail_message.py b/mail_tracking/models/mail_message.py
index 38d10e063..bfe0bba12 100644
--- a/mail_tracking/models/mail_message.py
+++ b/mail_tracking/models/mail_message.py
@@ -51,7 +51,8 @@ class MailMessage(models.Model):
                 recipient = (
                     tracking.partner_id.name or tracking.recipient)
                 partner_trackings.append((
-                    status, tracking.id, recipient, tracking.partner_id.id))
+                    status, tracking.id, recipient, tracking.partner_id.id,
+                    tracking.partner_id.email))
                 if tracking.partner_id:
                     partners_already |= tracking.partner_id
             # Search all recipients for this message
@@ -87,7 +88,7 @@ class MailMessage(models.Model):
                 for partner in partners:
                     email_cc_list.discard(partner.email)
                     email_cc_list_checked.append(
-                        (partner.email, [partner.id, partner.display_name]))
+                        (partner.email, [partner.id, partner.name]))
                 for email in email_cc_list:
                     email_cc_list_checked.append((email, False))
             res.update({
diff --git a/mail_tracking/static/src/xml/mail_tracking.xml b/mail_tracking/static/src/xml/mail_tracking.xml
index 41e102370..0280e59a1 100644
--- a/mail_tracking/static/src/xml/mail_tracking.xml
+++ b/mail_tracking/static/src/xml/mail_tracking.xml
@@ -10,34 +10,34 @@
             <i class="fa fa-cc"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'unknown'">
+    <t t-elif="tracking[0] === 'unknown'">
         <span class="mail_tracking_unknown">
             <i class="fa fa-ban"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'waiting'">
+    <t t-elif="tracking[0] === 'waiting'">
         <span class="mail_tracking_waiting mail_tracking_pointer">
             <i class="fa fa-clock-o"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'error'">
+    <t t-elif="tracking[0] === 'error'">
         <span class="mail_tracking_error mail_tracking_pointer">
             <i class="fa fa-remove"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'sent'">
+    <t t-elif="tracking[0] === 'sent'">
         <span class="mail_tracking_sent mail_tracking_pointer">
             <i class="fa fa-check"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'delivered'">
+    <t t-elif="tracking[0] === 'delivered'">
         <span class="fa-stack mail_tracking_delivered mail_tracking_pointer">
             <i class="fa fa-check fa-stack-1x" style="margin-left:1px"></i>
             <i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;"></i>
             <i class="fa fa-check fa-stack-1x" style="margin-left:-3px"></i>
         </span>
     </t>
-    <t t-elif="tracking[0] == 'opened'">
+    <t t-elif="tracking[0] === 'opened'">
         <span class="fa-stack mail_tracking_opened mail_tracking_pointer">
             <i class="fa fa-check fa-stack-1x" style="margin-left:1px"></i>
             <i class="fa fa-check fa-inverse fa-stack-1x" style="margin-left:-2px;"></i>
@@ -50,13 +50,12 @@
     <t t-jquery="p[class='o_mail_info']" t-operation="after">
         <p class="o_mail_tracking">
             <strong>To:</strong>
-            <t t-set="first_tracking" t-value="true"/>
             <t t-foreach="message.partner_trackings" t-as="tracking">
                 <t t-set="isCc" t-value="false" />
                 <t t-foreach="message.email_cc" t-as="cc">
-                    <t t-if="cc[0] == tracking[4]" t-set="isCc" t-value="true" />
+                    <t t-if="!tracking[1] and cc[0] === tracking[4]" t-set="isCc" t-value="true" />
                 </t>
-                <t t-if="!first_tracking">
+                <t t-if="!tracking_first">
                       -
                 </t>
                 <t t-if="tracking[3]">
@@ -74,15 +73,17 @@
                       t-attf-title="Status: #{tracking[0]}">
                     <t t-call="mail.tracking.status"/>
                 </span>
-                <t t-set="first_tracking" t-value="false"/>
             </t>
 
             <t t-foreach="message.email_cc" t-as="cc">
                 <t t-set="needPrint" t-value="true" />
                 <t t-foreach="message.partner_trackings" t-as="tracking">
-                    <t t-if="cc[0] == tracking[4]" t-set="needPrint" t-value="false" />
+                    <t t-if="cc[0] === tracking[4]" t-set="needPrint" t-value="false" />
                 </t>
                 <t t-if="needPrint">
+                    <t t-if="!cc_first">
+                          -
+                    </t>
                     <t t-set="isCc" t-value="true" />
                     <t t-if="cc[1]">
                         <a t-attf-class="o_mail_action_tracking_partner o_mail_cc"