From cdff87d001dad5c1090e7dd16b8e98918cf159db Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Fri, 13 Mar 2020 14:09:34 +0100
Subject: [PATCH] saisie suivi chantier

---
 mondumas/templates/dossier/dossier_view.pt      | 6 +++---
 mondumas/templates/dossier/rdf_bill.pt          | 2 +-
 mondumas/templates/dossier/rdf_edit.pt          | 2 +-
 mondumas/templates/dossier/rdf_view.pt          | 2 +-
 mondumas/templates/dossier/suivi_edit.pt        | 4 ++--
 mondumas/templates/parametres/rdf_cause_edit.pt | 4 ++--
 mondumas/views/dossier.py                       | 6 +-----
 7 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index 923336d..11c1e72 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -152,7 +152,8 @@
 				</tr>
 				<tr tal:repeat="detail details">
 					<td>
-						${detail.DATE.strftime('%d-%m-%Y')}
+						<a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
+							${detail.DATE.strftime('%d-%m-%Y')}</a>
 					</td>
 					<td>
 						<span tal:condition="detail.rdv_debut==None"></span>
@@ -168,8 +169,7 @@
 						<b>${detail.COMMENT}</b>
 					</td>
 					<td tal:condition="not detail.COMMENT.startswith('!!')">
-						<a href="${request.route_url('suivi_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
-							${detail.COMMENT}</a>
+						${detail.COMMENT}
 					</td>
 					<td class="text-right">${layout.to_euroz(detail.montant)}</td>
 					<td  class="text-center">${detail.REF_LET}</td>
diff --git a/mondumas/templates/dossier/rdf_bill.pt b/mondumas/templates/dossier/rdf_bill.pt
index 2e52d8c..c3ea691 100644
--- a/mondumas/templates/dossier/rdf_bill.pt
+++ b/mondumas/templates/dossier/rdf_bill.pt
@@ -42,7 +42,7 @@
         </tr>
     </table>
     <br />
-    <form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post"
+    <form id="rdf_bill-form" class="form-horizontal" action="${url}" method="post"
             data-fv-framework="bootstrap"
             data-fv-icon-valid="glyphicon glyphicon-ok"
             data-fv-icon-invalid="glyphicon glyphicon-remove"
diff --git a/mondumas/templates/dossier/rdf_edit.pt b/mondumas/templates/dossier/rdf_edit.pt
index c5e92e7..79d150f 100644
--- a/mondumas/templates/dossier/rdf_edit.pt
+++ b/mondumas/templates/dossier/rdf_edit.pt
@@ -28,7 +28,7 @@
     </div> <!-- row -->
     
     <div class="row">
-        <form id="rdv_edit-form" action="${url}" method="post"
+        <form id="rdf_edit-form" action="${url}" method="post"
             data-fv-framework="bootstrap"
             data-fv-icon-valid="glyphicon glyphicon-ok"
             data-fv-icon-invalid="glyphicon glyphicon-remove"
diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt
index 08d9164..fcceb23 100644
--- a/mondumas/templates/dossier/rdf_view.pt
+++ b/mondumas/templates/dossier/rdf_view.pt
@@ -54,7 +54,7 @@
         </tr>
     </table>
     
-    <form id="rdv_edit-form" action="${url}" method="post"
+    <form id="rdf_view-form" action="${url}" method="post"
             data-fv-framework="bootstrap"
             data-fv-icon-valid="glyphicon glyphicon-ok"
             data-fv-icon-invalid="glyphicon glyphicon-remove"
diff --git a/mondumas/templates/dossier/suivi_edit.pt b/mondumas/templates/dossier/suivi_edit.pt
index e6a8023..ac28b35 100644
--- a/mondumas/templates/dossier/suivi_edit.pt
+++ b/mondumas/templates/dossier/suivi_edit.pt
@@ -4,7 +4,7 @@
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
 	<br />
     <div class="row">
-		<form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post"
+		<form id="suiv_edit-form" class="form-horizontal" action="${url}" method="post"
 			data-fv-framework="bootstrap"
 			data-fv-icon-valid="glyphicon glyphicon-ok"
 			data-fv-icon-invalid="glyphicon glyphicon-remove"
@@ -56,7 +56,7 @@
 <div metal:fill-slot="additional_scripts">
 	<script>
 		$(document).ready(function() {
-			$('#rdv_edit-form').formValidation();
+			$('#suiv_edit-form').formValidation();
 			$('form input').on('keypress', function(e) {
 				return e.which !== 13;
 			});
diff --git a/mondumas/templates/parametres/rdf_cause_edit.pt b/mondumas/templates/parametres/rdf_cause_edit.pt
index 45331c3..7dbf1d6 100644
--- a/mondumas/templates/parametres/rdf_cause_edit.pt
+++ b/mondumas/templates/parametres/rdf_cause_edit.pt
@@ -4,7 +4,7 @@
     <div tal:condition="message" tal:content="message" class="alert alert-danger" />
 	<br />
     <div class="row">
-		<form id="rdv_edit-form" class="form-horizontal" action="${url}" method="post"
+		<form id="rdf_cause-form" class="form-horizontal" action="${url}" method="post"
 			data-fv-framework="bootstrap"
 			data-fv-icon-valid="glyphicon glyphicon-ok"
 			data-fv-icon-invalid="glyphicon glyphicon-remove"
@@ -61,7 +61,7 @@
 
 <script>
 $(document).ready(function() {
-	$('#rdv_edit-form').formValidation();
+	$('#rdf_cause-form').formValidation();
 	$('form input').on('keypress', function(e) {
 		return e.which !== 13;
 	});
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 67b3c80..02f685f 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -82,12 +82,8 @@ def dossier_lookup(request):
         message = "Chantier non trouvé : %s" % name
     # construire la liste 
     for item in chantiers:
-        if item.humidite != 0:
-            status = 'Humidité'
-        else:
-            status = item.status
         d = ('%s-%s' % (societe, item.numero),item.date.strftime('%d-%m-%Y'), item.nomcli, item.chantier, to_euro(item.montant), 
-             item.nosin, status, item.usermaj)
+             item.nosin, item.status, item.usermaj)
         liste.append(d)
 
     if len(name) == 0 :