From 28fc2570b7acfb780c682c1afd0e58c4d63c201e Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Mon, 22 Jul 2019 16:20:16 +0200
Subject: [PATCH] reorganize home menu

---
 mondumas/routes.py                          |  1 +
 mondumas/templates/default/home.pt          | 22 ++++++++++++-----
 mondumas/templates/parametres/parametres.pt |  8 +++----
 mondumas/views/default.py                   |  3 +++
 mondumas/views/dossier.py                   | 26 +++++++++++++++++++++
 5 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/mondumas/routes.py b/mondumas/routes.py
index 2e0ae12..3aae696 100644
--- a/mondumas/routes.py
+++ b/mondumas/routes.py
@@ -13,6 +13,7 @@ def includeme(config):
     config.add_route('redefinir_mdp', '/redefinir_mdp/{lien}')
     config.add_route('init_mdp', '/init_mdp/{user}/{lien}')
     # dossier
+    config.add_route('demandes','/demandes')
     config.add_route('devis_view', '/devis_view/{nodossier}')
     config.add_route('dossier_edit', '/dossier_edit/{nodossier}')
     config.add_route('dossier_lookup', '/dossier_lookup')
diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt
index 3428be6..6db18f0 100644
--- a/mondumas/templates/default/home.pt
+++ b/mondumas/templates/default/home.pt
@@ -3,6 +3,7 @@
 
 <div class="container-fluid text-center">
 	<br />
+	<!--  row 1 -->
 	<div class="row">
 		<div class="col-sm-3">
 			<a href="${request.application_url}/agenda/today">
@@ -14,17 +15,26 @@
 				<span class="glyphicon glyphicon-calendar logo-small"></span><br />
 				<h4>PLANNING</h4></a>				
 		</div>
-		<div class="col-sm-3">
-			<a href="${request.application_url}/rdf_list">
-				<span class="glyphicon glyphicon-tint logo-small"></span>
-			<h4>RAPPORTS RDF</h4></a>
-		</div>
 		<div class="col-sm-3">
 			<a href="${request.application_url}/dossier_lookup">
 				<span class="glyphicon glyphicon-search logo-small"></span>
 			<h4>RECH. DOSSIER</h4></a>
 		</div>
-	</div> <!--  row 1 -->
+	</div> 
+	<br />
+	<!--  row 2 -->
+	<div class="row">
+		<div class="col-sm-3">
+			<a href="${request.application_url}/rdf_list">
+				<span class="glyphicon glyphicon-tint logo-success"></span>
+			<h4>RAPPORTS RDF</h4></a>
+		</div>
+		<div class="col-sm-3" tal:condition="logged_in=='CAO'">
+			<a href="${request.application_url}/demandes">
+				<span class="glyphicon glyphicon-download-alt logo-warning"></span>
+			<h4>GENERER DOSSIERS</h4></a>
+		</div>
+	</div>
 	<br />
 	<br />
 	<br />
diff --git a/mondumas/templates/parametres/parametres.pt b/mondumas/templates/parametres/parametres.pt
index 08d6f30..0a28279 100644
--- a/mondumas/templates/parametres/parametres.pt
+++ b/mondumas/templates/parametres/parametres.pt
@@ -14,14 +14,14 @@
 		</div>
 		<br />
 		<div class="row text-center">
-			<div class="col-sm-3">
-				<a href="${request.application_url}/users_ua"><span class="glyphicon glyphicon-log-in logo-primary"></span></a>
-				<h4>CONNEXIONS</h4>
-			</div>
 			<div class="col-sm-3">
 				<a href="${request.application_url}/dashboard"><span class="glyphicon glyphicon-dashboard logo-primary"></span></a>
 				<h4>TABLEAU de BORD</h4>
 			</div>
+			<div class="col-sm-3">
+				<a href="${request.application_url}/users_ua"><span class="glyphicon glyphicon-log-in logo-primary"></span></a>
+				<h4>CONNEXIONS</h4>
+			</div>
 			<div class="col-sm-3">
 				<a href="${request.application_url}/orphans_de/PE"><span class="glyphicon glyphicon-wrench logo-primary"></span></a>
 				<h4>DEVIS ORPHELINS</h4>
diff --git a/mondumas/views/default.py b/mondumas/views/default.py
index 3c8c2c2..c409e98 100644
--- a/mondumas/views/default.py
+++ b/mondumas/views/default.py
@@ -70,9 +70,12 @@ def to_percent(x):
 
 @view_config(route_name='home', renderer='../templates/default/home.pt', permission='view')
 def home(request):
+    logged_in = request.authenticated_userid.upper()
+    
     return {
         'page_title': 'Bienvenue',
         'project': 'mondumas',
+        'logged_in': logged_in,
     }
 
 @view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt')
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 9f2ab78..16b8550 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -708,3 +708,29 @@ def rdf_bill(request):
         'articles': articles,
         'article' : article,
     }
+
+@view_config(route_name='demandes', renderer='../templates/dossier/demandes.pt', permission='view')
+def rdf_list(request):
+    # lire les rapports de RDF 
+    items = get_rapport_rdf(request)
+
+    # construire la liste 
+    liste=[]
+    for item in items:           
+        if item.date_relu :
+            date_relu = item.date_relu.strftime('%d-%m-%Y')
+        else:
+            date_relu = ''
+        if item.date_rapport :
+            date_rapport = item.date_rapport.strftime('%d-%m-%Y')
+        else:
+            date_rapport = ''
+                       
+        d = (item.no_id, item.date_inter.strftime('%d-%m-%Y'), date_relu, date_rapport, '%s - %s %s' % (item.nochantier, item.C_QUALITE, item.C_NOM), item.NOMCLI, item.NOSIN, 
+             item.auteur_code)
+        liste.append(d)
+
+    return {
+        'page_title': u'Liste des rapports de RDF',
+        'dt_data': json.dumps(liste),
+    }