diff --git a/caotek_mesavoirs/models/default.py b/caotek_mesavoirs/models/default.py index b84552c..41b9110 100644 --- a/caotek_mesavoirs/models/default.py +++ b/caotek_mesavoirs/models/default.py @@ -22,14 +22,17 @@ def get_docs(request, doc_id): if doc_id == 0: query = "SELECT * FROM docs ORDER BY theme, intitule;" results = request.dbsession.execute(query).fetchall() - elif doc_id == -1: - query = "SELECT * FROM docs where theme <> 'INTERNE' ORDER BY theme, intitule;" - results = request.dbsession.execute(query).fetchall() else: query = "SELECT * FROM docs where doc_id = :doc_id;" results = request.dbsession.execute(query, {'doc_id': doc_id}).first() return results +def get_docs_bytheme(request, theme): + """Lire les doc""" + query = "SELECT * FROM docs WHERE theme=:theme ORDER BY intitule;" + results = request.dbsession.execute(query, {'theme': theme}).fetchall() + return results + def update_doc(request, doc_id, intitule, texte, theme): """créér ou modifier le doc""" if doc_id == '0': diff --git a/caotek_mesavoirs/templates/doc_list.pt b/caotek_mesavoirs/templates/doc_list.pt index bc39902..626c2d0 100644 --- a/caotek_mesavoirs/templates/doc_list.pt +++ b/caotek_mesavoirs/templates/doc_list.pt @@ -7,20 +7,39 @@   Créér une nouvelle doc

- - - - - - - - - - - - - -
IntituleThèmeDernière mise à jour
${ligne.intitule}${ligne.theme}
+
+ + + + + + + + +
FINANCE
${ligne.intitule}
+
+
+ + + + + + + + +
VOITURE
${ligne.intitule}
+
+
+ + + + + + + + +
MAISON
${ligne.intitule}
+

diff --git a/caotek_mesavoirs/views/default.py b/caotek_mesavoirs/views/default.py index 3182e75..35693f9 100644 --- a/caotek_mesavoirs/views/default.py +++ b/caotek_mesavoirs/views/default.py @@ -97,11 +97,15 @@ def home(request): def doc_list(request): # lire toutes les docs - docs = get_docs(request, 0) + docs_finance = get_docs_bytheme(request, 'FINANCE') + docs_maison = get_docs_bytheme(request, 'MAISON') + docs_voiture = get_docs_bytheme(request, 'VOITURE') return { 'page_title': u"Documents", - 'docs': docs, + 'docs_finance': docs_finance, + 'docs_maison': docs_maison, + 'docs_voiture': docs_voiture, } @view_config(route_name='doc_edit', renderer='../templates/doc_edit.pt', permission='view')