[FIX] b_shift : email for non-attended shifts

beesdoo_shift/data/mail_template.xml

@@ -14,34 +14,41 @@
               <div style="font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; ">
 
                   % if object.replaced_id:
-    <p>Hello ${object.replaced_id.name},</p>
+                  <p>Hello ${object.replaced_id.name},
 
-    <p>You have been recorded as non-attended during your last shift (${format_tz(object.start_time,object.replaced_id.tz or 'Europe/Brussels','%d.%m.%Y - %H:%M')}).
-    <br/><br/> You were supposed to replace ${object.worker_id.name}. <br/><br/>
+                  <br><br>You have been recorded as non-attended during your last shift (${format_tz(object.start_time,object.replaced_id.tz or 'Europe/Brussels','%d.%m.%Y - %H:%M')}),
+                    and you were supposed to replace ${object.worker_id.name}.
+                  <br><br>Your current status is "${object.worker_id.cooperative_status_ids.get_status_value()}".
                   % endif
 
-    % if object.worker_id:
-    <p>Hello ${object.worker_id.name},</p>
+                  % if not object.replaced_id:
+                  </p><p>Hello ${object.worker_id.name},</p>
 
                   <p>You have been recorded as non-attended during your last shift (${format_tz(object.start_time,object.worker_id.tz or 'Europe/Brussels','%d.%m.%Y - %H:%M')}).
-    <br/><br/>
+                  <br><br>Your current status is "${object.worker_id.cooperative_status_ids.get_status_value()}".
                   % endif
 
+                  % if object.worker_id.working_mode == 'regular':
                     % if object.state == 'absent_0':
-        Super-cooperator assigned you 0 compensation, so you won't have any additionnal shift to do.
+                        <br><br>Super-cooperator assigned you 0 compensation, so you won't have any additionnal shift to do before your next regular shift.
                     % endif
                     % if object.state == 'absent_1':
-        Super-cooperator assigned you 1 compensation, so you have to attend another shift.
+                        <br><br>Super-cooperator assigned you 1 compensation, so you have to attend one additionnal shift before your next regular shift.
                     % endif
                     % if object.state == 'absent_2':
-        Super-cooperator assigned you 2 compensations, so you have to attend 2 anothers shifts.
+                        <br><br>Super-cooperator assigned you 2 compensations, so you have to attend two additionnal shifts before your next regular shift.
+                    % endif
                   % endif
 
-    <br/><br/>Your status have been updated to "${object.worker_id.state}".
-    <br/><br/>If you have any question regarding this non-attendance, just answer this e-mail.
+                  % if object.worker_id.working_mode == 'irregular':
+                        Your shift counter is ${object.worker_id.cooperative_status_ids.sr}.
+                        You should be at a minimum of 0 before the ${object.worker_id.cooperative_status_ids.future_alert_date}.
+                  % endif
+
+                  <br>If you have any question regarding this non-attendance, just answer this e-mail.
                   </p>
-    <br/>
-    <p>Cooperatively yours,<br/>
+                  <br>
+                  <p>Cooperatively yours,<br>
                   The Members' office volunteers</p>
                   <p>${object.worker_id.company_id.name}.</p>
 
@@ -49,13 +56,13 @@
                       ${object.worker_id.company_id.street}
                   % endif
                   % if object.worker_id.company_id.street2:
-        ${object.worker_id.company_id.street2}<br/>
+                      ${object.worker_id.company_id.street2}<br>
                   % endif
                   % if object.worker_id.company_id.city or object.worker_id.company_id.zip:
-        ${object.worker_id.company_id.zip} ${object.worker_id.company_id.city}<br/>
+                      ${object.worker_id.company_id.zip} ${object.worker_id.company_id.city}<br>
                   % endif
                   % if object.worker_id.company_id.country_id:
-        ${object.worker_id.company_id.state_id and ('%s, ' % object.worker_id.company_id.state_id.name) or ''} ${object.worker_id.company_id.country_id.name or ''}<br/>
+                      ${object.worker_id.company_id.state_id and ('%s, ' % object.worker_id.company_id.state_id.name) or ''} ${object.worker_id.company_id.country_id.name or ''}<br>
                   % endif
                   % if object.worker_id.company_id.phone:
                       Phone:&nbsp; ${object.worker_id.company_id.phone}
@@ -68,7 +75,7 @@
                   %endif
                   % if object.worker_id.company_id.logo_url:
                   <div>
-        <img src=${object.worker_id.company_id.logo_url}>
+                      <img src="${object.worker_id.company_id.logo_url}">
                   </div>
                   %endif
               </div>

beesdoo_shift/models/cooperative_status.py

@@ -36,6 +36,15 @@ class CooperativeStatus(models.Model):
     _rec_name = 'cooperator_id'
     _order = 'cooperator_id'
 
+    def get_status_value(self):
+        """
+        Workararound to get translated selection value instead of key in mail template.
+        """
+
+        state_list = self.env["cooperative.status"]._fields["status"].selection
+        state_list = self.env["cooperative.status"]._fields['status']._description_selection(self.env)
+
+        return dict(state_list)[self.status]
 
     today = fields.Date(help="Field that allow to compute field and store them even if they are based on the current date", default=fields.Date.today)
     cooperator_id = fields.Many2one('res.partner')