[IMP]add talks
bzr revid: vme@tinyerp.com-20140313133224-jmzacgnqlxee32y5
This commit is contained in:
parent
03ca05f638
commit
0628fca1fc
|
@ -116,6 +116,12 @@ class website_event(http.Controller):
|
||||||
''',(event.id,))
|
''',(event.id,))
|
||||||
|
|
||||||
fetch_tracks = request.cr.fetchall()
|
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 = {}
|
unsort_tracks = {}
|
||||||
room_list = []
|
room_list = []
|
||||||
new_schedule = {}
|
new_schedule = {}
|
||||||
|
@ -130,7 +136,7 @@ class website_event(http.Controller):
|
||||||
start_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S')
|
start_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S')
|
||||||
end_time = start_time + datetime.timedelta(minutes = int(track[3]))
|
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]])
|
new_schedule[track[2][:8]] = algo_for_timetable(start_time, end_time, new_schedule[track[2][:8]])
|
||||||
|
|
||||||
#Add timeslot as key to track
|
#Add timeslot as key to track
|
||||||
for key in new_schedule.keys():
|
for key in new_schedule.keys():
|
||||||
unsort_tracks[key] = OrderedDict()
|
unsort_tracks[key] = OrderedDict()
|
||||||
|
@ -193,13 +199,13 @@ class website_event(http.Controller):
|
||||||
for skip in skip_td.keys():
|
for skip in skip_td.keys():
|
||||||
for loc in skip_td[skip].keys():
|
for loc in skip_td[skip].keys():
|
||||||
skip_td[skip][loc] = list(set(skip_td[skip][loc]))
|
skip_td[skip][loc] = list(set(skip_td[skip][loc]))
|
||||||
|
|
||||||
values = {
|
values = {
|
||||||
'event': event,
|
'event': event,
|
||||||
'main_object': event,
|
'main_object': event,
|
||||||
'room_list': rooms,
|
'room_list': rooms,
|
||||||
'days': unsort_tracks,
|
'days': unsort_tracks,
|
||||||
'skip_td': skip_td
|
'skip_td': skip_td,
|
||||||
|
'talks':talks
|
||||||
}
|
}
|
||||||
return request.website.render("website_event_track.agenda", values)
|
return request.website.render("website_event_track.agenda", values)
|
||||||
|
|
||||||
|
|
|
@ -59,7 +59,7 @@
|
||||||
<t t-foreach="days" t-as="day">
|
<t t-foreach="days" t-as="day">
|
||||||
<h3 class="page-header mt0">
|
<h3 class="page-header mt0">
|
||||||
<t t-esc="day"/>
|
<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">
|
<div class="form-group col-md-3 pull-right">
|
||||||
<input type="text" class="form-control" placeholder="Search..." id="start_search"/>
|
<input type="text" class="form-control" placeholder="Search..." id="start_search"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue