diff --git a/addons/website/static/src/css/website.css b/addons/website/static/src/css/website.css index e47b7a41baa..b386c3f4769 100644 --- a/addons/website/static/src/css/website.css +++ b/addons/website/static/src/css/website.css @@ -529,3 +529,9 @@ span[data-oe-type="monetary"] { width: 400px; margin: 40px auto; } + +.oe_website_overflow_ellipsis{ + white-space:nowrap; + overflow:hidden; + text-overflow:ellipsis; +} diff --git a/addons/website/static/src/css/website.sass b/addons/website/static/src/css/website.sass index 3cdfe37a896..9e69f85065d 100644 --- a/addons/website/static/src/css/website.sass +++ b/addons/website/static/src/css/website.sass @@ -428,3 +428,9 @@ span[data-oe-type="monetary"] .oe_website_login_container width: 400px margin: 40px auto + +.oe_website_overflow_ellipsis + white-space:nowrap + overflow:hidden + text-overflow:ellipsis + diff --git a/addons/website/static/src/img/blocks/block-country_events.png b/addons/website/static/src/img/blocks/block-country_events.png new file mode 100644 index 00000000000..52254ba4c3e Binary files /dev/null and b/addons/website/static/src/img/blocks/block-country_events.png differ diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index 2a6e1d134e3..132fc14ed09 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -28,6 +28,7 @@ controllers = controllers() from datetime import datetime, timedelta +import time from dateutil.relativedelta import relativedelta from openerp import tools import werkzeug.urls @@ -215,3 +216,24 @@ class website_event(http.Controller): } event_id = Event.create(request.cr, request.uid, vals, context=context) return request.redirect("/event/%s/?enable_editor=1" % event_id) + + @http.route('/event/get_country_event_list/', type='http', auth='public', website=True) + def get_country_events(self,country_code ,**post): + cr, uid, context = request.cr, request.uid, request.context + event_obj = request.registry['event.event'] + event_ids = event_obj.search(request.cr, request.uid, [('country_id.code', '=', country_code),('state', '=', 'confirm'),('date_begin','>=', time.strftime('%Y-%m-%d 00:00:00'))], order="date_begin", context=request.context) + events = event_obj.browse(request.cr, request.uid, event_ids, context=request.context) + country_obj = request.registry['res.country'] + country_ids = country_obj.search(request.cr, request.uid, [('code', '=', country_code)], context=request.context) + country = country_obj.browse(request.cr, request.uid, country_ids[0], context=request.context) + result = {'events':[], 'country': country} + for event in events: + start_date = datetime.strptime(event.date_begin.split(' ')[0], "%Y-%m-%d") + end_date = datetime.strptime(event.date_end.split(' ')[0], "%Y-%m-%d") + if end_date == start_date: + result['events'].append({"date": start_date.strftime("%b")+" "+start_date.strftime("%e"), + "event": event, 'url': event.website_url}) + else: + result['events'].append({"date":start_date.strftime("%b")+" "+start_date.strftime("%e")+"-"+end_date.strftime("%e"), + "event": event, 'url': event.website_url}) + return request.website.render("website_event.country_events_list",result) diff --git a/addons/website_event/static/src/js/website_geolocation.js b/addons/website_event/static/src/js/website_geolocation.js new file mode 100644 index 00000000000..3d48b042433 --- /dev/null +++ b/addons/website_event/static/src/js/website_geolocation.js @@ -0,0 +1,40 @@ +(function() { + "use strict"; + function getLocation() + { + if (navigator.geolocation) + { + navigator.geolocation.getCurrentPosition(showPosition); + } + else{alert("Geolocation is not supported by this browser.");} + } + + function showPosition(position) + { + var latitude = position.coords.latitude; + var longitude = position.coords.longitude; + $.ajax({ + url: "https://maps.googleapis.com/maps/api/geocode/json?latlng="+latitude+","+longitude+"&sensor=false", + type: 'GET', + dataType: 'json', + success: function(response, status, xhr, wfe){ + if(response.status == 'OK'){ + var last_element = response.results[response.results.length - 1] + if( last_element.types.indexOf( "country" ) != -1){ + var country_obj = last_element.address_components[0]; + $('img.event_country_flag').attr('src','base/static/img/country_flags/'+country_obj.short_name.toLowerCase()+'.png'); + $.post( "/event/get_country_event_list/"+country_obj.short_name, function( data ) { + $( ".country_events_list" ).replaceWith( data ); + }); + } + } + } + }); + } + + $(document).ready(function () { + if($('.country_events').length){ + getLocation(); + } + }); +})(); \ No newline at end of file diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index d002521b021..c2d2129ecdd 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -336,5 +336,63 @@ + + + + + +