From f7528e87bbb02dd3dc3fa247a620a20873b96048 Mon Sep 17 00:00:00 2001 From: Antonin Bourguignon Date: Wed, 10 Oct 2012 18:36:25 +0200 Subject: [PATCH] [IMP] code style bzr revid: abo@openerp.com-20121010163625-ybklx8alceyo1qaa --- .../event/report/report_event_registration.py | 45 ++++++++++--------- .../report/report_event_registration_view.xml | 20 ++++----- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/addons/event/report/report_event_registration.py b/addons/event/report/report_event_registration.py index 31a71774835..7fbcfa8bcf4 100644 --- a/addons/event/report/report_event_registration.py +++ b/addons/event/report/report_event_registration.py @@ -23,16 +23,16 @@ from osv import fields, osv import tools class report_event_registration(osv.osv): - _name = "report.event.registration" _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), + '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_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), @@ -48,15 +48,14 @@ class report_event_registration(osv.osv): 'company_id': fields.many2one('res.company', 'Company', readonly=True), } _order = 'event_date desc' + def init(self, cr): """ - initialize the sql view for the event registration - cr -- the cursor + Initialize the sql view for the event registration """ tools.drop_view_if_exists(cr, 'report_event_registration') - cr.execute(""" - CREATE OR REPLACE view report_event_registration AS ( - SELECT + cr.execute(""" CREATE OR REPLACE view report_event_registration AS ( + SELECT event_id, r.id, e.user_id AS user_id, @@ -72,24 +71,29 @@ class report_event_registration(osv.osv): CASE WHEN r.state IN ('open','done') THEN r.nb_register ELSE 0 END AS confirm_state, e.type AS event_type, e.register_max AS register_max, - e.state AS event_state, - r.state AS registration_state - FROM + e.state AS event_state, + r.state AS registration_state + FROM event_event e + LEFT JOIN event_registration r ON (e.id=r.event_id) - LEFT JOIN - event_registration r ON (e.id=r.event_id) - where r.id is not null + WHERE r.id IS NOT NULL - GROUP BY + GROUP BY event_id, user_id_registration, e.id, r.id, registration_state, r.nb_register, - event_type, e.id, e.date_begin, e.main_speaker_id, - e.register_max,event_id, e.user_id,e.company_id, + event_type, + e.id, + e.date_begin, + e.main_speaker_id, + e.register_max, + event_id, + e.user_id, + e.company_id, e.user_id, event_state, e.company_id, @@ -98,9 +102,8 @@ class report_event_registration(osv.osv): month, e.register_max, name_registration - - ) - """) + ) + """) report_event_registration() diff --git a/addons/event/report/report_event_registration_view.xml b/addons/event/report/report_event_registration_view.xml index f39b6aecfe7..7761c970b59 100644 --- a/addons/event/report/report_event_registration_view.xml +++ b/addons/event/report/report_event_registration_view.xml @@ -1,8 +1,8 @@ - + - + report.event.registration.tree report.event.registration @@ -28,7 +28,6 @@ - report.event.registration.graph report.event.registration @@ -42,8 +41,7 @@ - - + report.event.registration.search report.event.registration @@ -82,28 +80,28 @@ - + Events Analysis report.event.registration form tree,graph - {"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':[]} + {"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":[]} - + tree - + - + graph - +