From f1270f07883dc07f0be74f77e84aeb8916ffa9d3 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Wed, 5 Dec 2018 07:56:43 +0100
Subject: [PATCH] =?UTF-8?q?derni=C3=A8re=20retouche=20avant=20d=C3=A9mo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mondumas/templates/agenda/agenda.pt        |  5 +-
 mondumas/templates/dossier/dossier_view.pt | 62 ++++++++++------------
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt
index 9ac7f0c..a531145 100644
--- a/mondumas/templates/agenda/agenda.pt
+++ b/mondumas/templates/agenda/agenda.pt
@@ -41,7 +41,7 @@
 	</p>
 	<br />
 	<!-- Modal : Confirmation CREATION  -->
-	<div class="modal fade" id="confirmCreate" role="dialog" aria-labelledby="confirmCreateLabel" aria-hidden="true" tal:condition="mem_nodossier != 'Aucun'">
+	<div class="modal fade" id="confirmCreate" role="dialog" aria-labelledby="confirmCreateLabel" aria-hidden="true">
 		<div class="modal-dialog">
 			<div class="modal-content">
 			<div class="modal-header">
@@ -80,7 +80,8 @@
 
 					<div class="form-group">
 						<div class="col-xs-5 col-xs-offset-4">
-							<button type="submit" class="btn btn-danger" name="form.submitted">Créer</button>
+							<button type="submit" class="btn btn-danger" name="form.submitted"
+								 tal:condition="mem_nodossier != 'Aucun'">Créer</button>
 							<button type="button" class="btn btn-default" data-dismiss="modal">Annuler</button>
 						</div>
 					</div>
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index afeacb6..9f8b068 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -13,6 +13,8 @@
                         ${dossier.C_ADR}<br />
                         <span tal:condition="dossier.C_ADR2">${dossier.C_ADR2}<br /></span>
                         ${dossier.C_CP} ${dossier.C_VILLE}<br />
+                        <span tal:condition="len(dossier.C_EMAIL)">${dossier.C_EMAIL}</span>
+                        <span tal:condition="len(dossier.C_EMAIL)==0" class="text-danger"><b>!!! Email vide !!!</b></span>
                     </td>
                 </tr>
                 <tr>
@@ -54,7 +56,7 @@
             </table>
         </div>
 
-        <!-- Mon compte -->
+        <!-- CLIENT -->
         <div class="col-md-6 ${bg_color}">
             <table class="table table-condensed ">
                 <tr>
@@ -83,6 +85,26 @@
         <h4>Statut : ${dossier.STATUS}</h4>
     </div>  <!-- row -->
 
+    <!--  PANEL DOSSIERS SIMILAIRES  -->
+    <table class="table table-bordered table-condensed" tal:condition="similaires">
+        <tr>
+            <th>Numéro</th>
+            <th>Date</th>
+            <th>Client</th>
+            <th class="text-right">Montant</th>
+            <th class="text-center">Statut</th>
+        </tr>
+        <tr tal:repeat="detail similaires">
+            <td>
+                <a href="/dossier_view/${detail.nodossier}">${detail.nodossier}</a>
+            </td>
+            <td>${detail.DATE.strftime('%d-%m-%Y')}</td>
+            <td class="bg-${detail.nodossier[0:2]}">${detail.NOMCLI}</td>
+            <td class="text-right">${layout.to_euro(detail.MTTRAV)}</td>
+            <td class="text-center">${detail.STATUS}</td>
+        </tr>
+    </table>
+    
     <div class="panel-group" id="accordion">
         <!--  PANEL SUIVI  -->
         <div class="panel panel-default">
@@ -129,7 +151,7 @@
             </div>
         </div>
         <!--  PANEL DOCUMENTS  -->
-        <div class="panel panel-default">
+        <div class="panel panel-default" tal:condition="documents">
             <div class="panel-heading">
                 <h4 class="panel-title">
                     <a data-toggle="collapse" data-parent="#accordion" href="#panel-documents">
@@ -138,7 +160,7 @@
             </div>
             <div id="panel-documents" class="panel-collapse collapse">
                 <div class="panel-body">
-                    <table class="table table-bordered">
+                    <table class="table table-bordered table-condensed">
                         <tr>
                             <th>Numéro</th>
                             <th>Date</th>
@@ -159,39 +181,9 @@
                 </div>
             </div>
         </div>
-        <!--  PANEL DOSSIERS SIMILAIRES  -->
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <h4 class="panel-title">
-                    <a data-toggle="collapse" data-parent="#accordion" href="#panel-similaires">
-                    <span class="glyphicon glyphicon-plus"></span>&nbsp;DOSSIERS SIMILAIRES</a>
-                </h4>
-            </div>
-            <div id="panel-similaires" class="panel-collapse collapse">
-                <div class="panel-body">
-                    <table class="table table-bordered">
-                        <tr>
-                            <th>Numéro</th>
-                            <th>Date</th>
-                            <th>Client</th>
-                            <th class="text-right">Montant</th>
-                            <th class="text-center">Statut</th>
-                        </tr>
-                        <tr tal:repeat="detail similaires">
-                            <td>
-                                <a href="/dossier_view/${detail.nodossier}">${detail.nodossier}</a>
-                            </td>
-                            <td>${detail.DATE.strftime('%d-%m-%Y')}</td>
-                            <td>${detail.NOMCLI}</td>
-                            <td class="text-right">${layout.to_euro(detail.MTTRAV)}</td>
-                            <td class="text-center">${detail.STATUS}</td>
-                        </tr>
-                    </table>
-                </div>
-            </div>
-        </div>
+
         <!--  PANEL DOCS ATTACHES  -->
-        <div class="panel panel-default">
+        <div class="panel panel-default"  tal:condition="docs_attaches">
             <div class="panel-heading">
                 <h4 class="panel-title">
                     <a data-toggle="collapse" data-parent="#accordion" href="#panel-attaches">