From d6d265e7c5599069468d0e368a4d1128d0a07f18 Mon Sep 17 00:00:00 2001
From: michel <michel.dessenne@gmail.com>
Date: Thu, 15 Feb 2018 18:05:57 +0100
Subject: [PATCH] /

---
 golem_member/report/golem_member_report.py  | 33 --------------
 golem_member/report/golem_member_report.xml | 49 +++++++++++++++------
 2 files changed, 36 insertions(+), 46 deletions(-)
 delete mode 100644 golem_member/report/golem_member_report.py

diff --git a/golem_member/report/golem_member_report.py b/golem_member/report/golem_member_report.py
deleted file mode 100644
index 91bf2af..0000000
--- a/golem_member/report/golem_member_report.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-#    Copyright 2016 Fabien Bourgeois <fabien@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 odoo import models, fields
-class GolemMember(models.Model):
-    _name = '.golem.member.report'
-    _description = 'Golem member Report'
-    _sql = """
-                CREATE OR REPLACE VIEW todo_task_report AS
-                SELECT *
-                FROM todo_task
-                WHERE active = True
-            """
-    name = fields.Char('Description')
-    is_done = fields.Boolean('Done?')
-    active = fields.Boolean('Active?')
-    user_id = fields.Many2one('res.users', 'Responsible')
-    date_deadline = fields.Date('Deadline')
diff --git a/golem_member/report/golem_member_report.xml b/golem_member/report/golem_member_report.xml
index 0dd5d14..08ce699 100644
--- a/golem_member/report/golem_member_report.xml
+++ b/golem_member/report/golem_member_report.xml
@@ -37,7 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
       <field name="dpi">90</field>
     </record>
 
-    <report id="action_todo_task_report"
+    <report id="golem_member_report"
       string="Golem member report"
       model="golem.member"
       report_type="qweb-html"
@@ -48,14 +48,6 @@ 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 class="page">
-          <!-- Report page content -->
-          <div class="col-xs-3">
-            <div t-field="res_company.partner_id"
-            t-field-options='{
-                              "widget": "contact",
-                              "fields": ["address", "name", "phone", "fax"],
-                              "no_marker": true}' />
-            </div>
             <table class="table table-striped">
                 <tr>
                   <th>Member</th>
@@ -76,19 +68,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       </t>
                       <span t-field="o.country_id" /><br></br>
                     </td>
+                    <td class="col-xs-6">
+                        <span t-field="o.season_ids[0].name" /><br></br>
+                        <span t-field="o.season_ids[0].date_start" /><br></br>
+                        <span t-field="o.season_ids[0].date_end" /><br></br>
+                    </td>
+                  </tr>
+                </t>
+            </table>
+            <table class="table table-striped">
+                <t t-foreach="docs" t-as="o">
+                  <tr>
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id" /><br></br>
+                    </td>
 
                     <td class="col-xs-6">
-                      <!-- <div t-field="golem_season.season_id"
-                            t-field-option='{"fields": ["name"]}' /> -->
-                        <span t-field="o.season_ids" /><br></br>
+                      <span t-field="o.activity_registration_ids.activity_id.animator_id" /><br></br>
+                    </td>
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id.weekday" /><br></br>
+                    </td>
+
+                    <td class="col-xs-6">
+                      <span t-field="o.activity_registration_ids.activity_id.hour_start" /><br></br>
+                    </td>
+
+                    <td class="col-xs-6">
+                        <span t-field="o.activity_registration_ids.activity_id.hour_stop" /><br></br>
+                      </td>
+                  
+                    <td class="col-xs-6">
+                      <t t-if="o.activity_registration_ids.activity_id.is_recurrent">
+                        <span t-field="o.activity_registration_ids.activity_id.date_start" /><br></br>
+                        <span t-field="o.activity_registration_ids.activity_id.date_stop" /><br></br>
+                      </t>
 
                     </td>
                   </tr>
                 </t>
             </table>
-
           </div>
         </t>
       </t>
     </template>
+
+
 </odoo>