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 @@
-
+
Date du rapport : ${rapport.modif_le.strftime('%d-%m-%Y')}
Etabli par ${rapport.auteur_nom}
+
+
+
+
+
+
+
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 @@
Modifier
-