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

[IMP] track duration in hours 

bzr revid: fp@tinyerp.com-20140409184334-ehkhowyhyqw6cdmx
This commit is contained in:
Fabien Pinckaers 2014-04-09 20:43:34 +02:00
parent 65908c769b
commit 8970cefdd1
5 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website_event_track/controllers/event.py
View File

@ -50,7 +50,7 @@ class website_event(http.Controller):
forcetr = True
for track in event_track_ids:
start_date = (datetime.datetime.strptime(track.date, '%Y-%m-%d %H:%M:%S')).replace(tzinfo=pytz.utc).astimezone(local_tz)
end_date = start_date + datetime.timedelta(minutes = (track.duration or 30))
end_date = start_date + datetime.timedelta(hours = (track.duration or 30))
location = track.location_id or False
locations.setdefault(location, [])

60
addons/website_event_track/data/website_event_track_demo.xml
View File

@ -25,7 +25,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 06:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location5"/>
<field name="duration" eval="80"/>
<field name="duration" eval="1"/>
<field eval="[(4, ref('base.res_partner_2')),(4, ref('base.res_partner_3'))]" name="speaker_ids"/>
<field name="color">3</field>
<field name="stage_id" ref="event_track_stage1"/>
@ -37,7 +37,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location5"/>
<field name="duration" eval="15"/>
<field name="duration" eval="0.25"/>
<field eval="[(4, ref('base.res_partner_3'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -47,7 +47,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location5"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.3"/>
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage3"/>
</record>
@ -57,7 +57,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 9:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location5"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_2'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
</record>
@ -67,7 +67,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location6"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage5"/>
</record>
@ -77,7 +77,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location6"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_5'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -87,7 +87,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location6"/>
<field name="duration" eval="50"/>
<field name="duration" eval="1"/>
<field eval="[(4, ref('base.res_partner_6'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
</record>
@ -97,7 +97,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location7"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field name="color">2</field>
<field eval="[(4, ref('base.res_partner_7'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage3"/>
@ -109,7 +109,7 @@
<field name="user_id" ref="base.user_root"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location7"/>
<field name="duration" eval="50"/>
<field name="duration" eval="1"/>
<field name="color">2</field>
<field eval="[(4, ref('base.res_partner_8'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
@ -120,7 +120,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location7"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field name="color">5</field>
<field name="stage_id" ref="event_track_stage1"/>
</record>
@ -130,7 +130,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location7"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -140,7 +140,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location7"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_2')),(4, ref('base.res_partner_8'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage3"/>
</record>
@ -150,7 +150,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location8"/>
<field name="duration" eval="15"/>
<field name="duration" eval="0.25"/>
<field eval="[(4, ref('base.res_partner_9'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage5"/>
</record>
@ -160,7 +160,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 7:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location8"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_10'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage5"/>
</record>
@ -170,7 +170,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location8"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_11'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
</record>
@ -180,7 +180,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location8"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_12'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage3"/>
</record>
@ -190,7 +190,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_10'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -200,7 +200,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field name="color">5</field>
<field eval="[(4, ref('base.res_partner_13'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
@ -211,7 +211,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 9:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field name="color">5</field>
<field eval="[(4, ref('base.res_partner_14'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage1"/>
@ -222,7 +222,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_15'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -232,7 +232,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 10:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field name="color">7</field>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -242,7 +242,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 11:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_15'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage1"/>
</record>
@ -252,7 +252,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 7:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location9"/>
<field name="duration" eval="20"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_16'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage3"/>
</record>
@ -262,7 +262,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 6:00:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location10"/>
<field name="duration" eval="80"/>
<field name="duration" eval="1.5"/>
<field eval="[(4, ref('base.res_partner_17')),(4, ref('base.res_partner_18'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
@ -272,7 +272,7 @@
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 8:30:00')"></field>
<field name="location_id" ref="website_event_track.event_track_location10"/>
<field name="duration" eval="170"/>
<field name="duration" eval="2.5"/>
<field eval="[(4, ref('base.res_partner_17')),(4, ref('base.res_partner_18'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
</record>
@ -281,7 +281,7 @@
<field name="website_published" eval="True"/>
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 04:00:00')"></field>
<field name="duration" eval="60"/>
<field name="duration" eval="1"/>
<field eval="[(4, ref('base.res_partner_1'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage2"/>
<field name="color">3</field>
@ -291,7 +291,7 @@
<field name="website_published" eval="True"/>
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 5:00:00')"></field>
<field name="duration" eval="30"/>
<field name="duration" eval="0.5"/>
<field eval="[(4, ref('base.res_partner_2'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage4"/>
</record>
@ -300,7 +300,7 @@
<field name="website_published" eval="True"/>
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 5:30:00')"></field>
<field name="duration" eval="15"/>
<field name="duration" eval="0.25"/>
<field eval="[(4, ref('base.res_partner_19'))]" name="speaker_ids"/>
<field name="stage_id" ref="event_track_stage1"/>
<field name="color">6</field>
@ -310,7 +310,7 @@
<field name="website_published" eval="True"/>
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 5:45:00')"></field>
<field name="duration" eval="15"/>
<field name="duration" eval="0.25"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
<record id="event_track31" model="event.track">
@ -318,7 +318,7 @@
<field name="website_published" eval="True"/>
<field name="event_id" ref="event.event_0"/>
<field name="date" eval="time.strftime(str(DateTime.today().year) + '-06-04 7:30:00')"></field>
<field name="duration" eval="60"/>
<field name="duration" eval="1"/>
<field name="stage_id" ref="event_track_stage2"/>
</record>
</data>

4
addons/website_event_track/models/event.py
View File

@ -81,7 +81,7 @@ class event_track(osv.osv):
'stage_id': fields.many2one('event.track.stage', 'Stage'),
'description': fields.html('Track Description', translate=True),
'date': fields.datetime('Track Date'),
'duration': fields.integer('Duration'),
'duration': fields.float('Duration', digits=(16,2)),
'location_id': fields.many2one('event.track.location', 'Location'),
'event_id': fields.many2one('event.event', 'Event', required=True),
'color': fields.integer('Color Index'),
@ -101,7 +101,7 @@ class event_track(osv.osv):
_defaults = {
'user_id': lambda self, cr, uid, ctx: uid,
'website_published': lambda self, cr, uid, ctx: False,
'duration': lambda *args: 60,
'duration': lambda *args: 1.5,
'stage_id': _default_stage_id,
'priority': '2'
}

6
addons/website_event_track/views/event_backend.xml
View File

@ -229,7 +229,7 @@
<div class="oe_kanban_content">
<h4><field name="name"/></h4>
<field name="tag_ids"/>
<div t-if="duration"><field name="duration"/> hours</div>
<div t-if="duration"><field name="duration" widget="float_time"/> hours</div>
<span class="oe_right">
<t t-set="priority" t-value="record.priority.raw_value || 0"/>
<a type="object" name="set_priority" args="['2']" t-if="priority == 3" title="Normal Priority">
@ -261,7 +261,7 @@
<field name="model">event.track</field>
<field eval="2" name="priority"/>
<field name="arch" type="xml">
<calendar color="color" date_start="date" date_delay="duration" string="Event Tracks">
<calendar color="location_id" date_start="date" date_delay="duration" string="Event Tracks">
<field name="name"/>
<field name="event_id"/>
</calendar>
@ -319,7 +319,7 @@
<field name="date"/>
<label for="duration"/>
<div>
<field name="duration" class="oe_inline"/> minutes
<field name="duration" class="oe_inline" widget="float_time"/> hours
</div>
<field name="tag_ids" widget="many2many_tags"/>
<field name="color"/>

6
addons/website_event_track/views/website_event.xml
View File

@ -222,7 +222,7 @@
<b>Date</b><br/>
<span t-field="track.date" t-field-options='{"hide_seconds":"True"}'/><br/>
<b>Duration</b><br/>
<span t-field="track.duration"/> minutes<br/>
<span t-esc="'%.2f' % (track.duration)"/> hours<br/>
<b>Location</b><br/>
<span t-field="track.location_id"/><br/>
</div>
@ -372,9 +372,9 @@
<ul class="list-unstyled">
<li>
<strong>Regular Talks</strong>. These are standard talks with slides,
alocated in slots of 30 minutes.
alocated in slots of 60 minutes.
</li><li>
<strong>Lightning Talks</strong>. These are 10 minutes talks on many
<strong>Lightning Talks</strong>. These are 30 minutes talks on many
different topics. Most topics are accepted in lightning talks.
</li>
</ul>