From 239918064625bf2e7e1d60f89676f451c1dea1c5 Mon Sep 17 00:00:00 2001 From: philipp Date: Thu, 27 Jul 2017 22:01:31 +0000 Subject: [PATCH] bericht_view is rendered now. git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2682 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- wradmin/__init__.py | 6 ++++++ wradmin/controllers/bericht.py | 17 ++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/wradmin/__init__.py b/wradmin/__init__.py index 9fe699d..8a35e9d 100644 --- a/wradmin/__init__.py +++ b/wradmin/__init__.py @@ -71,6 +71,12 @@ def bericht_view(id): return BerichtController().view(id) +@app.route("/bericht/change_date_invalid/", methods=['POST']) +def bericht_change_date_invalid(id): + get_db() + return BerichtController().view(id) + + @app.route("/gasthaus/list") def gasthaus_list(): get_db() diff --git a/wradmin/controllers/bericht.py b/wradmin/controllers/bericht.py index ebaf37d..5ee5775 100644 --- a/wradmin/controllers/bericht.py +++ b/wradmin/controllers/bericht.py @@ -1,6 +1,7 @@ #from pylons import request, response, session, url, tmpl_context as c #from pylons.controllers.util import abort, redirect -from flask import request +import datetime +from flask import request, abort import paginate import sqlalchemy as sa @@ -32,7 +33,7 @@ from wradmin.genshi import render_genshi_template, TemplateContext class BerichtController: - def _add_dates_to_c(self, date_invalid): + def _add_dates_to_c(self, c, date_invalid): now = datetime.datetime.today() if date_invalid is None: date_invalid = now c.date_now = now @@ -44,12 +45,14 @@ class BerichtController: c.date_end_of_saison = datetime.datetime(now.year if now.month < 7 else now.year + 1, 7, 1) def view(self, id): - "Displays a report" + """Displays a report""" q = model.meta.Session.query(model.WrReport) + c = TemplateContext() c.wrreport = q.get(id) - if c.wrreport is None: abort(404) - self._add_dates_to_c(c.wrreport.date_invalid) - return render('bericht_view.html') + if c.wrreport is None: + abort(404) + self._add_dates_to_c(c, c.wrreport.date_invalid) + return render_genshi_template('bericht_view.html', c=c) #@restrict('POST') #@validate(schema=ChangeDateInvalidForm(), form='view') @@ -58,7 +61,7 @@ class BerichtController: wrreport_q = model.meta.Session.query(model.WrReport) wrreport = wrreport_q.get(id) if wrreport is None: abort(404) - self._add_dates_to_c(wrreport.date_invalid) + self._add_dates_to_c(c, wrreport.date_invalid) date = self.form_result['date_invalid'] if date == 'tomorrow': wrreport.date_invalid = c.date_tomorrow elif date == 'one_week': wrreport.date_invalid = c.date_one_week -- 2.39.5