From d69a7af79e8b9be529f5a99dac1e14fb95004af1 Mon Sep 17 00:00:00 2001
From: Elouan Le Bars <elouan@coopiteasy.be>
Date: Wed, 15 Jan 2020 16:26:50 +0100
Subject: [PATCH] [IMP] b_shift : attendance sheet validation wizard

---
 .../wizard/validate_attendance_sheet.py       | 46 ++++---------------
 .../wizard/validate_attendance_sheet.xml      |  5 +-
 2 files changed, 12 insertions(+), 39 deletions(-)

diff --git a/beesdoo_shift/wizard/validate_attendance_sheet.py b/beesdoo_shift/wizard/validate_attendance_sheet.py
index 3161b0c..cc32a5f 100644
--- a/beesdoo_shift/wizard/validate_attendance_sheet.py
+++ b/beesdoo_shift/wizard/validate_attendance_sheet.py
@@ -34,7 +34,7 @@ class ValidateAttendanceSheet(models.TransientModel):
         but should be doing their regular shifts. This warning is added
         to sheet's notes at validation.
         """
-        sheet = self._get_active_sheet()
+        sheet = self.active_sheet
         warning_message = ""
         if sheet:
             for added_shift in sheet.added_shift_ids:
@@ -53,21 +53,9 @@ class ValidateAttendanceSheet(models.TransientModel):
                     )
         return warning_message
 
-    @api.multi
-    def _get_default_notes(self):
-        if self._get_active_sheet():
-            return self._get_active_sheet().notes
-
-    @api.multi
-    def _get_default_feedback(self):
-        if self._get_active_sheet():
-            return self._get_active_sheet().feedback
-
-    @api.multi
-    def _get_default_worker_nb_feedback(self):
-        if self._get_active_sheet():
-            return self._get_active_sheet().worker_nb_feedback
-
+    active_sheet = fields.Many2one(
+        "beesdoo.shift.sheet", default=_get_active_sheet
+    )
     card_support = fields.Boolean(default=_get_card_support_setting)
     login = fields.Char(string="Login")
     password = fields.Char(string="Password")
@@ -77,22 +65,10 @@ class ValidateAttendanceSheet(models.TransientModel):
         default=_get_warning_regular_workers,
         help="Is any regular worker doing its regular shift as an added one ?",
     )
-    notes = fields.Text(
-        "Notes about the attendance for Members Office",
-        default=_get_default_notes,
-    )
-    feedback = fields.Text(
-        "Comments about the shift", default=_get_default_feedback
-    )
+    notes = fields.Text(related="active_sheet.notes")
+    feedback = fields.Text(related="active_sheet.feedback")
     worker_nb_feedback = fields.Selection(
-        [
-            ("not_enough", "Not enough"),
-            ("enough", "Enough"),
-            ("too_many", "Too many"),
-        ],
-        string="Was your team big enough?",
-        default=_get_default_worker_nb_feedback,
-        required=True,
+        related="active_sheet.worker_nb_feedback", required=True
     )
 
     def on_barcode_scanned(self, barcode):
@@ -100,18 +76,14 @@ class ValidateAttendanceSheet(models.TransientModel):
 
     @api.multi
     def save(self):
-        """
-        Save modifications onto attendance sheet.
-        """
-        sheet = self._get_active_sheet()
-
+        sheet = self.active_sheet
         sheet.notes = self.notes
         sheet.feedback = self.feedback
         sheet.worker_nb_feedback = self.worker_nb_feedback
 
     @api.multi
     def validate_sheet(self):
-        sheet = self._get_active_sheet()
+        sheet = self.active_sheet
 
         if self.card_support:
             # Login with barcode
diff --git a/beesdoo_shift/wizard/validate_attendance_sheet.xml b/beesdoo_shift/wizard/validate_attendance_sheet.xml
index 9a06498..d124e77 100644
--- a/beesdoo_shift/wizard/validate_attendance_sheet.xml
+++ b/beesdoo_shift/wizard/validate_attendance_sheet.xml
@@ -5,8 +5,10 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
-                    <separator string="Validation"/>
+                    <field name="card_support" invisible="1" />
+                    <field name="active_sheet" invisible="1" />
                     <field name="_barcode_scanned" widget="barcode_handler"/>
+                    <separator string="Validation"/>
                     <field name="warning_regular_workers"
                            readonly="1"
                            attrs="{'invisible': [('warning_regular_workers', '=', False)]}"
@@ -18,7 +20,6 @@
                     <group>
                         <field name="worker_nb_feedback"/>
                     </group>
-                    <field name="card_support" invisible="1" />
                     <group string="Login"
                            attrs="{'invisible': [('card_support', '=', True)]}"
                     >