From 151819d2b0b39cbb7f8a17bd3d8c15da13a11b41 Mon Sep 17 00:00:00 2001
From: "atp (Open ERP)" <atp@tinyerp.co.in>
Date: Tue, 22 Jun 2010 16:37:52 +0530
Subject: [PATCH] [IMP]: event: Improvement for dashboard in
 board_association_view file.

bzr revid: atp@tinyerp.co.in-20100622110752-3lcg83tjyxf7e4o4
---
 addons/event/board_association_view.xml | 47 ++++++++++++++++++++-----
 addons/event/event_view.xml             | 17 +++++----
 2 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/addons/event/board_association_view.xml b/addons/event/board_association_view.xml
index a1d94c72b87..aba85e420d0 100644
--- a/addons/event/board_association_view.xml
+++ b/addons/event/board_association_view.xml
@@ -12,8 +12,38 @@
       	<action
                 string="New members"
                 name="%(membership.action_report_partner_member_year_tree)d"
-                view_mode="graph,tree" colspan="4"/>-->  
-                
+                view_mode="graph,tree" colspan="4"/>-->
+            
+        <record model ="ir.ui.view" id="view_report_event_reg_graph">
+            <field name="name">Registration Event report</field>
+            <field name="model">report.event.registration</field>
+            <field name="type">graph</field>
+            <field name="arch" type="xml">
+                <graph string="Event on Registration"  type="bar" >
+                    <field name="event_id"/>
+                    <field name="draft_state" operator="+"/>
+                    <field name="confirm_state" operator="+"/>
+                    <field name="register_max" operator="+"/>
+                </graph>
+            </field>
+        </record>     
+                  
+        <record  model="ir.actions.act_window" id="act_event_reg">
+            <field name="name">Events On Registrations</field>
+            <field name="res_model">report.event.registration</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">graph,tree</field>
+            <field name="view_id" ref="view_report_event_reg_graph"/>
+        </record>                
+
+       <record model="ir.actions.act_window" id="act_event_view">
+           <field name="name">Next Events</field>
+           <field name="type">ir.actions.act_window</field>
+           <field name="res_model">event.event</field>
+           <field name="view_type">form</field>
+           <field name="view_mode">tree,form</field>
+       </record>    
+               
         <record model="board.note.type" id="note_association_type">
             <field name="name">associations</field>
         </record>
@@ -27,7 +57,7 @@
                     <hpaned position="100">
                         <child1>
                             <action string="Next Events"
-                                name="%(event.action_event_registration_report)d"
+                                name="%(act_event_view)d"
                                 colspan="4"/>
                             <action
                                 string="Unpaid Invoices"
@@ -35,14 +65,13 @@
                                 colspan="4"
                                 domain="[('state','not in',['draft','cancel']),('reconciled','=',False),('type','=','out_invoice')]"/>
                         </child1>
-
                         <child2>
-                            <action
-                                string="Registrations by Events"
-                                name="%(event.action_event_type_registration)d"
-                                view_mode="graph,tree"
-                                colspan="4"/>
+                            <action string="Register Events"
+                                name="%(act_event_reg)d"
+                                colspan="4"/>    
+                        
                         </child2>
+                        
                     </hpaned>
                 </form>
             </field>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c58c1575d3b..3bc8ff14ff6 100755
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -47,7 +47,6 @@
         </record>
         <menuitem name="Events by Categories" id="menu_action_event_categories" action="action_event_categories" parent="menu_event_main"/>
 
-
     <!-- Events Organisation/CONFIGURATION/EVENTS -->
 
         <record model="ir.ui.view" id="view_event_form">
@@ -136,7 +135,7 @@
             <field name="arch" type="xml">
                 <search string="Events">
                     <group col="10" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Events"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Events"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','=','confirm')]" help="Confirmed Events"/>
                         <separator orientation="vertical"/>
                         <field name="name" string="Event" select="1"/>
@@ -154,7 +153,7 @@
                         <filter string="Event Type" icon="terp-crm"  context="{'group_by':'type'}"/>
                         <filter string="state" icon="terp-stock_effects-object-colorize" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/> 
-                        <filter string="Responsible" name="user" icon="terp-personal" context="{'group_by': 'user_id'}"/>
+                        <filter string="Responsible"  icon="terp-personal" context="{'group_by': 'user_id'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Creation" icon="terp-go-month"
                             domain="[]" context="{'group_by':'date_begin'}"/>
@@ -171,7 +170,7 @@
            <field name="res_model">event.event</field>
            <field name="view_type">form</field>
            <field name="view_mode">tree,form</field>
-           <field name="context">{"search_default_user_id":uid}</field>
+           <field name="context">{"search_default_draft": "1"}</field>
            <field name="search_view_id" ref="view_event_search"/>
        </record>
        
@@ -190,7 +189,7 @@
 
         <!-- Registration view (form) by _inherits  .................. -->
         
-        <record model="ir.ui.view" id="event_registration_tree">
+        <record model="ir.ui.view" id="view_event_registration_tree">
             <field name="name">event.registration.tree</field>
             <field name="model">event.registration</field>
             <field name="type">tree</field>
@@ -206,7 +205,7 @@
             </field>
         </record>
 
-        <record model="ir.ui.view" id="event_registration_form">
+        <record model="ir.ui.view" id="view_event_registration_form">
             <field name="name">event.registration.form</field>
             <field name="model">event.registration</field>
             <field name="type">form</field>
@@ -332,7 +331,7 @@
             <field name="arch" type="xml">
                 <search string="Event Registration">
                     <group col="12" colspan="4">
-                        <filter icon="terp-document-new" string="Draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
+                        <filter icon="terp-document-new" string="Draft" name="draft" domain="[('state','=','draft')]" help="Draft Registrations"/>
                         <filter icon="terp-camera_test" string="Confirmed" domain="[('state','in',('open','done'))]" help="Confirmed Registrations"/>
                         <separator orientation="vertical"/>
                         <field name="partner_id" />
@@ -352,7 +351,7 @@
                         <filter string="State" icon="terp-stock_effects-object-colorize" domain="[]" context="{'group_by':'state'}"/>
                         <separator orientation="vertical"/>
                         <filter string="Partner" icon="terp-personal" domain="[]" context="{'group_by':'partner_id'}"/>                        
-                        <filter string="Responsible" name="uid" icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
+                        <filter string="Responsible"  icon="terp-personal" domain="[]" context="{'group_by':'user_id'}"/>
                    </group>
                 </search>
             </field>
@@ -364,7 +363,7 @@
           <field name="view_type">form</field>
           <field name="domain"></field>
           <field name="view_mode">tree,form</field>
-          <field name="context">{"search_default_user_id":uid}</field>
+          <field name="context">{"search_default_draft": "1"}</field>
           <field name="search_view_id" ref="view_registration_search"/>
         </record>