diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-03-13 19:02:24 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2014-03-13 19:02:24 +0530 |
| commit | 0628fca1fc8dae2cc17d1870da7cd0e79a7712ec (patch) | |
| tree | 9f4c770fb282298a0d9a0a26eb2e80c3a0000ba1 | |
| parent | 03ca05f6383fa1d0b419276d16c1ac841cd42a45 (diff) | |
[IMP]add talks
bzr revid: vme@tinyerp.com-20140313133224-jmzacgnqlxee32y5
| -rw-r--r-- | addons/website_event_track/controllers/event.py | 12 | ||||
| -rw-r--r-- | addons/website_event_track/views/website_event.xml | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 888ab47f3f9..960a0545b2f 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -116,6 +116,12 @@ class website_event(http.Controller): ''',(event.id,)) fetch_tracks = request.cr.fetchall() + + request.cr.execute(''' + select count(*), date_trunc('day',date) from event_track where event_id = %s group by date_trunc('day',date) order by date_trunc('day',date) + ''',(event.id,)) + talks = request.cr.fetchall() + unsort_tracks = {} room_list = [] new_schedule = {} @@ -130,7 +136,7 @@ class website_event(http.Controller): start_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S') end_time = start_time + datetime.timedelta(minutes = int(track[3])) new_schedule[track[2][:8]] = algo_for_timetable(start_time, end_time, new_schedule[track[2][:8]]) - + #Add timeslot as key to track for key in new_schedule.keys(): unsort_tracks[key] = OrderedDict() @@ -193,13 +199,13 @@ class website_event(http.Controller): for skip in skip_td.keys(): for loc in skip_td[skip].keys(): skip_td[skip][loc] = list(set(skip_td[skip][loc])) - values = { 'event': event, 'main_object': event, 'room_list': rooms, 'days': unsort_tracks, - 'skip_td': skip_td + 'skip_td': skip_td, + 'talks':talks } return request.website.render("website_event_track.agenda", values) diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index dd38f4fa568..b3f44d7fe91 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -59,7 +59,7 @@ <t t-foreach="days" t-as="day"> <h3 class="page-header mt0"> <t t-esc="day"/> - <small>23 talks</small> + <small><t t-esc="(talks[(days.keys()).index(day)])[0]"/> talks</small> <div class="form-group col-md-3 pull-right"> <input type="text" class="form-control" placeholder="Search..." id="start_search"/> </div> |