From 87a5495db06d3f222bc6502048a899daf1976c59 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Fri, 2 Aug 2013 12:11:22 +0200 Subject: [PATCH] [IMP] website_event: layout bzr revid: chm@openerp.com-20130802101122-tjhs1iuafqusat67 --- addons/website_event/controllers/main.py | 38 +++++++++++++++- addons/website_event/views/website_event.xml | 46 +++++++++++++++++--- 2 files changed, 75 insertions(+), 9 deletions(-) diff --git a/addons/website_event/controllers/main.py b/addons/website_event/controllers/main.py index da4004b92c6..5da22c1b117 100644 --- a/addons/website_event/controllers/main.py +++ b/addons/website_event/controllers/main.py @@ -3,16 +3,50 @@ from openerp.addons.web import http from openerp.addons.web.http import request from openerp.addons.website import website +from openerp.tools.translate import _ + +from datetime import datetime +from dateutil.relativedelta import relativedelta +from openerp import tools class website_hr(http.Controller): - @http.route(['/event'], type='http', auth="public") - def blog(self, **post): + @http.route(['/event', '/event/search/'], type='http', auth="public") + def blog(self, path=None, **post): data_obj = request.registry['event.event'] + def sd(date): + return date.strftime(tools.DEFAULT_SERVER_DATE_FORMAT) + today = datetime.today() + dates = [ + [None, _('All Dates'), [(1, "=", 1)]], + ['today', _('Today'), [ + ("date_begin", ">=", sd(today)), + ("date_begin", "<", sd(today + relativedelta(days=1)))], + 0], + ['tomorrow', _('Tomorrow'), [ + ("date_begin", ">=", sd(today + relativedelta(days=1))), + ("date_begin", "<", sd(today + relativedelta(days=2)))], + 0], + ['week', _('This Week'), [ + ("date_begin", ">=", sd(today + relativedelta(days=-today.weekday()))), + ("date_begin", "<", sd(today + relativedelta(days=6-today.weekday())))], + 0], + ['nextweek', _('Next Week'), [ + ("date_begin", ">=", sd(today + relativedelta(days=7-today.weekday()))), + ("date_begin", "<", sd(today + relativedelta(days=13-today.weekday())))], + 0], + ['month', _('This month'), [ + ("date_begin", ">=", sd(today.replace(day=1) + relativedelta(months=1))), + ("date_begin", "<", sd(today.replace(day=1) + relativedelta(months=1)))], + 0], + ] + obj_ids = data_obj.search(request.cr, request.uid, [(1, "=", 1)]) values = { 'event_ids': data_obj.browse(request.cr, request.uid, obj_ids), + 'dates': dates, + 'date_active': None, } html = website.render("website_event.index", values) diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml index a7e8878d758..3ac4b74bce2 100644 --- a/addons/website_event/views/website_event.xml +++ b/addons/website_event/views/website_event.xml @@ -40,16 +40,48 @@
+ +
-
- -