From 02286f128d3b874c02aa68356b1bd73ef43bc5d0 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Tue, 5 Feb 2019 07:53:12 +0100
Subject: [PATCH] afficher suivi_par dans les dossiers similaires

---
 mondumas/static/css/style.less             |  7 +++++
 mondumas/templates/dossier/dossier_view.pt | 31 +++++++++++-----------
 mondumas/templates/dossier/upload_doc.pt   | 13 ++++++---
 mondumas/views/dossier.py                  |  6 +++--
 4 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less
index 874cfce..404e76b 100644
--- a/mondumas/static/css/style.less
+++ b/mondumas/static/css/style.less
@@ -107,6 +107,13 @@
     }
 }
 
+.gly-spin {
+  -webkit-animation: spin 2s infinite linear;
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
+}
+
 #bg {
   position: fixed; 
   top: 0; 
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index 44b3ca4..9b0cfe9 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -100,7 +100,7 @@
         </tr>
         <tr tal:repeat="detail similaires">
             <td>
-                <a href="/dossier_view/${detail.nodossier}">${detail.nodossier}</a>
+                <a href="/dossier_view/${detail.nodossier}">${detail.nodossier}</a> ${detail.suivi_par}
             </td>
             <td>${detail.DATE.strftime('%d-%m-%Y')}</td>
             <td class="bg-${detail.nodossier[0:2]}">${detail.NOMCLI}</td>
@@ -129,34 +129,35 @@
                     <table class="table table-bordered table-condensed">
                         <tr>
                             <th>Date</th>
+                            <th>Rendez-vous</th>
+                            <th>Avec</th>
                             <th>Action - commentaire</th>
                             <th class="text-right">Montant</th>
-                            <th>Rendez-vous</th>
                             <th>Réf. lettre</th>
                             <th class="text-center">Par</th>
                         </tr>
                         <tr tal:repeat="detail details">
-                            <td tal:condition="detail.DATEVI==None">
-                                <a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
-                                    ${detail.DATE.strftime('%d-%m-%Y')}</a>
+                            <td>
+								${detail.DATE.strftime('%d-%m-%Y')}
                             </td>
-                            <td tal:condition="detail.DATEVI!=None">
-                                <a href="${request.route_url('rdv_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
-                                    ${detail.DATE.strftime('%d-%m-%Y')}</a>
+                            <td>
+                                <span tal:condition="detail.rdv_debut==None"></span>
+                                <span tal:condition="detail.rdv_debut!=None">
+									<a href="${request.route_url('rdv_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
+										${detail.rdv_debut.strftime('%d-%m-%Y %H:%M')}</a> 
+                                </span>
                             </td>
+                            <td class="text-center">
+								<span tal:condition="detail.rdv_debut!=None">${detail.LISTE}</span>
+							</td>
                             <td tal:condition="detail.COMMENT.startswith('!!')" class="text-danger">
                                 <b>${detail.COMMENT}</b>
                             </td>
                             <td tal:condition="not detail.COMMENT.startswith('!!')">
-                                ${detail.COMMENT}
+                                <a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
+                                    ${detail.COMMENT}</a>
 							</td>
                             <td class="text-right">${layout.to_euroz(detail.montant)}</td>
-                            <td>
-                                <span tal:condition="detail.rdv_debut==None"></span>
-                                <span tal:condition="detail.rdv_debut!=None">
-                                        ${detail.rdv_debut.strftime('%d-%m-%Y %H:%M')} avec ${detail.LISTE}
-                                </span>
-                            </td>
                             <td  class="text-center">${detail.REF_LET}</td>
                             <td  class="text-center">${detail.USERMAJ}</td>
                         </tr>
diff --git a/mondumas/templates/dossier/upload_doc.pt b/mondumas/templates/dossier/upload_doc.pt
index 70ef7c0..4b8c781 100644
--- a/mondumas/templates/dossier/upload_doc.pt
+++ b/mondumas/templates/dossier/upload_doc.pt
@@ -10,14 +10,14 @@
 		data-fv-icon-validating="glyphicon glyphicon-refresh">
 
 		<div class="form-group">
-			<label for="uploadfile">Séléctionner un fichier</label>
+			<label for="uploadfile">Veuillez séléctionner un fichier</label>
 			<input id="uploadfile" name="filename" type="file" value="" required  />
 		</div>
 		<div class="form-group">
 			<a class="btn btn-default" href="${request.route_url('dossier_view', nodossier=nodossier)}">
 				<span class="glyphicon glyphicon-arrow-left"></span> Retiur au dossier</a>
-			<button  class="btn btn-primary" type="submit" name="form.submitted">
-				<span class="glyphicon glyphicon-cloud-upload"></span> Télécharger</button>
+			<button id="uploadButton" class="btn btn-primary" type="submit" name="form.submitted">
+				<i class="glyphicon glyphicon-refresh"></i> Télécharger</button>
 		</div>
 	</form>
 	<ul>
@@ -43,5 +43,12 @@
 		</div>
 	</ul>
 
+	<script type="text/javascript">
+	$('#uploadButton').on('click', function(){
+		$('i.gly-spin').removeClass('gly-spin');	
+		$('i').addClass('gly-spin');
+	});
+	</script>
+
 </div>
 </metal:block>
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index a6b3cb6..c6502d2 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -269,8 +269,10 @@ def upload_doc(request):
     if 'form.submitted' in request.params:
         # récupère le fichier lui-même
         input_file = request.POST['filename'].file
-        input_name = request.POST['filename'].filename  # récupère son nom
-        input_ext = input_name.split('.')[-1]          # récupère son extension
+        # récupère son nom
+        input_name = request.POST['filename'].filename  
+        # récupère son extension
+        input_ext = input_name.split('.')[-1]          
 
         # controler l'extension
         ext_allowed = ['jpeg','jpg','png','pdf']