From 027eaf0a9b21d1924293286fdb70edd2a98d89a5 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Thu, 8 Mar 2018 15:02:39 +0100
Subject: [PATCH] [MOV]GOLEM Membership member card report move

---
 golem_member/views/report_golem_member.xml    | 43 +++++++++++--------
 golem_membership/__manifest__.py              |  2 +-
 golem_membership/report/__init__.py           | 19 --------
 .../report_golem_member.xml}                  |  0
 4 files changed, 27 insertions(+), 37 deletions(-)
 delete mode 100644 golem_membership/report/__init__.py
 rename golem_membership/{report/golem_member_report.xml => views/report_golem_member.xml} (100%)

diff --git a/golem_member/views/report_golem_member.xml b/golem_member/views/report_golem_member.xml
index ca9e9c1..7029480 100644
--- a/golem_member/views/report_golem_member.xml
+++ b/golem_member/views/report_golem_member.xml
@@ -29,23 +29,32 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
     <template id="golem_member_card_template">
       <t t-call="report.html_container">
-        <t t-call="report.external_layout">
-          <div id='page_report_member' class="page">
-            <t t-set="season" t-value="docs._default_season()" />
-            <t t-foreach="docs" t-as="member">
+        <t t-set="season" t-value="docs._default_season()" />
+        <t t-foreach="docs" t-as="member" id="foreach_member">
+          <t t-call="report.external_layout">
+            <div id='page_report_member' class="page">
               <div class="row">
-                <h2>Member <span t-field="member.name" /> - <span t-field="member.number" /></h2>
-                <p>
-                  <strong>Season :</strong>
-                  <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 class="col-xs-6">
+                  <h2>
+                    <span t-field="member.name" />
+                    <small>(num. <span t-field="member.number" />)</small>
+                  </h2>
+                </div>
+                <div class="col-xs-6">
+                  <h3>
+                    Season :
+                    <span t-field="season.name" />
+                    <t t-if="season.date_start">
+                      <br />
+                      <small>Period :
+                        <span t-field="season.date_start" /> -
+                        <span t-field="season.date_end" />
+                      </small>
+                    </t>
+                  </h3>
+                </div>
               </div>
-              <h3>Activities for this season</h3>
+              <h3>Activities</h3>
               <table id="table_activity_ref" class="table table-striped">
                 <thead>
                   <tr>
@@ -92,8 +101,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <tr id="activity_inherit_total"></tr>
                 </tbody>
               </table>
-            </t>
-          </div>
+            </div>
+          </t>
         </t>
       </t>
     </template>
diff --git a/golem_membership/__manifest__.py b/golem_membership/__manifest__.py
index b6833f1..f77a884 100644
--- a/golem_membership/__manifest__.py
+++ b/golem_membership/__manifest__.py
@@ -27,5 +27,5 @@
     'depends': ['golem_member', 'account', 'decimal_precision'],
     'data': ['views/golem_membership_invoice.xml',
              'views/golem_member_view.xml',
-             'report/golem_member_report.xml']
+             'views/report_golem_member.xml']
 }
diff --git a/golem_membership/report/__init__.py b/golem_membership/report/__init__.py
deleted file mode 100644
index 2f46d25..0000000
--- a/golem_membership/report/__init__.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-
-#    Copyright 2016 Fabien Bourgeois <fabien@yaltik.com>
-#    Copyright 2018 Michel Dessenne <michel@yaltik.com>
-
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-from . import golem_membership
diff --git a/golem_membership/report/golem_member_report.xml b/golem_membership/views/report_golem_member.xml
similarity index 100%
rename from golem_membership/report/golem_member_report.xml
rename to golem_membership/views/report_golem_member.xml