From 8ee4aca5f49d5f4a8fe828fb7369785e9917f505 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 8 Mar 2018 14:52:03 +0100
Subject: [PATCH] [WIP][REF][FIX]GOLEM Member card : only default season and
 refactoring

---
 golem_member/views/report_golem_member.xml | 86 +++++++++++-----------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/golem_member/views/report_golem_member.xml b/golem_member/views/report_golem_member.xml
index aa89406..ca9e9c1 100644
--- a/golem_member/views/report_golem_member.xml
+++ b/golem_member/views/report_golem_member.xml
@@ -31,70 +31,68 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <t t-call="report.html_container">
         <t t-call="report.external_layout">
           <div id='page_report_member' class="page">
-            <t t-foreach="docs" t-as="o">
-              <div class="row" style="margin: 3% 0 3% 0;">
-                <div class="col-xs-8">
-                  <h2><span t-field="o.name" /> - <span t-field="o.number" /></h2>
-                </div>
-                <div class="col-xs-4">
+            <t t-set="season" t-value="docs._default_season()" />
+            <t t-foreach="docs" t-as="member">
+              <div class="row">
+                <h2>Member <span t-field="member.name" /> - <span t-field="member.number" /></h2>
+                <p>
                   <strong>Season :</strong>
-                  <span t-field="o.season_ids[0].name" />
-                  <br />
-                  <strong>Date :</strong>
-                  <span t-field="o.season_ids[0].date_start" />
-                  -
-                  <span t-field="o.season_ids[0].date_end" />
-                </div>
+                  <span t-field="season.name" />
+                  <t t-if="season.date_start">
+                    (<em>from :
+                    <span t-field="season.date_start" /> to
+                    <span t-field="season.date_end" /></em>)
+                  </t>
+                </p>
               </div>
-            </t>
-            <p><strong>Activities</strong> for this season</p>
-            <table id="table_activity_ref" class="table table-striped">
-              <thead>
-                <tr>
-                  <th>Name</th>
-                  <th>Type</th>
-                  <th>Animator</th>
-                  <th>Day</th>
-                  <th>Hour start</th>
-                  <th>Hour stop</th>
-                  <th>Date start</th>
-                  <th id="activity_inherit_th">Date stop</th>
-                </tr>
-              </thead>
-              <tbody>
-                <t t-foreach="docs" t-as="o">
-                  <tr id="activity_inherit_price_sum" t-foreach="o.activity_registration_ids" t-as="t">
+              <h3>Activities for this season</h3>
+              <table id="table_activity_ref" class="table table-striped">
+                <thead>
+                  <tr>
+                    <th>Name</th>
+                    <th>Type</th>
+                    <th>Animator</th>
+                    <th>Day</th>
+                    <th>Hour start</th>
+                    <th>Hour stop</th>
+                    <th>Date start</th>
+                    <th id="activity_inherit_th">Date stop</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr id="activity_inherit_price_sum"
+                    t-foreach="member.activity_registration_ids" t-as="reg">
                       <td class="col-xs-2">
-                        <span t-esc="t.activity_id.name" />
+                        <span t-esc="reg.activity_id.name" />
                       </td>
                       <td class="col-xs-2">
-                        <span t-esc="t.activity_id.type_id.name" />
+                        <span t-esc="reg.activity_id.type_id.name" />
                       </td>
                       <td class="col-xs-2">
-                        <span t-field="t.activity_id.animator_id" />
+                        <span t-field="reg.activity_id.animator_id" />
                       </td>
                       <td class="col-xs-2">
-                        <span t-field="t.activity_id.weekday" />
+                        <span t-field="reg.activity_id.weekday" />
                       </td>
                       <td class="col-xs-1">
-                        <t t-esc="'%02d:%02d' % (int(t.activity_id.hour_start), round(t.activity_id.hour_start % 1 * 60))" />
+                        <t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_start), round(reg.activity_id.hour_start % 1 * 60))" />
                       </td>
                       <td class="col-xs-1">
-                        <t t-esc="'%02d:%02d' % (int(t.activity_id.hour_stop), round(t.activity_id.hour_stop % 1 * 60))" />
+                        <t t-esc="'%02d:%02d' % (int(reg.activity_id.hour_stop), round(reg.activity_id.hour_stop % 1 * 60))" />
                         </td>
                       <td class="col-xs-2">
-                          <span t-if="t.activity_id.is_fullseason" t-field="o.season_ids[0].date_start" />
-                          <span t-else="" t-field="t.activity_id.date_start" />
+                          <span t-if="reg.activity_id.is_fullseason" t-field="season.date_start" />
+                          <span t-else="" t-field="reg.activity_id.date_start" />
                       </td>
                       <td id="activity_inherit_td">
-                          <span t-if="t.activity_id.is_fullseason" t-field="o.season_ids[0].date_end" />
-                          <span t-else="" t-field="t.activity_id.date_stop" />
+                          <span t-if="reg.activity_id.is_fullseason" t-field="season.date_end" />
+                          <span t-else="" t-field="reg.activity_id.date_stop" />
                       </td>
                   </tr>
                   <tr id="activity_inherit_total"></tr>
-                </t>
-              </tbody>
-            </table>
+                </tbody>
+              </table>
+            </t>
           </div>
         </t>
       </t>