From d86c482a035fad4cd7c736e652ec8ebd9d08b0d2 Mon Sep 17 00:00:00 2001
From: youssef <youssef@yaltik.com>
Date: Tue, 8 May 2018 15:59:46 +0100
Subject: [PATCH] Add members registred list to report

---
 .../golem_activity_report_templates.xml       |  12 +-
 .../golem_activity_report_templates.xml       | 144 ++++++++++++++++++
 2 files changed, 152 insertions(+), 4 deletions(-)
 create mode 100644 golem_activity_registration/report/golem_activity_report_templates.xml

diff --git a/golem_activity/report/golem_activity_report_templates.xml b/golem_activity/report/golem_activity_report_templates.xml
index 565d209..d8a228d 100644
--- a/golem_activity/report/golem_activity_report_templates.xml
+++ b/golem_activity/report/golem_activity_report_templates.xml
@@ -44,12 +44,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   </h2>
                 </div>
               </div>
-              <div class="col-xs-12 bg-info" style="margin-top: 20px;" >
+              <div class="col-xs-12 bg-info" style="margin-top: 40px;" >
                 <div class="col-xs-4" id="activity_info_left"><h4>General Information</h4></div>
                 <div class="col-xs-4" id="activity_info_middle"><h4>Type</h4></div>
                 <div class="col-xs-4" id="activity_info_right"><h4>Session</h4></div>
               </div>
-              <div class="col-xs-12">
+              <div id="activity_info" class="col-xs-12" >
                 <div class="col-xs-4" id="activity_info_left">
                   <t t-if="activity.season_id">
                     <div><b>Season : </b><span t-field="activity.season_id"/></div>
@@ -79,6 +79,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                   <t t-if="activity.is_recurrent">
                     <div><b>Is Recurrent : </b><span t-field="activity.is_recurrent"/></div>
                     <t t-if="activity.is_fullseason">
+                      <div><b>Is Full Season : </b><span t-field="activity.is_fullseason"/></div>
                       <t t-if="activity.weekday">
                         <div><b>Weekday : </b><span t-field="activity.weekday"/></div>
                       </t>
@@ -92,10 +93,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
                       </t>
                     </t>
                     <t t-if="activity.hour_start">
-                      <div><b>Start Hour : </b><span t-field="activity.hour_start" /></div>
+                      <div><b>Start Hour : </b>
+                        <t t-esc="'%02d:%02d' % (int(activity.hour_start), round(activity.hour_start % 1 * 60))" />
+                      </div>
                     </t>
                     <t t-if="activity.hour_stop">
-                      <div><b>Stop Hour : </b><span t-field="activity.hour_stop"/></div>
+                      <div><b>Stop Hour : </b>
+                        <t t-esc="'%02d:%02d' % (int(activity.hour_stop), round(activity.hour_stop % 1 * 60))" /></div>
                     </t>
                   </t>
                   <t t-else="">
