From f6fec727974c1cf4094f044fbf88184d93603ae5 Mon Sep 17 00:00:00 2001
From: Gery Debongnie <ged@openerp.com>
Date: Mon, 27 Jan 2014 10:49:18 +0100
Subject: [PATCH] [IMP] improves the Event reporting view by using the new
 graph view in pivot mode (addon event)

bzr revid: ged@openerp.com-20140127094918-52w9xt1nj1ae93fn
---
 addons/event/report/report_event_registration.py   | 13 ++-----------
 .../report/report_event_registration_view.xml      | 14 ++++++++------
 2 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py
index 0e33e892432..23ab2f26305 100644
--- a/addons/event/report/report_event_registration.py
+++ b/addons/event/report/report_event_registration.py
@@ -27,12 +27,7 @@ class report_event_registration(osv.osv):
     _description = "Events Analysis"
     _auto = False
     _columns = {
-        'event_date': fields.char('Event Start Date', size=64, readonly=True),
-        'year': fields.char('Year', size=4, readonly=True),
-        'month': fields.selection([
-            ('01','January'), ('02','February'), ('03','March'), ('04','April'),
-            ('05','May'), ('06','June'), ('07','July'), ('08','August'),
-            ('09','September'), ('10','October'), ('11','November'), ('12','December')], 'Month',readonly=True),
+        'event_date': fields.datetime('Event Date', readonly=True),
         'event_id': fields.many2one('event.event', 'Event', required=True),
         'draft_state': fields.integer(' # No of Draft Registrations', size=20),
         'confirm_state': fields.integer(' # No of Confirmed Registrations', size=20),
@@ -65,9 +60,7 @@ class report_event_registration(osv.osv):
                 r.name AS name_registration,
                 e.company_id AS company_id,
                 e.main_speaker_id AS speaker_id,
-                to_char(e.date_begin, 'YYYY-MM-DD') AS event_date,
-                to_char(e.date_begin, 'YYYY') AS year,
-                to_char(e.date_begin, 'MM') AS month,
+                e.date_begin AS event_date,
                 count(e.id) AS nbevent,
                 CASE WHEN r.state IN ('draft') THEN r.nb_register ELSE 0 END AS draft_state,
                 CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state,
@@ -92,8 +85,6 @@ class report_event_registration(osv.osv):
                 event_state,
                 e.company_id,
                 e.main_speaker_id,
-                year,
-                month,
                 e.register_max,
                 name_registration
         )
diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml
index 378fc667362..c6c2191c9c0 100644
--- a/addons/event/report/report_event_registration_view.xml
+++ b/addons/event/report/report_event_registration_view.xml
@@ -7,8 +7,10 @@
             <field name="model">report.event.registration</field>
             <field name="arch" type="xml">
                 <graph string="Event on Registration"  type="pivot" >
-                    <field name="event_id" type="row"/>
-                    <field name="draft_state" type="measure"/>
+                    <field name="event_type" type="row"/>
+                    <field name="event_date" interval="month" type="col"/>
+                    <field name="nbevent" type="measure"/>
+                    <field name="confirm_state" type="measure"/>
                 </graph>
             </field>
         </record>
@@ -40,9 +42,9 @@
                         <filter string="Event State" icon="terp-stock_effects-object-colorize" context="{'group_by':'event_state'}"/>
                         <filter string="Registration State" icon="terp-stock_effects-object-colorize" context="{'group_by':'registration_state'}"/>
                         <filter string="Company" icon="terp-go-home" domain="[]" context="{'group_by':'company_id'}" groups="base.group_multi_company"/>
-                        <filter string="Day" icon="terp-go-month" domain="[]" context="{'group_by':'event_date'}" help="Event Beginning Date"/>
-                        <filter string="Month" icon="terp-go-month" domain="[]" context="{'group_by':'month'}" help="Event Beginning Date"/>
-                        <filter string="Year" icon="terp-go-year" domain="[]" context="{'group_by':'year'}" help="Event Beginning Date"/>
+                        <filter string="Event Date (day)" domain="[]" context="{'group_by':'event_date:day'}" help="Event Beginning Date"/>
+                        <filter string="Event Date (month)" domain="[]" context="{'group_by':'event_date:month'}" help="Event Beginning Date"/>
+                        <filter string="Event Date (year)" domain="[]" context="{'group_by':'event_date:year'}" help="Event Beginning Date"/>
                     </group>
                     <group expand="0" string="Display">
                         <filter icon="terp-camera_test" string="Show Confirmed Registrations"
@@ -58,7 +60,7 @@
             <field name="view_type">form</field>
             <field name="view_mode">graph</field>
             <field name="search_view_id" ref="view_report_event_registration_search"/>
-            <field name="context">{"search_default_year":1,"search_default_this_month":1,"search_default_365day":1, "search_default_invoiced":1, "search_default_event":1, "group_by_no_leaf":1, "group_by":[]}</field>
+            <field name="context">{"group_by_no_leaf":1, "group_by":[]}</field>
         </record>
 
         <record model="ir.actions.act_window.view" id="action_report_event_registration_graph">