From 13c55facde9c4814503fb4bba96c3bdde327bf9d Mon Sep 17 00:00:00 2001 From: "Darshan Kalola (OpenERP)" Date: Tue, 11 Mar 2014 16:12:23 +0530 Subject: [PATCH] [IMP]event-track: implement color code for event and added color in demo data of event_track. bzr revid: dka@tinyerp.com-20140311104223-whztnya4fwf8i0c9 --- .../website_event_track/controllers/event.py | 10 +++-- .../data/website_event_track_demo.xml | 1 + .../static/src/css/website_event_track.css | 40 +++++++++++++++++++ .../views/website_event.xml | 12 ++++-- 4 files changed, 55 insertions(+), 8 deletions(-) diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index c86e6769767..46bae6c4f1f 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -124,12 +124,13 @@ class website_event(http.Controller): unsort_tracks[track[2][:8]] = {} if not unsort_tracks[track[2][:8]].has_key(track[5]): unsort_tracks[track[2][:8]][track[5]] = [] - + 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 = algo_for_timetable(start_time, end_time, new_schedule) - - speaker = event_track_obj.browse(request.cr, request.uid, track[0], context=request.context)['speaker_ids'] + event_track = event_track_obj.browse(request.cr, request.uid, track[0], context=request.context) + if event_track.color > 9 : color = 0; + else: color = event_track.color unsort_tracks[track[2][:8]][track[5]].append({ 'id': track[0], 'title': track[4], @@ -138,7 +139,8 @@ class website_event(http.Controller): 'duration':track[3], 'location_id': track[1], 'end_time': end_time, - 'speaker_ids': [s.name for s in speaker], + 'speaker_ids': [s.name for s in event_track.speaker_ids], + 'color': color, }) #Get All Locations room_list = list(set(room_list)) 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 61c87211a63..b989e833a06 100644 --- a/addons/website_event_track/data/website_event_track_demo.xml +++ b/addons/website_event_track/data/website_event_track_demo.xml @@ -27,6 +27,7 @@ + 3 diff --git a/addons/website_event_track/static/src/css/website_event_track.css b/addons/website_event_track/static/src/css/website_event_track.css index 7862175ec27..f6c01f8f19e 100644 --- a/addons/website_event_track/static/src/css/website_event_track.css +++ b/addons/website_event_track/static/src/css/website_event_track.css @@ -52,3 +52,43 @@ background-image: -ms-linear-gradient(top, #C2792A, #DB9141); background-image: -o-linear-gradient(top, #C2792A, #DB9141); } +.event_color_0 { + background-color: white; + color: #5a5a5a; +} +.event_color_1 { + background-color: #cccccc; + color: #424242; +} +.event_color_2 { + background-color: #ffc7c7; + color: #7a3737; +} +.event_color_3 { + background-color: #fff1c7; + color: #756832; +} +.event_color_4 { + background-color: #e3ffc7; + color: #5d6937; +} +.event_color_5 { + background-color: #c7ffd5; + color: #1a7759; +} +.event_color_6 { + background-color: #c7ffff; + color: #1a5d83; +} +.event_color_7 { + background-color: #c7d5ff; + color: #3b3e75; +} +.event_color_8 { + background-color: #e3c7ff; + color: #4c3668; +} +.event_color_9 { + background-color: #ffc7f1; + color: #6d2c70; +} diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index cab11ef8818..67ae4ecdc54 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -90,8 +90,12 @@ - - + + + + + + By @@ -101,8 +105,8 @@ - - + +