odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]: ADD google map in event form view. remove preveiw wizard. 

bzr revid: atp@tinyerp.com-20120523131956-ttslmltvzscz024o
This commit is contained in:
Atul Patel (OpenERP) 2012-05-23 18:49:56 +05:30
parent 4a02e98d42
commit 7f93ac0dc3
7 changed files with 86 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
addons/event/__openerp__.py
View File

@ -46,7 +46,6 @@ Note that:
'security/event_security.xml',
'security/ir.model.access.csv',
'wizard/event_confirm_view.xml',
'wizard/event_preview_view.xml',
'event_view.xml',
'report/report_event_registration_view.xml',
'board_association_view.xml',

6
addons/event/event.py
View File

@ -221,6 +221,12 @@ class event_event(osv.osv):
'available_qty': fields.integer('Availabel Quantity'),
'sale_end_date': fields.datetime('SalesEnd'),
'city': fields.related('address_id', 'city', type='char', string='City'),
'street': fields.related('address_id', 'street', type='char', string='Street'),
'country_id': fields.related('address_id', 'country_id', relation='res.country', type='many2one', string='Country'),
'state_id': fields.related('address_id', 'state_id', relation="res.country.state", type="many2one", string='Fed. State'),
'zip': fields.related('address_id','zip', type="char", string="Zip"),
}
_defaults = {
'state': 'draft',

124
addons/event/event_view.xml
View File

@ -52,19 +52,82 @@
<field name="model">event.event</field>
<field name="type">form</field>
<field name="arch" type="xml">
<form string="Events">
<group col="6" colspan="4">
<field name="name"/>
<field name="date_begin"/>
<field name="date_end"/>
<field name="type" on_change="onchange_event_type(type,context)"/>
<field name="user_id"/>
<field name="address_id" />
</group>
<notebook colspan="4">
<page string="Event">
<separator string="Description" colspan="4"/>
<field name="note" colspan="4" nolabel="1"/>
<form string="Events" layout="manual">
<div class="oe_form_topbar">
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
</div>
<sheet layout="auto">
<group colspan="4">
<group col="2" colspan="2" class="oe_form_group_label_border" >
<field name="name" required="1" nolabel="1" class="oe_form_title" /><br/><br/><br/>
<field name="type" on_change="onchange_event_type(type,context)"/>
<field name="user_id"/>
<field name="address_id" widget ="many2one_Geo_address"/>
</group>
<group colspan="2" col="2">
<div id = "oe_mapbox" class="oe_mapbox">
</div>
</group>
<group colspan="4">
<group col="4" colspan="2" class="oe_form_group_label_border" >
<field name="register_min"/>
<field name="register_max"/>
</group>
<group colspan="2" col="2">
<div>
<table width="400px" >
<tr>
<td class="oe_td_border">
Where :
</td>
<td width="auto">
<field name="street" nolabel="1" readonly="1"/><br/>
<field name="state_id" nolabel="1" readonly="1"/><br/>
<field name="city" nolabel="1" readonly="1"/><br/>
<field name="country_id" nolabel="1" readonly="1"/><br/>
<field name="zip" nolabel="1" readonly="1"/><br/>
</td>
<td width="10px" >
<table width="150px" >
<tr >
<td class="oe_td_date_border">Start: </td><td width="auto"><field name="date_begin" nolabel="1" /></td>
</tr>
<tr >
<td class="oe_td_date_border">End</td><td width="auto"><field name="date_end" nolabel="1" /></td>
</tr><newline/>
</table>
</td>
</tr>
</table>
</div>
</group>
</group>
</group>
<notebook colspan="4">
<page string="Event Details">
<separator colspan="4" string="Details" nolabel="1"/>
<field name="note" colspan="4" nolabel="1"/>
</page>
<page string="Speakers">
<field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
<field name="speaker_confirmed"/>
<separator string="Other Speakers" colspan="4"/>
<field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
</page>
<page string="Event Registration">
<group col="6" colspan="4" class="oe_form_group_label_border" >
<field name="register_current"/>
<field name="register_prospect"/>
<field name="register_attended"/>
</group>
<br/>
<br/>
<field name="registration_ids" colspan="4" nolabel="1" groups="event.group_event_manager,event.group_event_user">
<tree string="Registration" editable="top">
<field name="name" />
@ -98,37 +161,9 @@
</group>
</form>
</field>
<field name="state" select="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
<group col="4" colspan="2">
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
</group>
</page>
<page string="Speakers">
<field name="main_speaker_id" domain="[('speaker','=',True)]" context="{'default_speaker':1}"/>
<field name="speaker_confirmed"/>
<separator string="Other Speakers" colspan="4"/>
<field name="speaker_ids" domain="[('speaker','=',True)]" context="{'default_speaker':1}" colspan="4" nolabel="1"/>
</page>
<page string="Extra Info">
<group col="2" colspan="2">
<separator string="Registrations" colspan="2"/>
<field name="register_min"/>
<field name="register_max"/>
<field name="register_prospect"/>
<field name="register_current"/>
<field name="register_attended"/>
</group>
<group col="2" colspan="2">
<separator string="Emails" colspan="2"/>
<field name="reply_to"/>
<field name="email_registration_id" domain="[('model_id.model','=','event.registration')]"/>
<field name="email_confirmation_id" domain="[('model_id.model','=','event.registration')]"/>
</group>
</page>
</notebook>
</notebook>
</sheet>
</form>
</field>
</record>
@ -211,9 +246,6 @@
<button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="subscribe_button oe_event_button_subscribe">
<span >Subscribe</span>
</button>
<button name="%(action_event_preview)d" type="action">
<span>Preview</span>
</button>
</t>
</t>
<t t-if="record.is_subscribed.raw_value">

65
addons/event/static/src/css/event.css
View File

@ -93,7 +93,9 @@ div.oe_fold_column{
margin-left:auto;
margin-right:auto;
text-align: right;
}
.oe_td_border
{
width: 7em;
@ -109,75 +111,12 @@ div.oe_fold_column{
border-color: #DCDCDC;
}
td.oe_sale_end_date
{
padding:5px;
}
td.oe_qty
{
width: 80px;
text-align:right;
padding:5px;
}
.oe_order_button
{
height:25px;
position: absolute;
left:330px;
padding: 5px;
}
.oe_a
{
position: absolute;
left: 22%;
}
td.oe_b
{
position:relative;
left: 60%;
}
textarea.field_text
{
width: 765px;
height: 318px;
}
td.oe_form_group_nested
{
padding: 5px;
}
.oe_event_title{
font-size: 25px;
}
.oe_sub1
{
float:left;
height:50px;
border-right: 1px solid black;
border-color: #DCDCDC;
}
.oe_mapbox
{
width:auto;
height:200px;
margin-left:auto;
margin-right:auto;
text-align: right;
}
.oe_td_border
{
width: 5em;
padding: 2px;
border-right: 1px solid black;
text-align: center;
border-color: #DCDCDC;
}
.oe_td_date_border
{
border-right:1px solid black;
border-color: #DCDCDC;
}

1
addons/event/wizard/__init__.py
View File

@ -21,5 +21,4 @@
import event_confirm
import event_preview
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

56
addons/event/wizard/event_preview.py
View File

@ -1,56 +0,0 @@
# -*- coding: utf-8 -*-
##############################################################################
#
# OpenERP, Open Source Management Solution
# Copyright (C) 2004-2010 Tiny SPRL (<http://tiny.be>).
#
# 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 osv import osv, fields
class event_preview(osv.osv_memory):
_name = 'event.preview'
_inherit= 'event.event'
_columns = {
'qty': fields.integer('Quantity'),
'sale_end_date': fields.datetime('SalesEnd'),
}
def default_get(self, cr, uid, fields, context=None):
event_pool = self.pool.get('event.event')
data_obj = self.pool.get('ir.model.data')
res_id = data_obj._get_id(cr, uid, 'event', 'view_event_preview')
if res_id:
event_preview_id = data_obj.browse(cr, uid, res_id, context=context).res_id
record_ids = context and context.get('active_ids', []) or []
res = {}
for event in event_pool.browse(cr, uid, record_ids, context=context):
if 'name' in fields:
res.update({'name': event.name})
if 'date_begin' in fields:
res.update({'date_begin': event.date_begin or False})
if 'address_id' in fields:
res.update({'address_id': event.address_id and event.address_id.id or False})
if 'date_end' in fields:
res.update({'date_end': event.date_end})
if 'note' in fields:
res.update({'note': event.note})
return res
event_preview()
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

67
addons/event/wizard/event_preview_view.xml
View File

@ -1,67 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<openerp>
<data>
<record model="ir.ui.view" id="view_event_preview">
<field name="name">Events</field>
<field name="model">event.preview</field>
<field name="type">form</field>
<field name="priority">20</field>
<field name="arch" type="xml">
<form string="Preview" layout="manual">
<div class="oe_form_topbar">
<button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
<button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
<button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
<button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
<div class="oe_right">
<field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
</div>
</div>
<sheet layout="auto">
<group colspan="4" col="2">
<field name="name" nolabel="1" class="oe_form_title" width="60%%" />
<div id = "oe_mapbox" class="oe_mapbox"> </div>
<table>
<tr>
<td width="70px" class="oe_td_border">
Where
</td>
<td width="auto">
<field name="address_id" widget ="many2one_Geo_address" nolabel="1"/>
</td>
<td width="210px">
<table align="right">
<tr>
<td class="oe_td_date_border">Start: </td><td><field name="date_begin" nolabel="1" readonly="1"/></td>
</tr>
<tr>
<td class="oe_td_date_border">End</td><td><field name="date_end" nolabel="1" readonly="1"/></td>
</tr>
</table>
</td>
</tr>
</table>
<group colspan="2">
</group>
</group>
<separator colspan="4" string="Details" nolabel="1"/>
<field name="note" colspan="4" nolabel="1"/>
</sheet>
</form>
</field>
</record>
<record model="ir.actions.act_window" id="action_event_preview">
<field name="name">Preview</field>
<field name="res_model">event.preview</field>
<field name="view_type">form</field>
<field name="view_mode">form</field>
<field name="target">current</field>
</record>
</data>
</openerp>