[IMP]talks count.
bzr revid: vme@tinyerp.com-20140324085647-ms5rrfwvpj0t1apn
This commit is contained in:
parent
b74c4bca0e
commit
5755070df3
|
@ -118,23 +118,33 @@ class website_event(http.Controller):
|
||||||
''',(event.id,))
|
''',(event.id,))
|
||||||
|
|
||||||
fetch_tracks = request.cr.fetchall()
|
fetch_tracks = request.cr.fetchall()
|
||||||
|
local_tz = pytz.timezone(event.timezone_of_event)
|
||||||
|
|
||||||
request.cr.execute('''
|
talks = {}
|
||||||
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)
|
for index, track in enumerate(fetch_tracks):
|
||||||
''',(event.id,))
|
lst = list(track)
|
||||||
talks = request.cr.fetchall()
|
date_s = datetime.datetime.strptime(lst[5], '%Y-%m-%d %H:%M:%S')
|
||||||
|
local_dt = date_s.replace(tzinfo=pytz.utc).astimezone(local_tz)
|
||||||
|
local_tz.normalize(local_dt)
|
||||||
|
lst[2] = local_dt.strftime('%m-%d-%y')
|
||||||
|
lst[5] = local_dt
|
||||||
|
fetch_tracks[index] = tuple(lst)
|
||||||
|
if not talks.has_key(track[2][:8]):
|
||||||
|
talks[track[2][:8]] = 0
|
||||||
|
talks[track[2][:8]] = talks[track[2][:8]] + 1
|
||||||
|
|
||||||
unsort_tracks = {}
|
unsort_tracks = {}
|
||||||
room_list = []
|
room_list = []
|
||||||
new_schedule = {}
|
new_schedule = {}
|
||||||
location_object = request.registry.get('event.track.location')
|
location_object = request.registry.get('event.track.location')
|
||||||
event_track_obj = request.registry.get('event.track')
|
event_track_obj = request.registry.get('event.track')
|
||||||
|
|
||||||
#Make all possible timeslot for each day.
|
#Make all possible timeslot for each day.
|
||||||
for track in fetch_tracks:
|
for track in fetch_tracks:
|
||||||
room_list.append(track[1])
|
room_list.append(track[1])
|
||||||
if not new_schedule.has_key(track[2][:8]):
|
if not new_schedule.has_key(track[2][:8]):
|
||||||
new_schedule[track[2][:8]] = []
|
new_schedule[track[2][:8]] = []
|
||||||
start_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S')
|
start_time = track[5]
|
||||||
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]])
|
||||||
|
|
||||||
|
@ -146,7 +156,7 @@ class website_event(http.Controller):
|
||||||
|
|
||||||
#Add track to its related time slot and day.
|
#Add track to its related time slot and day.
|
||||||
for track in fetch_tracks:
|
for track in fetch_tracks:
|
||||||
start_time = datetime.datetime.strptime(track[5], '%Y-%m-%d %H:%M:%S')
|
start_time = track[5]
|
||||||
end_time = start_time + datetime.timedelta(minutes = int(track[3]))
|
end_time = start_time + datetime.timedelta(minutes = int(track[3]))
|
||||||
secret_key = None
|
secret_key = None
|
||||||
row_span = 0
|
row_span = 0
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
<t t-set="index_of_day" t-value="(days.keys()).index(day)" />
|
<t t-set="index_of_day" t-value="(days.keys()).index(day)" />
|
||||||
<h3 class="page-header mt0">
|
<h3 class="page-header mt0">
|
||||||
<t t-esc="format_date[index_of_day]" />
|
<t t-esc="format_date[index_of_day]" />
|
||||||
<small><t t-esc="(talks[index_of_day])[0]"/> talks</small>
|
<small><t t-esc="(talks[day])"/> 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="Filter..." id="start_search"/>
|
<input type="text" class="form-control" placeholder="Filter..." id="start_search"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue