diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index 53458da..f1261ef 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -180,6 +180,17 @@ def get_rapport_by_no(request,nodossier,date_inter):
results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'date_inter': date_inter}).first()
return results
+def get_rapport_by_no_id(request,no_id):
+ query = "SELECT * FROM dem_rdf WHERE no_id = :no_id;"
+ results = request.dbsession.execute(query, {'no_id': no_id}).first()
+ return results
+
+def get_rapport_rdf(request):
+ # les rapports deRDF
+ query = "SELECT * FROM dem_rdf;"
+ results = request.dbsession.execute(query, ).fetchall()
+ return results
+
def insert_rapport(request,nodossier,logged_in):
societe = nodossier[0:2]
nochantier = nodossier[3:]
diff --git a/mondumas/routes.py b/mondumas/routes.py
index a994332..db9e73d 100644
--- a/mondumas/routes.py
+++ b/mondumas/routes.py
@@ -19,8 +19,11 @@ def includeme(config):
config.add_route('dossier_selected', '/dossier_selected/{goto}/{date}/{nodossier}')
config.add_route('dossier_view', '/dossier_view/{nodossier}')
config.add_route('rdf_edit','/rdf_edit/{nodossier}/{date_inter}')
+ config.add_route('rdf_list','/rdf_list')
+ config.add_route('rdf_view','/rdf_view/{no_id}')
config.add_route('suivi_edit','/suivi_edit/{nodossier}/{nolig}')
config.add_route('upload_doc', '/upload_doc/{nodossier}')
+ config.add_route('upload_img', '/upload_img/{nodossier}')
# parametres
config.add_route('parametres', '/parametres')
config.add_route('connecter_a', '/connecter_a/{login}')
diff --git a/mondumas/templates/default/home.pt b/mondumas/templates/default/home.pt
index 9e5d434..80be4df 100644
--- a/mondumas/templates/default/home.pt
+++ b/mondumas/templates/default/home.pt
@@ -14,6 +14,11 @@
| Date Interv. | -Date Rapport | +No rapport | +Date interv. | +Date rapport | Chantier | No sinistre | Modif le |
|---|---|---|---|---|---|---|---|
| - - ${rapport.date_inter.strftime('%d-%m-%Y')} + ${rapport.no_id} | -${rapport.date_rapport.strftime('%d-%m-%Y')} | +${rapport.date_inter.strftime('%Y-%m-%d')} | +${rapport.date_rapport.strftime('%d-%m-%Y')} | ${rapport.C_QUALITE} ${rapport.C_NOM} | ${rapport.NOSIN} | diff --git a/mondumas/templates/dossier/rdf_edit.pt b/mondumas/templates/dossier/rdf_edit.pt index 3e5ef41..40b376e 100644 --- a/mondumas/templates/dossier/rdf_edit.pt +++ b/mondumas/templates/dossier/rdf_edit.pt @@ -54,7 +54,7 @@