diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index a62acbf58db..8100e3bef32 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -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, diff --git a/addons/website_event_track/data/website_event_track_demo.xml b/addons/website_event_track/data/website_event_track_demo.xml index 88f585dbc60..61c87211a63 100644 --- a/addons/website_event_track/data/website_event_track_demo.xml +++ b/addons/website_event_track/data/website_event_track_demo.xml @@ -26,6 +26,7 @@ + @@ -34,7 +35,8 @@ - + + How to develop real time apps, the live chat module explained. @@ -42,7 +44,8 @@ - + + How to develop automated tests in the OpenERP web client. @@ -50,7 +53,8 @@ - + + The new way to promote your modules in the Apps platform and OpenERP website. @@ -59,6 +63,7 @@ + Detailed roadmap of accounting new modules and improvements for version 8. @@ -67,6 +72,7 @@ + A technical explanation of OpenERP as a CMS and a eCommerce platform for version 8. @@ -75,6 +81,7 @@ + Discover OpenERP CRM: How to optimize your sales, from leads to sales orders. @@ -84,6 +91,7 @@ 2 + How to use OpenERP for your HR process: recruitment, leaves management, appraisals, expenses, etc. @@ -94,6 +102,7 @@ 2 + Raising qualitive insights with the survey app @@ -111,6 +120,7 @@ + Manage your events with OpenERP, the new training modules. @@ -119,6 +129,7 @@ + Advanced reporting with Google Spreadsheets integration. @@ -127,6 +138,7 @@ + New Paypal modules (portal, handling, installments). @@ -135,6 +147,7 @@ + OpenERP Mobile for Notes, Meetings and Messages. @@ -143,6 +156,7 @@ + OpenERP as your Enterprise Social Network. @@ -151,6 +165,7 @@ + The Art of Making an OpenERP Demo. @@ -159,6 +174,8 @@ + + How to build your marketing strategy for the purpose of generating leads with OpenERP. @@ -168,6 +185,7 @@ 5 + Advanced lead management with OpenERP: tips and tricks from the fields @@ -177,6 +195,7 @@ 5 + New Certification Program (valid from Oct. 2013). @@ -185,6 +204,7 @@ + Recruiting high skilled talents with OpenERP HR apps @@ -202,6 +222,7 @@ + Key Success factors selling OpenERP. @@ -210,6 +231,7 @@ + Merge proposals review, code sprint (entire day). @@ -218,6 +240,7 @@ + Merge proposals review, code sprint (entire afternoon) @@ -226,6 +249,7 @@ + Registration & Coffee - Main entrance + Partners' Village @@ -240,6 +264,7 @@ + OpenERP Status & Strategy 2014 @@ -247,6 +272,7 @@ + The new marketing strategy. @@ -254,6 +280,7 @@ + Morning break diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index ef6bc0e1738..cab11ef8818 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -80,13 +80,24 @@ - + + + + By + + , + + - + + By + + , +