diff --git a/mondumas/__init__.py b/mondumas/__init__.py index 683c9c4..a27fef2 100644 --- a/mondumas/__init__.py +++ b/mondumas/__init__.py @@ -13,7 +13,7 @@ def main(global_config, **settings): """ # declarations session_factory = SignedCookieSessionFactory('Ty6sIUe9') - authn_policy = AuthTktAuthenticationPolicy('Ty6sIUe8', callback=groupfinder, hashalg='sha512') + authn_policy = AuthTktAuthenticationPolicy('Ty6sIUe8', callback=groupfinder, hashalg='sha512', timeout=36000) authz_policy = ACLAuthorizationPolicy() mailer_factory_from_settings(settings) diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index db73403..ebdd795 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -153,10 +153,13 @@ def get_photos(request, nochantier, norapport): query = "SELECT * FROM dossier_attaches WHERE nomrep = 'DOCS_ATTACHES' AND societe = 'PL' AND nochantier = :nochantier AND nodossier = :norapport ORDER BY cree_le;" results = request.dbsession.execute(query, {'nochantier': nochantier, 'norapport': norapport}).fetchall() - return results - +def delete_photos(request, nochantier, norapport, nomfic): + query = "DELETE FROM dossier_attaches WHERE nomrep='DOCS_ATTACHES' AND societe='PL' AND nochantier=:nochantier AND nodossier=:norapport AND nomfichier=:nomfic;" + execute_query(request, query, {'nochantier': nochantier, 'norapport': norapport, 'nomfic': nomfic}) + + def update_dossier(request, nodossier, new_values): societe = nodossier[0:2] nochantier = int(nodossier[3:]) @@ -238,5 +241,9 @@ def update_rapport(request, nodossier, date_inter, new_values): def delete_rapport(request, no_id): - query = "DELETE FROM dem_rdf WHERE no_id = :no_id" + query = "DELETE FROM dem_rdf WHERE no_id = :no_id" + execute_query(request, query, {'no_id': no_id}) + +def validate_rapport(request, no_id): + query = "UPDATE dem_rdf SET date_relu=CURRENT_DATE WHERE no_id = :no_id" execute_query(request, query, {'no_id': no_id}) diff --git a/mondumas/routes.py b/mondumas/routes.py index ed79561..b718cdb 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -19,6 +19,7 @@ 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_imgdel','/rdf_imgdel/{nochantier}/{norapport}/{nomfic}') config.add_route('rdf_list','/rdf_list') config.add_route('rdf_rapport','/rdf_rapport/{no_id}') config.add_route('rdf_view','/rdf_view/{no_id}') diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt index 07de919..5caeb03 100644 --- a/mondumas/templates/dossier/dossier_view.pt +++ b/mondumas/templates/dossier/dossier_view.pt @@ -193,8 +193,8 @@ ${rapport.no_id} - ${rapport.date_inter.strftime('%Y-%m-%d')} - ${rapport.date_rapport.strftime('%d-%m-%Y')} + ${rapport.date_inter.strftime('%d-%m-%Y')} + ${rapport.date_rapport.strftime('%d-%m-%Y')} ${rapport.C_QUALITE} ${rapport.C_NOM} ${rapport.NOSIN} diff --git a/mondumas/templates/dossier/rdf_list.pt b/mondumas/templates/dossier/rdf_list.pt index a0bd990..57369c2 100644 --- a/mondumas/templates/dossier/rdf_list.pt +++ b/mondumas/templates/dossier/rdf_list.pt @@ -9,14 +9,14 @@ - - - + + + + -
DossierDate interv.Date rapportRapportIntervenuValidéGénéré Chantier Client No sinistre AuteurRapport
@@ -40,10 +40,11 @@ { "targets": 0, "render": function (data, type, row, meta) { // ajouter un link vers le formulaire - return '' + data + ''; + return '' + data + ''; }, }, - ] + ], + order: [[ 0, "desc" ]], }); }); diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt index ad66085..b01b066 100644 --- a/mondumas/templates/dossier/rdf_view.pt +++ b/mondumas/templates/dossier/rdf_view.pt @@ -289,8 +289,8 @@

- -  Ajouter une photo + +  Gérer les photos


@@ -308,7 +308,7 @@ -
+   ${date_rapport}

@@ -316,8 +316,11 @@
${rapport.auteur_nom}

- -
Jean-Marc PENEL +
+ +
Jean-Marc PENEL +
le ${date_relu} +
@@ -334,12 +337,17 @@ Retour Dossier Modifier - - - Aperçu PDF - + +
+
+ + Aperçu PDF + +
diff --git a/mondumas/templates/dossier/upload_img.pt b/mondumas/templates/dossier/upload_img.pt index 6886cc8..4ad0e3d 100644 --- a/mondumas/templates/dossier/upload_img.pt +++ b/mondumas/templates/dossier/upload_img.pt @@ -1,38 +1,59 @@
-
- -
- -
- - +
+
+

+  AJOUTER UNE PHOTO +

-
- - Retour au rapport - +
+
+ + +
+ + +
+
+ + Retour au rapport + +
+ +
+
+
    +
  • Seuls les documents au format PNG, JPG ou JPEG seront acceptés.
    • +
  • La taille de chaque document ne doit pas dépasser 2 Mo.
    • +
+
- -
-
-
    -
  • Seuls les documents au format PNG, JPG ou JPEG seront acceptés.
    • -
  • La taille de chaque document ne doit pas dépasser 2 Mo.
    • -
-
+ + +
+

+  PHOTOS DEJA TELECHARGES +

+
+
+
+ +
+
+
-

Photos déjà téléchargées

-

- -