From d43c76de65e75aa7fc18f7c8d358d5cb4e7ced0d Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Mon, 24 Mar 2014 10:50:04 +0530 Subject: [PATCH] [REM]remove timezone from frontend. bzr revid: vme@tinyerp.com-20140324052004-441bz8g24kix3fei --- .../website_event_track/controllers/event.py | 16 ---------------- .../static/src/js/website_event_track.js | 18 ------------------ .../views/website_event.xml | 5 ----- 3 files changed, 39 deletions(-) diff --git a/addons/website_event_track/controllers/event.py b/addons/website_event_track/controllers/event.py index 42536813fde..981ff1a546c 100644 --- a/addons/website_event_track/controllers/event.py +++ b/addons/website_event_track/controllers/event.py @@ -33,18 +33,6 @@ controllers = controllers() import pytz from pytz import timezone class website_event(http.Controller): - - @http.route(['/website_event/change_time/'], type='json', auth="user", website=True) - def change_time(self, datum): - time_collection = eval(datum.get('time_collection')) - local_tz = pytz.timezone (datum.get('time_zone')) - new_list = [] - for time in time_collection: - start_time = (time[0].replace(tzinfo=pytz.utc).astimezone(local_tz)).strftime('%H:%M') - end_time = (time[1].replace(tzinfo=pytz.utc).astimezone(local_tz)).strftime('%H:%M') - new_list.append(start_time +" - "+ end_time) - return new_list - @http.route(['/event//track/'], type='http', auth="public", website=True, multilang=True) def event_track_view(self, event, track, **post): track_obj = request.registry.get('event.track') @@ -130,7 +118,6 @@ class website_event(http.Controller): ''',(event.id,)) fetch_tracks = request.cr.fetchall() - print "vvvv",fetch_tracks 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) @@ -142,7 +129,6 @@ class website_event(http.Controller): new_schedule = {} location_object = request.registry.get('event.track.location') event_track_obj = request.registry.get('event.track') - time_collection = [] #Make all possible timeslot for each day. for track in fetch_tracks: room_list.append(track[1]) @@ -157,7 +143,6 @@ class website_event(http.Controller): unsort_tracks[key] = OrderedDict() for value in new_schedule[key]: unsort_tracks[key][value[0].strftime('%H:%M')+" - "+value[1].strftime('%H:%M')] = [] - time_collection.append([value[0],value[1]]) #Add track to its related time slot and day. for track in fetch_tracks: @@ -232,7 +217,6 @@ class website_event(http.Controller): 'talks':talks, 'format_date':format_date, 'timezone':timezone, - 'time_collection':time_collection } return request.website.render("website_event_track.agenda", values) diff --git a/addons/website_event_track/static/src/js/website_event_track.js b/addons/website_event_track/static/src/js/website_event_track.js index 5edcbdbf864..efccf5693df 100644 --- a/addons/website_event_track/static/src/js/website_event_track.js +++ b/addons/website_event_track/static/src/js/website_event_track.js @@ -1,22 +1,4 @@ $(document).ready(function() { - console.log(openerp); - var offset = -(new Date().getTimezoneOffset()); - var time_collection = $("select#timezone").attr('data'); - $("select#timezone").bind('change keyup', function(e){ - openerp.jsonRpc('/website_event/change_time/', 'call', { - 'datum': {'time_collection':time_collection,'time_zone':$(this).find("option:selected").text()}, - }).done(function (msg) { - var change_time = $("td#change_time"); - $.each(change_time, function(key, element){ - $(element).text(msg[key]); - }); - }); - }); - var select = $("select#timezone option").filter(function(){return this.value==offset}).first(); - if(select){ - select.attr("selected","selected"); - $("select#timezone").trigger('change'); - } function set_value(td_contain){ var search_object = {}; $.each(td_contain, function(key, element2){ diff --git a/addons/website_event_track/views/website_event.xml b/addons/website_event_track/views/website_event.xml index 3e5ea1979e9..6ffa0265563 100644 --- a/addons/website_event_track/views/website_event.xml +++ b/addons/website_event_track/views/website_event.xml @@ -52,11 +52,6 @@
-