diff --git a/golem_activity_registration/report/golem_activity_report_templates.xml b/golem_activity_registration/report/golem_activity_report_templates.xml
new file mode 100644
index 0000000..97b5aa4
--- /dev/null
+++ b/golem_activity_registration/report/golem_activity_report_templates.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2018 Youssef El Ouahby <youssef@yaltik.com>
+Copyright 2018 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/>.
+-->
+
+<odoo>
+
+    <template id="golem_activity_report_template_inherited_golem_activity_registration"
+      inherit_id="golem_activity.golem_activity_report_template">
+      <xpath expr="//div[@id='page_report_activity']/div[3]" position="after">
+        <div class="col-xs-4 text-left" style="margin-top: 80px;" >
+          <u><h4> Enroled members : <span t-field="activity.places_used" /></h4></u>
+          <br/></div>
+        <table class="table table-striped" id="members_table">
+          <thead>
+            <tr>
+              <th class="col-xs-2">Last Name</th>
+              <th class="col-xs-2">First Name</th>
+              <th class="col-xs-3">Phone</th>
+              <th class="col-xs-3">Email</th>
+              <th class="col-xs-2">City</th>
+            </tr>
+          </thead>
+          <tbody>
+            <tr id="activity_registration_line"
+              t-foreach="activity.activity_registration_ids" t-as="reg">
+              <td class="col-xs-2">
+                <span t-esc="reg.member_id.lastname" />
+              </td>
+              <td class="col-xs-2">
+                <span t-esc="reg.member_id.firstname" />
+              </td>
+              <td class="col-xs-3">
+                <span t-esc="reg.member_id.phone" />
+              </td>
+              <td class="col-xs-3">
+                <span t-esc="reg.member_id.email" />
+              </td>
+              <td class="col-xs-2">
+                <span t-esc="reg.member_id.city" />
+              </td>
+            </tr>
+
+
+          </tbody>
+        </table>
+      </xpath>
+
+      <!--<t t-call="report.html_container">
+        <t t-set="season" t-value="docs._default_season()" />
+        <t t-foreach="docs" t-as="activity" id="foreach_activity">
+          <t t-call="report.external_layout">
+            <div id='page_report_activity' class="page">
+              <div class="row">
+                <div class="col-xs-12" id="activity_title">
+                  <h2 class="golem_report_title">
+                    Activity : <span t-field="activity.name" />
+                  </h2>
+                </div>
+              </div>
+              <div class="col-xs-12 bg-info" style="margin-top: 40px;" >
+                <div class="col-xs-4" id="activity_info_left"><h4>General Information</h4></div>
+                <div class="col-xs-4" id="activity_info_middle"><h4>Type</h4></div>
+                <div class="col-xs-4" id="activity_info_right"><h4>Session</h4></div>
+              </div>
+              <div class="col-xs-12" id="activity_info">
+                <div class="col-xs-4" id="activity_info_left">
+                  <t t-if="activity.season_id">
+                    <div><b>Season : </b><span t-field="activity.season_id"/></div>
+                  </t>
+                  <t t-if="activity.animator_id">
+                    <div><b>Animator : </b><span t-field="activity.animator_id"/></div>
+                  </t>
+                  <t t-if="activity.list_price">
+                    <div><b>Price : </b><span t-field="activity.list_price"/></div>
+                  </t>
+                  <t t-if="activity.default_code">
+                    <div><b>Reference : </b><span t-field="activity.default_code"/></div>
+                  </t>
+                </div>
+                <div class="col-xs-4" id="activity_info_middle">
+                  <t t-if="activity.type_id">
+                    <div><b>Type : </b><span t-field="activity.type_id"/></div>
+                  </t>
+                  <t t-if="activity.categ_id">
+                    <div><b>Category : </b><span t-field="activity.categ_id"/></div>
+                  </t>
+                </div>
+                <div class="col-xs-4" id="activity_info_right">
+                  <t t-if="activity.places">
+                    <div><b>Places : </b><span t-field="activity.places"/></div>
+                  </t>
+                  <t t-if="activity.is_recurrent">
+                    <div><b>Is Recurrent : </b><span t-field="activity.is_recurrent"/></div>
+                    <t t-if="activity.is_fullseason">
+                      <t t-if="activity.weekday">
+                        <div><b>Weekday : </b><span t-field="activity.weekday"/></div>
+                      </t>
+                    </t>
+                    <t t-else="">
+                      <t t-if="activity.date_start">
+                        <div><b>Date Start : </b><span t-field="activity.date_start"/></div>
+                      </t>
+                      <t t-if="activity.date_stop">
+                        <div><b>Date Stop : </b><span t-field="activity.date_stop"/></div>
+                      </t>
+                    </t>
+                    <t t-if="activity.hour_start">
+                      <div><b>Start Hour : </b><span t-field="activity.hour_start" /></div>
+                    </t>
+                    <t t-if="activity.hour_stop">
+                      <div><b>Stop Hour : </b><span t-field="activity.hour_stop"/></div>
+                    </t>
+                  </t>
+                  <t t-else="">
+                    <t t-if="activity.date_start">
+                      <div><b>Date Start : </b><span t-field="activity.date_start"/></div>
+                    </t>
+                    <t t-if="activity.date_stop">
+                      <div><b>Date Stop : </b><span t-field="activity.date_stop"/></div>
+                    </t>
+                  </t>
+                </div>
+              </div>
+            </div>
+          </t>
+        </t>
+      </t>-->
+    </template>
+</odoo>