From 5f495169380795d08980b03ea72f4872a00a1401 Mon Sep 17 00:00:00 2001
From: Elouan Le Bars <elouan@coopiteasy.be>
Date: Fri, 31 Jan 2020 11:59:23 +0100
Subject: [PATCH] [UPD] b_shift : attendance sheet form view

---
 beesdoo_shift/views/attendance_sheet.xml      | 40 ++++++++-----------
 .../wizard/validate_attendance_sheet.xml      | 12 +++---
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/beesdoo_shift/views/attendance_sheet.xml b/beesdoo_shift/views/attendance_sheet.xml
index a3480fd..c0727cf 100644
--- a/beesdoo_shift/views/attendance_sheet.xml
+++ b/beesdoo_shift/views/attendance_sheet.xml
@@ -132,17 +132,21 @@
             <form create="false" delete="false">
                 <field name="_barcode_scanned" widget="barcode_handler"/>
                 <header>
-                    <field name="state" widget="statusbar" readonly="True"/>
-                    <button type="object"
-                            name="validate_with_checks"
-                            string="Validate Sheet"
-                            confirm="Beware : a validated sheet cannot be edited anymore
-                            and you won't be able to add any latecomers.
-                            The counters of those who didn't attend will be updated
-                            and they will get warning emails."
-                    />
+                    <div class="oe_bold">
+                        <field name="state" widget="statusbar" readonly="True" class="oe_inline"/>
+                        <button type="object"
+                                name="validate_with_checks"
+                                string="Validate Sheet"
+                                confirm="Beware : a validated sheet cannot be edited anymore
+                                and you won't be able to add any latecomers.
+                                The counters of those who didn't attend will be updated
+                                and they will get warning emails."
+                                attrs="{'invisible': [('state', '=', 'validated')]}"
+                        />
+                    </div>
+                    <div class="oe_clear" />
                 </header>
-                <sheet>
+                <sheet >
                     <div class="oe_button_box" name="button_box">
                         <button name="button_mark_as_read" type="object"
                                 class="oe_stat_button" icon="fa-check"
@@ -157,20 +161,10 @@
                             <field name="active" widget="boolean_button" options='{"terminology": "archive"}'/>
                         </button>
                     </div>
-                    <div class="oe_title">
-                        <h1>
-                            <field name="time_slot" />
-                        </h1>
-                    </div>
-                        You will be able to write notes
-                        about what you cannot encode here
-                        when clicking on 'validate'.<br/><br/>
-                        <label for="max_worker_no" />
-                        <field name="max_worker_no" />
-                        <separator string="Added workers" />
-                        <field name="added_shift_ids"/>
-                        <separator string="Expected workers" />
+                        <separator string="Expected Shifts" style="position:relative;padding:0px;margin:0px;" />
                         <field name="expected_shift_ids" />
+                        <separator string="Added Shifts" style="position:relative;padding:0px;margin-top:15px;margin-bottom:0px;" />
+                        <field name="added_shift_ids" />
                         <br/>
                         <group col="1" string="Feedback"
                                groups="beesdoo_shift.group_shift_attendance">
diff --git a/beesdoo_shift/wizard/validate_attendance_sheet.xml b/beesdoo_shift/wizard/validate_attendance_sheet.xml
index 6b20d6e..0d475a3 100644
--- a/beesdoo_shift/wizard/validate_attendance_sheet.xml
+++ b/beesdoo_shift/wizard/validate_attendance_sheet.xml
@@ -5,15 +5,11 @@
         <field name="arch" type="xml">
             <form>
                 <sheet>
+                    <separator string="Validation" style="position:absolute; top:0px;"/>
                     <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)]}"
-                    />
-                    <group string="Additional informations" >
+                    <group col="1">
                         <field name="notes" />
                         <field name="feedback" />
                     </group>
@@ -31,6 +27,10 @@
                     >
                         <field name="barcode" />
                     </group>
+                    <field name="warning_regular_workers"
+                           readonly="1"
+                           attrs="{'invisible': [('warning_regular_workers', '=', False)]}"
+                    />
                 </sheet>
                 <footer>
                     <button type="object"