gasthaus_list is rendered now.

git-svn-id: http://www.winterrodeln.org/svn/wradmin/trunk@2676 7aebc617-e5e2-0310-91dc-80fb5f6d2477

diff --git a/wradmin/__init__.py b/wradmin/__init__.py
index 225b39397946ebc7ac12ccc00d2f607797c13b45..ea3b097d5e996a03eb194631cf90361f170902e0 100644 (file)
--- a/wradmin/__init__.py
+++ b/wradmin/__init__.py
@@ -6,6 +6,7 @@ from sqlalchemy.engine import create_engine
 import wradmin.model
 from wradmin.genshi import render_genshi_template
 from wradmin.controllers.rodelbahn import RodelbahnController
+from wradmin.controllers.gasthaus import GasthausController
 
 
 app = Flask(__name__)
@@ -63,7 +64,20 @@ def bericht_list():
 
 @app.route("/gasthaus/list")
 def gasthaus_list():
-    pass
+    get_db()
+    return GasthausController().list()
+
+
+@app.route("/gasthaus/view/<int:id>")
+def gasthaus_view():
+    get_db()
+    return GasthausController().view(id)
+
+
+@app.route("/gasthaus/update")
+def gasthaus_update():
+    get_db()
+    return GasthausController().update()
 
 
 @app.route("/coordtool/index")

diff --git a/wradmin/controllers/gasthaus.py b/wradmin/controllers/gasthaus.py
index a769a9b179de348e655a82b8ef7f2fd79614f5c7..ec243046a1caeda3a55423d58101287ae7f0ef0f 100644 (file)
--- a/wradmin/controllers/gasthaus.py
+++ b/wradmin/controllers/gasthaus.py
@@ -1,30 +1,31 @@
 #!/usr/bin/python3.4
-import logging
-
-from pylons import request, response, session, url, tmpl_context as c
-from pylons.controllers.util import abort, redirect
-import webhelpers.paginate as paginate
-
-from wradmin.lib.base import BaseController, render
-import wradmin.model as model
+#from pylons import request, response, session, url, tmpl_context as c
+#from pylons.controllers.util import abort, redirect
+from flask import request
+import paginate
 import sqlalchemy as sa
-import formencode
-import re
 
 import wrpylib.wrmwmarkup
 import wrpylib.wrmwcache
 import wrpylib.mwmarkup
 
-log = logging.getLogger(__name__)
+import wradmin.model as model
+from wradmin.genshi import render_genshi_template
+
+
+class TemplateContext:
+    pass
+
 
-class GasthausController(BaseController):
+class GasthausController:
 
     def list(self):
-        "Lists all inns"
+        """Lists all inns"""
         q = model.meta.Session.query(model.WrInnCache)
         q = q.order_by(model.WrInnCache.page_title)
-        c.paginator = paginate.Page(q, page=int(request.params.get('page', 1)), items_per_page = 25)
-        return render('gasthaus_list.html')
+        c = TemplateContext()
+        c.paginator = paginate.Page(q.all(), page=int(request.args.get('page', 1)), items_per_page = 25)
+        return render_genshi_template('gasthaus_list.html', c=c)
     
     
     def view(self, id):

diff --git a/wradmin/genshi.py b/wradmin/genshi.py
index bf318f7af6bb1fbdf7e86b9b94b12d8234019cf0..ba62133e1d00dbde997c171897f7ce5818c4b2f5 100644 (file)
--- a/wradmin/genshi.py
+++ b/wradmin/genshi.py
@@ -31,6 +31,10 @@ class PylonsHelper:
         """Takes a bool value and creates a German representation"""
         return wrpylib.wrvalidators.opt_bool_german_to_str(value)
 
+    def tristate_tuple(self, yes, no):
+        """Takes a German representation of a tristate value"""
+        return {(True, True): 'Teilweise', (True, False): 'Ja', (False, True): 'Nein'}.get((yes, no), None)
+
     def tristate_float(self, value):
         """Takes a German representation of a tristate value"""
         return wrpylib.wrvalidators.opt_tristate_german_to_str(value)

diff --git a/wradmin/templates/gasthaus_list.html b/wradmin/templates/gasthaus_list.html
index ff4259dccdbf7f13324c4b45da947dcd2c25bae3..6b4dcea3c69a29b757f11ebfdbe771c3f860a794 100644 (file)
--- a/wradmin/templates/gasthaus_list.html
+++ b/wradmin/templates/gasthaus_list.html
@@ -18,7 +18,7 @@
 <p><a href="${h.url(controller='gasthaus', action='update')}" class="button">Gasthausboxen auslesen und DB aktualisieren</a></p>
 
 
-<p>${c.paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last', controller='gasthaus', action='list')}</p>
+<p>${HTML(c.paginator.pager('$link_first $link_previous $first_item bis $last_item von $item_count $link_next $link_last', url=h.url(controller='gasthaus', action='list') + '?page=$page'))}</p>
 
 <table>
     <tr>
@@ -49,7 +49,7 @@
     </tr>
 </table>
 
-<p>${c.paginator.pager('~2~', controller='gasthaus', action='list')}</p>
+<p>${HTML(c.paginator.pager('~2~', url=h.url(controller='gasthaus', action='list') + '?page=$page'))}</p>
 
 </body>
 </html>