[IMP]code refactore python.
bzr revid: vme@tinyerp.com-20140325065616-u4gksi76xtb6ajhw
This commit is contained in:
Vidhin Mehta (OpenERP)
parent
ee0e15c48e
commit
279be8cb26
|
|
@ -43,185 +43,8 @@ class website_event(http.Controller):
|
|||
# TODO: not implemented
|
||||
@http.route(['/event/<model("event.event"):event>/agenda/'], type='http', auth="public", website=True, multilang=True)
|
||||
def event_agenda(self, event, tag=None, **post):
|
||||
#To make timeslot according to given track time
|
||||
def algo_for_timetable(new_start_date, new_end_date, new_schedule):
|
||||
#If new time in range of start and end time, it make two slot
|
||||
#and remove old element.
|
||||
def insert_time(time, new_schedule):
|
||||
for index,ct in enumerate(time):
|
||||
for index2,dt in enumerate(new_schedule):
|
||||
st = dt[0]
|
||||
et = dt[1]
|
||||
if st == ct or et == ct:break
|
||||
if st < ct and et > ct:
|
||||
new_schedule.pop(index2)
|
||||
new_schedule.insert(index2, [ct, et])
|
||||
new_schedule.insert(index2, [st, ct])
|
||||
break
|
||||
return new_schedule
|
||||
if not new_schedule:
|
||||
new_schedule.append([new_start_date, new_end_date])
|
||||
return new_schedule
|
||||
first_start_date = new_schedule[0][0]
|
||||
last_end_date = new_schedule[-1][1]
|
||||
|
||||
#totally outter
|
||||
if first_start_date >= new_start_date and new_end_date >= last_end_date:
|
||||
if not new_start_date == first_start_date:
|
||||
new_schedule.insert(0, [new_start_date, first_start_date])
|
||||
if not last_end_date == new_end_date:
|
||||
new_schedule.append([last_end_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
#lower outer
|
||||
if first_start_date >= new_end_date:
|
||||
new_schedule.insert(0, [new_start_date, new_end_date])
|
||||
if not new_end_date == first_start_date:
|
||||
new_schedule.insert(1, [new_end_date, first_start_date])
|
||||
return new_schedule
|
||||
|
||||
# upper outer
|
||||
if new_start_date >= last_end_date:
|
||||
if not last_end_date == new_start_date:
|
||||
new_schedule.append([last_end_date, new_start_date])
|
||||
new_schedule.append([new_start_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
#When inner time
|
||||
if first_start_date <= new_start_date and last_end_date >= new_end_date:
|
||||
new_schedule = insert_time([new_start_date, new_end_date], new_schedule)
|
||||
return new_schedule
|
||||
|
||||
#when start date is more and end date in range
|
||||
if first_start_date > new_start_date and last_end_date >= new_end_date:
|
||||
new_schedule.insert(0, [new_start_date, first_start_date])
|
||||
new_schedule = insert_time([new_end_date], new_schedule)
|
||||
return new_schedule
|
||||
|
||||
#when end date is more and start date in range
|
||||
if new_end_date > last_end_date and new_start_date >= first_start_date:
|
||||
new_schedule = insert_time([new_start_date], new_schedule)
|
||||
new_schedule.append([last_end_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
request.cr.execute('''
|
||||
Select id, location_id, groupby_datetime, duration, name, date from (
|
||||
Select id, location_id, to_char(date_trunc('hour',date),'mm-dd-yy hh AM') as
|
||||
groupby_datetime, duration, name, event_id, date, count(*) as tot from event_track
|
||||
where date IS NOT NULL AND duration IS NOT NULL AND duration != 0
|
||||
group by event_id, duration, id, location_id, date, date_trunc('hour',date)
|
||||
order by date, date_trunc('hour',date)
|
||||
)
|
||||
event_query where event_query.event_id = %s
|
||||
group by event_query.location_id, event_query.id,
|
||||
event_query.groupby_datetime, event_query.duration,event_query.name, event_query.date;
|
||||
''',(event.id,))
|
||||
|
||||
fetch_tracks = request.cr.fetchall()
|
||||
local_tz = pytz.timezone(event.timezone_of_event)
|
||||
|
||||
talks = {}
|
||||
for index, track in enumerate(fetch_tracks):
|
||||
lst = list(track)
|
||||
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 = {}
|
||||
room_list = []
|
||||
new_schedule = {}
|
||||
location_object = request.registry.get('event.track.location')
|
||||
event_track_obj = request.registry.get('event.track')
|
||||
|
||||
#Make all possible timeslot for each day.
|
||||
for track in fetch_tracks:
|
||||
room_list.append(track[1])
|
||||
if not new_schedule.has_key(track[2][:8]):
|
||||
new_schedule[track[2][:8]] = []
|
||||
start_time = track[5]
|
||||
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()
|
||||
for value in new_schedule[key]:
|
||||
unsort_tracks[key][value[0].strftime('%H:%M')+" - "+value[1].strftime('%H:%M')] = []
|
||||
|
||||
#Add track to its related time slot and day.
|
||||
for track in fetch_tracks:
|
||||
start_time = track[5]
|
||||
end_time = start_time + datetime.timedelta(minutes = int(track[3]))
|
||||
secret_key = None
|
||||
row_span = 0
|
||||
for index, value in enumerate(new_schedule[track[2][:8]]):
|
||||
if value[0] <= start_time and value[1] > start_time:
|
||||
keys = unsort_tracks[track[2][:8]].keys()
|
||||
secret_key = keys[index]
|
||||
row_span = index
|
||||
if value[1] == end_time and secret_key:
|
||||
if not index == row_span:
|
||||
index = index + 1
|
||||
event_tracks = event_track_obj.browse(request.cr, openerp.SUPERUSER_ID, track[0], context=request.context)
|
||||
color = 0 if event_tracks.color > 9 else event_tracks.color
|
||||
unsort_tracks[track[2][:8]][secret_key].append({
|
||||
'id': track[0],
|
||||
'title': track[4],
|
||||
'time': track[5],
|
||||
'location_id': track[1],
|
||||
'duration':track[3],
|
||||
'location_id': track[1],
|
||||
'end_time': end_time,
|
||||
'speaker_ids': [s.name for s in event_tracks.speaker_ids],
|
||||
'row_span': index - row_span,
|
||||
'color': color,
|
||||
'publish': not event_tracks.website_published
|
||||
})
|
||||
#Get All Locations and make room_list contain unique value.
|
||||
room_list = list(set(room_list))
|
||||
room_list.sort()
|
||||
rooms = []
|
||||
for room in room_list:
|
||||
if room:rooms.append([room, location_object.browse(request.cr, openerp.SUPERUSER_ID, room).name])
|
||||
|
||||
#For rowspan calculate all td which will not display in future.
|
||||
#Sort track according to location(to display under related location).
|
||||
skip_td = {}
|
||||
for track in unsort_tracks.keys():
|
||||
skip_td[track] = {}
|
||||
key1 = unsort_tracks[track].keys()
|
||||
for tra in unsort_tracks[track].keys():
|
||||
list1 = unsort_tracks[track][tra]
|
||||
unsort_tracks[track][tra] = sorted(list1, key=lambda x: x['location_id'])
|
||||
for i in unsort_tracks[track][tra]:
|
||||
if i['row_span']:
|
||||
skip_time = key1[key1.index(tra)+1: key1.index(tra)+i['row_span']]
|
||||
if not skip_td[track].has_key(i['location_id']):
|
||||
skip_td[track] [i['location_id']] = []
|
||||
skip_td[track] [i['location_id']] = skip_td[track] [i['location_id']] + skip_time
|
||||
|
||||
#Remove repeated element in list if any.
|
||||
format_date = []
|
||||
for skip in skip_td.keys():
|
||||
format_date.append((datetime.datetime.strptime(skip, '%m-%d-%y')).strftime("%d %B, %Y"))
|
||||
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,
|
||||
'talks':talks,
|
||||
'format_date':format_date,
|
||||
}
|
||||
event_track = request.registry.get('event.track')
|
||||
values = event_track._get_value(request.cr, openerp.SUPERUSER_ID, event, context=request.context)
|
||||
return request.website.render("website_event_track.agenda", values)
|
||||
|
||||
@http.route([
|
||||
|
|
|
|||
|
|
@ -25,6 +25,7 @@ from openerp.addons.website.models.website import slug
|
|||
import datetime
|
||||
import pytz
|
||||
from pytz import timezone
|
||||
from collections import OrderedDict
|
||||
|
||||
class event_track_tag(osv.osv):
|
||||
_name = "event.track.tag"
|
||||
|
|
@ -128,7 +129,139 @@ class event_track(osv.osv):
|
|||
_group_by_full = {
|
||||
'stage_id': _read_group_stage_ids,
|
||||
}
|
||||
@staticmethod
|
||||
def make_timetable(new_start_date, new_end_date, new_schedule):
|
||||
def insert_time(time, new_schedule):
|
||||
for index,ct in enumerate(time):
|
||||
for index2,dt in enumerate(new_schedule):
|
||||
st, et = dt
|
||||
if st == ct or et == ct:break
|
||||
if st < ct and et > ct:
|
||||
new_schedule.pop(index2)
|
||||
new_schedule.insert(index2, [ct, et])
|
||||
new_schedule.insert(index2, [st, ct])
|
||||
break
|
||||
return new_schedule
|
||||
if not new_schedule:
|
||||
new_schedule.append([new_start_date, new_end_date])
|
||||
return new_schedule
|
||||
first_start_date = new_schedule[0][0]
|
||||
last_end_date = new_schedule[-1][1]
|
||||
|
||||
#totally outter
|
||||
if first_start_date >= new_start_date and new_end_date >= last_end_date:
|
||||
if not new_start_date == first_start_date:
|
||||
new_schedule.insert(0, [new_start_date, first_start_date])
|
||||
if not last_end_date == new_end_date:
|
||||
new_schedule.append([last_end_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
#lower outer
|
||||
if first_start_date >= new_end_date:
|
||||
new_schedule.insert(0, [new_start_date, new_end_date])
|
||||
if not new_end_date == first_start_date:
|
||||
new_schedule.insert(1, [new_end_date, first_start_date])
|
||||
return new_schedule
|
||||
|
||||
# upper outer
|
||||
if new_start_date >= last_end_date:
|
||||
if not last_end_date == new_start_date:
|
||||
new_schedule.append([last_end_date, new_start_date])
|
||||
new_schedule.append([new_start_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
#When inner time
|
||||
if first_start_date <= new_start_date and last_end_date >= new_end_date:
|
||||
new_schedule = insert_time([new_start_date, new_end_date], new_schedule)
|
||||
return new_schedule
|
||||
|
||||
#when start date is more and end date in range
|
||||
if first_start_date > new_start_date and last_end_date >= new_end_date:
|
||||
new_schedule.insert(0, [new_start_date, first_start_date])
|
||||
new_schedule = insert_time([new_end_date], new_schedule)
|
||||
return new_schedule
|
||||
|
||||
#when end date is more and start date in range
|
||||
if new_end_date > last_end_date and new_start_date >= first_start_date:
|
||||
new_schedule = insert_time([new_start_date], new_schedule)
|
||||
new_schedule.append([last_end_date, new_end_date])
|
||||
return new_schedule
|
||||
|
||||
@staticmethod
|
||||
def convert_time(time, duration, local_tz):
|
||||
local_dt = (datetime.datetime.strptime(time, '%Y-%m-%d %H:%M:%S')).replace(tzinfo=pytz.utc).astimezone(local_tz)
|
||||
local_tz.normalize(local_dt)
|
||||
return local_dt, local_dt + datetime.timedelta(minutes = duration), local_dt.strftime('%m-%d-%y')
|
||||
|
||||
def _fetch_record(self, cr, uid, event_id, context=None):
|
||||
return self.search(cr, uid, [('event_id','=',event_id),('date','!=',False),('duration','!=',False),('duration','!=',0)], context=context)
|
||||
|
||||
def _get_value(self, cr, uid, event, context=None):
|
||||
keys_for_table = {}
|
||||
format_date = []
|
||||
sort_tracks = {}
|
||||
room_list = []
|
||||
rooms = []
|
||||
talks = {}
|
||||
skip_td = {}
|
||||
|
||||
location_object = self.pool.get('event.track.location')
|
||||
event_track_ids = self._fetch_record(cr, uid, event.id, context=context)
|
||||
local_tz = pytz.timezone(event.timezone_of_event)
|
||||
def set_value(key, val):
|
||||
sort_tracks[key][val]=[]
|
||||
for track in self.read(cr, uid, event_track_ids, ['date','duration'],context=context):
|
||||
start_time, end_time, key = self.convert_time(track['date'], track['duration'], local_tz)
|
||||
if not keys_for_table.has_key(key):
|
||||
keys_for_table[key] = []
|
||||
sort_tracks[key] = OrderedDict()
|
||||
talks[key] = 0
|
||||
talks[key] = talks[key] + 1
|
||||
keys_for_table[key] = self.make_timetable(start_time, end_time, keys_for_table[key])
|
||||
|
||||
[set_value(key, value[0].strftime('%H:%M')+" - "+value[1].strftime('%H:%M')) for key in keys_for_table.keys() for value in keys_for_table[key]]
|
||||
|
||||
for track in self.browse(cr, uid, event_track_ids, context=context):
|
||||
if(track.location_id):room_list.append(track.location_id.id)
|
||||
start_time, end_time, key = self.convert_time(track.date, track.duration, local_tz)
|
||||
secret_key = None
|
||||
row_span = 0
|
||||
for index, value in enumerate(keys_for_table[key]):
|
||||
if value[0] <= start_time and value[1] > start_time:
|
||||
keys = sort_tracks[key].keys()
|
||||
secret_key = keys[index]
|
||||
row_span = index
|
||||
if value[1] == end_time and secret_key:
|
||||
if not index == row_span:
|
||||
row_span = row_span - 1
|
||||
sort_tracks[key][secret_key].append({'object':track,'row_span': index - row_span, 'location':track.location_id.id})
|
||||
|
||||
for room in list(set(room_list)):
|
||||
if room:rooms.append([room, location_object.browse(cr, uid, room).name])
|
||||
|
||||
skip_td = {}
|
||||
for track in sort_tracks.keys():
|
||||
skip_td[track] = {}
|
||||
format_date.append((datetime.datetime.strptime(track, '%m-%d-%y')).strftime("%d %B, %Y"))
|
||||
key1 = sort_tracks[track].keys()
|
||||
for tra in sort_tracks[track].keys():
|
||||
sort_tracks[track][tra] = sorted(sort_tracks[track][tra], key=lambda x: x['location'])
|
||||
for i in sort_tracks[track][tra]:
|
||||
if i['row_span']:
|
||||
skip_time = key1[key1.index(tra)+1: key1.index(tra)+i['row_span']]
|
||||
if not skip_td[track].has_key(i['location']):
|
||||
skip_td[track] [i['location']] = []
|
||||
skip_td[track][i['location']] = skip_td[track] [i['location']] + skip_time
|
||||
|
||||
return {
|
||||
'event': event,
|
||||
'main_object': event,
|
||||
'room_list': rooms,
|
||||
'days': sort_tracks,
|
||||
'skip_td': skip_td,
|
||||
'talks':talks,
|
||||
'format_date':format_date,
|
||||
}
|
||||
#
|
||||
# Events
|
||||
#
|
||||
|
|
|
|||
|
|
@ -86,38 +86,38 @@
|
|||
</t>
|
||||
<t t-if="len(days[day][slot])">
|
||||
<t t-set="record" t-value="days[day][slot][index]" />
|
||||
<t t-if="not record['location_id'] and for_all" >
|
||||
<t t-if="not record['object'].location_id and for_all" >
|
||||
<t t-set="for_all" t-value="False"/>
|
||||
<td t-if="sid" id="seach_enable" t-att-colspan="len(room_list)" t-attf-class="event_color_#{record['color']} text-center">
|
||||
<img t-if="record['publish']" title="Not Published" style="width:10px; height:10px" src="/web/static/src/img/icons/gtk-no.png" />
|
||||
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug([record['id'], record['title']]) }"> <t t-esc="record['title']" /> </a>
|
||||
<t t-foreach="record['speaker_ids']" t-as="speaker">
|
||||
<td t-if="sid" id="seach_enable" t-att-colspan="len(room_list)" t-attf-class="event_color_#{record['object'].color} text-center">
|
||||
<img t-if="not record['object'].website_published" title="Not Published" style="width:10px; height:10px" src="/web/static/src/img/icons/gtk-no.png" />
|
||||
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug([record['object'].id, record['object'].name]) }"> <t t-esc="record['object'].name" /> </a>
|
||||
<t t-foreach="record['object'].speaker_ids" t-as="speaker">
|
||||
<small class="text-muted">
|
||||
<t t-if="speaker == record['speaker_ids'][:1][0]"><br/>By </t>
|
||||
<t t-esc="speaker"/>
|
||||
<t t-if=" speaker != record['speaker_ids'][-1:][0]">,</t>
|
||||
<t t-if="speaker == record['object'].speaker_ids[:1][0]"><br/>By </t>
|
||||
<t t-esc="speaker.name"/>
|
||||
<t t-if=" speaker.id !=record['object'].speaker_ids[:1][0].id">,</t>
|
||||
</small>
|
||||
</t>
|
||||
</td>
|
||||
</t>
|
||||
<t t-if="record['location_id'] != room[0] and for_all" >
|
||||
<t t-if="record['object'].location_id.id != room[0] and for_all" >
|
||||
<td t-attf-style="width: #{td_width}px;">
|
||||
</td>
|
||||
</t>
|
||||
<t t-if="record['location_id'] == room[0]" >
|
||||
<t t-if="record['object'].location_id.id == room[0]" >
|
||||
<td t-att-rowspan="record['row_span']" t-attf-style="width: #{td_width}px;"
|
||||
t-attf-class="event_color_#{record['color']}" id="seach_enable">
|
||||
<img t-if="record['publish']" title="Not Published" style="width:10px; height:10px" src="/web/static/src/img/icons/gtk-no.png" />
|
||||
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug([record['id'], record['title']]) }"> <t t-esc="record['title']" /> </a>
|
||||
<t t-foreach="record['speaker_ids']" t-as="speaker">
|
||||
t-attf-class="event_color_#{record['object'].color}" id="seach_enable">
|
||||
<img t-if="not record['object'].website_published" title="Not Published" style="width:10px; height:10px" src="/web/static/src/img/icons/gtk-no.png" />
|
||||
<a t-attf-href="/event/#{ slug(event) }/track/#{ slug([record['object'].id, record['object'].name]) }"> <t t-esc="record['object'].name" /> </a>
|
||||
<t t-foreach="record['object'].speaker_ids" t-as="speaker">
|
||||
<small class="text-muted">
|
||||
<t t-if="speaker == record['speaker_ids'][:1][0]"><br/>By </t>
|
||||
<t t-esc="speaker"/>
|
||||
<t t-if=" speaker != record['speaker_ids'][-1:][0]">,</t>
|
||||
<t t-if="speaker == record['object'].speaker_ids[:1][0]"><br/>By </t>
|
||||
<t t-esc="speaker.name"/>
|
||||
<t t-if=" speaker.id !=record['object'].speaker_ids[:1][0].id">,</t>
|
||||
</small>
|
||||
</t>
|
||||
</td>
|
||||
<t t-if="record['id'] != days[day][slot][-1]['id']" >
|
||||
<t t-if="record['object'].id != days[day][slot][-1]['object'].id" >
|
||||
<t t-set="index" t-value="index + 1"/>
|
||||
</t>
|
||||
</t>
|
||||
|
|
|
|||
Loading…
Reference in New Issue