[IMP]added speakers in event_track demo data and display speaker after event title.
bzr revid: dka@tinyerp.com-20140307122642-j8dfijlsa2jzl962
This commit is contained in:
Darshan Kalola (OpenERP)
parent
da0fad7958
commit
cda569e361
|
|
@ -60,7 +60,7 @@ class website_event(http.Controller):
|
|||
room_list = []
|
||||
new_schedule = OrderedDict()
|
||||
location_object = request.registry.get('event.track.location')
|
||||
|
||||
event_track_obj = request.registry.get('event.track')
|
||||
for track in fetch_tracks:
|
||||
room_list.append(track[1])
|
||||
if not unsort_tracks.has_key(track[2][:8]):
|
||||
|
|
@ -69,6 +69,7 @@ class website_event(http.Controller):
|
|||
unsort_tracks[track[2][:8]][track[5]] = []
|
||||
end_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S') + datetime.timedelta(minutes = int(track[3]))
|
||||
new_schedule[track[0]] = {'time': track[5],'end_time': end_time}
|
||||
speaker = event_track_obj.browse(request.cr, request.uid, track[0], context=request.context)['speaker_ids']
|
||||
unsort_tracks[track[2][:8]][track[5]].append({
|
||||
'id': track[0],
|
||||
'title': track[4],
|
||||
|
|
@ -76,9 +77,9 @@ class website_event(http.Controller):
|
|||
'location_id': track[1],
|
||||
'duration':track[3],
|
||||
'location_id': track[1],
|
||||
'end_time': end_time
|
||||
'end_time': end_time,
|
||||
'speaker_ids': [s.name for s in speaker],
|
||||
})
|
||||
print "new schecule",new_schedule
|
||||
#Get All Locations
|
||||
room_list = list(set(room_list))
|
||||
room_list.sort()
|
||||
|
|
@ -119,7 +120,6 @@ class website_event(http.Controller):
|
|||
|
||||
def html2text(html):
|
||||
return re.sub(r'<[^>]+>', "", html)
|
||||
|
||||
values = {
|
||||
'event': event,
|
||||
'main_object': event,
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 06:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location5"/>
|
||||
<field name="duration" eval="80"/>
|
||||
<field eval="[(4, ref('base.res_partner_2')),(4, ref('base.res_partner_3'))]" name="speaker_ids"/>
|
||||
|
||||
</record>
|
||||
<record id="event_track2" model="event.track">
|
||||
|
|
@ -34,7 +35,8 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-06-04 8:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location5"/>
|
||||
<field name="duration" eval="50"/>
|
||||
<field name="duration" eval="50"/>
|
||||
<field eval="[(4, ref('base.res_partner_3'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track3" model="event.track">
|
||||
<field name="name">How to develop real time apps, the live chat module explained.</field>
|
||||
|
|
@ -42,7 +44,8 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-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="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track4" model="event.track">
|
||||
<field name="name">How to develop automated tests in the OpenERP web client.</field>
|
||||
|
|
@ -50,7 +53,8 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-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="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_2'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track5" model="event.track">
|
||||
<field name="name">The new way to promote your modules in the Apps platform and OpenERP website.</field>
|
||||
|
|
@ -59,6 +63,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 6:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location6"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track6" model="event.track">
|
||||
<field name="name">Detailed roadmap of accounting new modules and improvements for version 8.</field>
|
||||
|
|
@ -67,6 +72,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 6:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location6"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_5'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track7" model="event.track">
|
||||
<field name="name">A technical explanation of OpenERP as a CMS and a eCommerce platform for version 8.</field>
|
||||
|
|
@ -75,6 +81,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 8:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location6"/>
|
||||
<field name="duration" eval="50"/>
|
||||
<field eval="[(4, ref('base.res_partner_6'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track8" model="event.track">
|
||||
<field name="name">Discover OpenERP CRM: How to optimize your sales, from leads to sales orders.</field>
|
||||
|
|
@ -84,6 +91,7 @@
|
|||
<field name="location_id" ref="website_event_track.event_track_location7"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field name="color">2</field>
|
||||
<field eval="[(4, ref('base.res_partner_7'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track9" model="event.track">
|
||||
<field name="name">How to use OpenERP for your HR process: recruitment, leaves management, appraisals, expenses, etc.</field>
|
||||
|
|
@ -94,6 +102,7 @@
|
|||
<field name="location_id" ref="website_event_track.event_track_location7"/>
|
||||
<field name="duration" eval="50"/>
|
||||
<field name="color">2</field>
|
||||
<field eval="[(4, ref('base.res_partner_8'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track10" model="event.track">
|
||||
<field name="name">Raising qualitive insights with the survey app</field>
|
||||
|
|
@ -111,6 +120,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 10:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location7"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_4'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track12" model="event.track">
|
||||
<field name="name">Manage your events with OpenERP, the new training modules.</field>
|
||||
|
|
@ -119,6 +129,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 11:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location7"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_2')),(4, ref('base.res_partner_8'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track13" model="event.track">
|
||||
<field name="name">Advanced reporting with Google Spreadsheets integration.</field>
|
||||
|
|
@ -127,6 +138,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 6:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location8"/>
|
||||
<field name="duration" eval="50"/>
|
||||
<field eval="[(4, ref('base.res_partner_9'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track14" model="event.track">
|
||||
<field name="name">New Paypal modules (portal, handling, installments).</field>
|
||||
|
|
@ -135,6 +147,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 7:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location8"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_10'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track15" model="event.track">
|
||||
<field name="name">OpenERP Mobile for Notes, Meetings and Messages.</field>
|
||||
|
|
@ -143,6 +156,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 10:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location8"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_11'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track16" model="event.track">
|
||||
<field name="name">OpenERP as your Enterprise Social Network.</field>
|
||||
|
|
@ -151,6 +165,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 11:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location8"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_12'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track17" model="event.track">
|
||||
<field name="name">The Art of Making an OpenERP Demo.</field>
|
||||
|
|
@ -159,6 +174,8 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 6:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_10'))]" name="speaker_ids"/>
|
||||
|
||||
</record>
|
||||
<record id="event_track18" model="event.track">
|
||||
<field name="name">How to build your marketing strategy for the purpose of generating leads with OpenERP.</field>
|
||||
|
|
@ -168,6 +185,7 @@
|
|||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field name="color">5</field>
|
||||
<field eval="[(4, ref('base.res_partner_13'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track19" model="event.track">
|
||||
<field name="name">Advanced lead management with OpenERP: tips and tricks from the fields</field>
|
||||
|
|
@ -177,6 +195,7 @@
|
|||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field name="color">5</field>
|
||||
<field eval="[(4, ref('base.res_partner_14'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track20" model="event.track">
|
||||
<field name="name">New Certification Program (valid from Oct. 2013).</field>
|
||||
|
|
@ -185,6 +204,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 10:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_15'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track21" model="event.track">
|
||||
<field name="name">Recruiting high skilled talents with OpenERP HR apps</field>
|
||||
|
|
@ -202,6 +222,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 11:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_15'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track23" model="event.track">
|
||||
<field name="name">Key Success factors selling OpenERP.</field>
|
||||
|
|
@ -210,6 +231,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 7:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location9"/>
|
||||
<field name="duration" eval="20"/>
|
||||
<field eval="[(4, ref('base.res_partner_16'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track24" model="event.track">
|
||||
<field name="name">Merge proposals review, code sprint (entire day).</field>
|
||||
|
|
@ -218,6 +240,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 6:00:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location10"/>
|
||||
<field name="duration" eval="80"/>
|
||||
<field eval="[(4, ref('base.res_partner_17')),(4, ref('base.res_partner_18'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track25" model="event.track">
|
||||
<field name="name">Merge proposals review, code sprint (entire afternoon)</field>
|
||||
|
|
@ -226,6 +249,7 @@
|
|||
<field name="date" eval="time.strftime('2014-06-04 8:30:00')"></field>
|
||||
<field name="location_id" ref="website_event_track.event_track_location10"/>
|
||||
<field name="duration" eval="170"/>
|
||||
<field eval="[(4, ref('base.res_partner_17')),(4, ref('base.res_partner_18'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track26" model="event.track">
|
||||
<field name="name">Registration & Coffee - Main entrance + Partners' Village</field>
|
||||
|
|
@ -240,6 +264,7 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-06-04 04:00:00')"></field>
|
||||
<field name="duration" eval="60"/>
|
||||
<field eval="[(4, ref('base.res_partner_1'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track28" model="event.track">
|
||||
<field name="name">OpenERP Status & Strategy 2014</field>
|
||||
|
|
@ -247,6 +272,7 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-06-04 5:00:00')"></field>
|
||||
<field name="duration" eval="30"/>
|
||||
<field eval="[(4, ref('base.res_partner_2'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track29" model="event.track">
|
||||
<field name="name">The new marketing strategy.</field>
|
||||
|
|
@ -254,6 +280,7 @@
|
|||
<field name="event_id" ref="event.event_0"/>
|
||||
<field name="date" eval="time.strftime('2014-06-04 5:30:00')"></field>
|
||||
<field name="duration" eval="15"/>
|
||||
<field eval="[(4, ref('base.res_partner_19'))]" name="speaker_ids"/>
|
||||
</record>
|
||||
<record id="event_track30" model="event.track">
|
||||
<field name="name">Morning break</field>
|
||||
|
|
|
|||
|
|
@ -80,13 +80,24 @@
|
|||
<t t-foreach="room_list" t-as="room">
|
||||
<t t-if="not days[day][slot][index]['location_id'] and for_all" >
|
||||
<t t-set="for_all" t-value="False"/>
|
||||
<td id="seach_enable" t-att-colspan="len(room_list)" class="success text-center"> <t t-esc="days[day][slot][index]['title']" /></td>
|
||||
<td id="seach_enable" t-att-colspan="len(room_list)" class="success text-center">
|
||||
<t t-esc="days[day][slot][index]['title']" />
|
||||
<t t-foreach="days[day][slot][index]['speaker_ids']" t-as="speaker">
|
||||
<t t-if="speaker == days[day][slot][index]['speaker_ids'][:1][0]">By </t>
|
||||
<t t-esc="speaker"/>
|
||||
<t t-if=" speaker != days[day][slot][index]['speaker_ids'][-1:][0]">,</t>
|
||||
</t>
|
||||
</td>
|
||||
</t>
|
||||
<t t-if="days[day][slot][index]['location_id']" >
|
||||
<td t-attf-style="width: #{td_width}px;" id="seach_enable">
|
||||
<t t-if="days[day][slot][index]['location_id'] == room[0]" >
|
||||
<t t-esc="days[day][slot][index]['title']" />
|
||||
|
||||
<t t-foreach="days[day][slot][index]['speaker_ids']" t-as="speaker">
|
||||
<t t-if="speaker == days[day][slot][index]['speaker_ids'][:1][0]">By </t>
|
||||
<t t-esc="speaker"/>
|
||||
<t t-if=" speaker != days[day][slot][index]['speaker_ids'][-1:][0]">,</t>
|
||||
</t>
|
||||
<t t-if="days[day][slot][index]['id'] != days[day][slot][-1]['id']" >
|
||||
<t t-set="index" t-value="index + 1"/>
|
||||
</t>
|
||||
|
|
|
|||
Loading…
Reference in New Issue