From 7d81e0be7103ff4790d3ed6ebc8f8c56a58042de Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Fri, 11 Sep 2020 11:38:15 +0200
Subject: [PATCH] =?UTF-8?q?possibilit=C3=A9=20au=20manager=20de=20modifier?=
 =?UTF-8?q?=20date=5Finter=20et=20auteur=20du=20rdf?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mondumas/layout.py                     |  8 ++++++++
 mondumas/models/dossier.py             |  7 ++++---
 mondumas/templates/dossier/rdf_edit.pt | 22 +++++++++++++++++++++-
 mondumas/templates/dossier/rdf_view.pt |  2 +-
 mondumas/views/dossier.py              | 12 +++++++++++-
 5 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/mondumas/layout.py b/mondumas/layout.py
index 1b10d54..1c09146 100644
--- a/mondumas/layout.py
+++ b/mondumas/layout.py
@@ -33,6 +33,14 @@ class GlobalLayout(object):
     def to_percent(self, x):
         return to_percent(x)
 
+    def date2dmy(self, ddate):
+        if ddate:
+            # si date, convertir en dd-mm-yyyy
+            madate = ddate.strftime('%d-%m-%Y')
+        else:
+            madate = ''
+        return madate
+
     def isAnonymous(self):
         user = self.request.authenticated_userid
         return user is None
diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index 855a3ea..3c89d0b 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -267,7 +267,7 @@ def get_rdf_causes(request, code):
     results = request.dbsession.execute(query, {'code': code + '%'}).fetchall()           
     return results
 
-def update_rapport(request, nodossier, date_inter, new_values):
+def update_rapport(request, nodossier, dateinter, new_values):
     societe = nodossier[0:2]
     nochantier = int(nodossier[3:])
 
@@ -279,8 +279,9 @@ def update_rapport(request, nodossier, date_inter, new_values):
             s = "%s=:%s" % (param, param)
     new_values['societe'] = societe
     new_values['nochantier'] = nochantier
-    new_values['date_inter'] = date_inter
-    query = "UPDATE dem_rdf SET %s WHERE societe=:societe AND nochantier=:nochantier AND date_inter=:date_inter;" % s
+    new_values['dateinter'] = dateinter
+    
+    query = "UPDATE dem_rdf SET %s WHERE societe=:societe AND nochantier=:nochantier AND date_inter=:dateinter;" % s
     execute_query(request, query, new_values)
 
 def delete_rapport(request, no_id):
diff --git a/mondumas/templates/dossier/rdf_edit.pt b/mondumas/templates/dossier/rdf_edit.pt
index f1257cf..86f995c 100644
--- a/mondumas/templates/dossier/rdf_edit.pt
+++ b/mondumas/templates/dossier/rdf_edit.pt
@@ -312,10 +312,30 @@
                 </div>
 
         <div class="col-sm-6">
-            <p>
+            <p tal:condition="access < 8">
                 Date du rapport : ${rapport.modif_le.strftime('%d-%m-%Y')}<br />
                 Etabli par ${rapport.auteur_nom}
             </p>
+            <div tal:condition="access >= 8">
+                <div class="form-group">
+                    <label class="control-label" for="date_inter">Date d'intervention</label>
+                    <input class="form-control" type="text" id="date_inter" name="date_inter" value="${layout.date2dmy(rapport.date_inter)}" 
+                        placeholder="JJ/MM/AAAA"
+                        data-fv-notempty="true"
+                        data-fv-notempty-message="La Date d'intervention est obligatoire"
+                        data-fv-date="true"
+                        data-fv-date-format="DD/MM/YYYY"							
+                        data-fv-date-message="La Date d'intervention n'est pas valide (JJ/MM/AAAA)" />
+                </div>
+                <div class="form-group">
+                    <label class="control-label" for="auteur_code">Etabli par</label>
+                    <select class="form-control" id="auteur_code" name="auteur_code">
+                        <div tal:repeat="item users">
+                            <option value="${item.CD_UTI}" tal:attributes="selected rapport.auteur_code==item.CD_UTI and 'selected' or None">${item.NOM}</option>
+                        </div>
+                    </select>
+                </div>
+            </div>
         </div>
         <div class="col-sm-6">
             <label>Signature du client</label>
diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt
index 4d9b85d..3114d66 100644
--- a/mondumas/templates/dossier/rdf_view.pt
+++ b/mondumas/templates/dossier/rdf_view.pt
@@ -350,7 +350,7 @@
                     <a class="btn btn-primary" href="/rdf_edit/${nodossier}/${rapport.date_inter.strftime('%Y-%m-%d')}" 
                         tal:condition="date_facture=='' or access>=8">
                         <span class="glyphicon glyphicon-pencil"></span> Modifier</a>
-                    <button class="btn btn-danger" type="submit" name="form.delete" tal:condition="not rapport.signature_svg and date_relu==''">
+                    <button class="btn btn-danger" type="submit" name="form.delete" tal:condition="access>=8">
                         <span class="glyphicon glyphicon-remove"></span> Supprimer</button>
                     <button class="btn btn-success" type="submit" name="form.validate" tal:condition="access > 0 and date_relu==''">
                         <span class="glyphicon glyphicon-ok"></span> Valider</button>
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index f792160..e5784b3 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -438,6 +438,10 @@ def rdf_edit(request):
     elements_couvert = get_rdf_causes(request, 'C06')
     voisins = get_rdf_causes(request, 'C07')
     tierce_personnes = get_rdf_causes(request, 'C08')
+    # liste des users avec agenda
+    users = get_users_agenda(request, '')
+    # lire code accès du user
+    access = get_userAccess(request, logged_in) 
     
     if 'form.submitted' in request.params:
         if 'signature_svg' in request.params: 
@@ -449,6 +453,10 @@ def rdf_edit(request):
         for param, db_value in rapport.items():
             if param in request.params and request.params[param] != db_value:
                 new_values[param] = request.params[param]
+
+        if 'date_inter' in request.params:
+            ddate = datetime.strptime(request.params['date_inter'], '%d-%m-%Y')
+            new_values['date_inter'] = ddate.strftime("%Y-%m-%d")
         # case à cocher ?
         if 'sonde_capa' in request.params: 
             new_values['sonde_capa'] = 1
@@ -499,7 +507,7 @@ def rdf_edit(request):
         else:
             new_values['test_fumigenes'] = 0
         
-        if new_values:            
+        if new_values: 
             update_rapport(request, nodossier, date_inter, new_values)
             request.session.flash(u"Le dossier a été mis à jour avec succès.", 'success')
             return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
@@ -519,6 +527,8 @@ def rdf_edit(request):
         'elements_couvert': elements_couvert,
         'voisins':voisins,
         'tierce_personnes': tierce_personnes,
+        'users': users,
+        'access': access,
     }
 
 @view_config(route_name='rdf_list', renderer='../templates/dossier/rdf_list.pt', permission='view')