From 2ac5de7779519c68abdf98ce98eb68a204f581b6 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Wed, 26 Jul 2017 14:48:16 +0200
Subject: [PATCH] tuning docs_list.pt

---
 caotek_mesavoirs/models/default.py     |  9 +++--
 caotek_mesavoirs/templates/doc_list.pt | 47 ++++++++++++++++++--------
 caotek_mesavoirs/views/default.py      |  8 +++--
 3 files changed, 45 insertions(+), 19 deletions(-)

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 @@
             <span class="glyphicon glyphicon-plus"></span>&nbsp;
             Créér une nouvelle doc</a>
 		</p>
-		<table class="table table-condensed table-striped table-bordered">
-			<tr>
-				<th>Intitule</th>
-				<th>Thème</th>
-				<th>Dernière mise à jour</th>
-			</tr>
-			
-			<tr tal:repeat="ligne docs">
-				<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
-				<td>${ligne.theme}</td>
-				<td><span tal:content="ligne.modif_le.strftime('%d/%m/%Y %H:%M')" /></td>
-			</tr>
-			
-		</table>
+		<div class="col-md-4">
+			<table class="table table-condensed table-striped table-bordered">
+				<tr>
+					<th>FINANCE</th>
+				</tr>
+				
+				<tr tal:repeat="ligne docs_finance">
+					<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
+				</tr>
+			</table>
+		</div>
+		<div class="col-md-4">
+			<table class="table table-condensed table-striped table-bordered">
+				<tr>
+					<th>VOITURE</th>
+				</tr>
+				
+				<tr tal:repeat="ligne docs_voiture">
+					<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
+				</tr>
+			</table>
+		</div>
+		<div class="col-md-4">
+			<table class="table table-condensed table-striped table-bordered">
+				<tr>
+					<th class=text-center"">MAISON</th>
+				</tr>
+				
+				<tr tal:repeat="ligne docs_maison">
+					<td><a href="doc_view/${ligne.doc_id}">${ligne.intitule}</a></td>
+				</tr>
+			</table>
+		</div>
 	</div>
 
 	<br />
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')