From 049f06604a9da9bd138a10220d6baf08be4016bc Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Fri, 20 Aug 2021 15:40:00 +0200 Subject: [PATCH] test dessin_edit --- mondumas/models/dossier.py | 35 ++++++---- mondumas/routes.py | 3 +- mondumas/templates/dossier/croquis_edit.pt | 28 -------- mondumas/templates/dossier/dessin_edit.pt | 60 ++++++++++++++++ mondumas/templates/dossier/dossier_view.pt | 58 +++------------- mondumas/templates/dossier/note_edit.pt | 17 +++-- mondumas/views/dossier.py | 79 ++++++++++++++++------ 7 files changed, 157 insertions(+), 123 deletions(-) delete mode 100644 mondumas/templates/dossier/croquis_edit.pt create mode 100644 mondumas/templates/dossier/dessin_edit.pt diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py index 445ffa0..c083c19 100644 --- a/mondumas/models/dossier.py +++ b/mondumas/models/dossier.py @@ -366,20 +366,13 @@ def get_factures_en_att(request, societe): results = request.dbsession.execute(query, {'societe': societe}).fetchall() return results -def insert_dem_note(request, nodossier, type_note, logged_in): - societe = nodossier[0:2] - nochantier = int(nodossier[3:]) - # une note ou croquis - query = "INSERT INTO dem_notes (societe, nochantier, type_note, usermaj) VALUES (:societe, :nochantier, :type_note, :logged_in);" - execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'type_note': type_note, 'logged_in': logged_in}) - -def get_dem_notes(request, nodossier, noligne, type): +def get_dem_notes(request, nodossier, noligne): societe = nodossier[0:2] nochantier = int(nodossier[3:]) if noligne == '0': - query = "SELECT societe, nochantier, noligne, type_note, libelle FROM dem_notes WHERE societe = :societe AND nochantier = :nochantier AND type_note=:type ORDER BY libelle;" - results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne, 'type': type}).fetchall() + query = "SELECT societe, nochantier, noligne, libelle FROM dem_notes WHERE societe = :societe AND nochantier = :nochantier ORDER BY libelle;" + results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne}).fetchall() else: query = "SELECT * FROM dem_notes WHERE societe = :societe AND nochantier = :nochantier AND noligne = :noligne;" results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne}).first() @@ -388,13 +381,25 @@ def get_dem_notes(request, nodossier, noligne, type): def delete_dem_note(request, nodossier, noligne): societe = nodossier[0:2] nochantier = int(nodossier[3:]) - # une note ou croquis + # une note ou dessin query = "DELETE FROM dem_notes WHERE societe=:societe AND nochantier=:nochantier AND noligne=:noligne;" execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne}) -def update_dem_note(request, nodossier, noligne, notes): +def update_dem_note(request, nodossier, noligne, notes, logged_in): societe = nodossier[0:2] nochantier = int(nodossier[3:]) - # une note ou croquis - query = "UPDATE dem_notes SET notes=:notes WHERE societe=:societe AND nochantier=:nochantier AND noligne=:noligne;" - execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne, 'notes': notes}) + # création ou modif ? + if noligne == '0': + query = "INSERT INTO dem_notes (societe, nochantier, notes, usermaj) VALUES (:societe, :nochantier, :notes, :logged_in);" + execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'notes': notes, 'logged_in': logged_in}) + else: + query = "UPDATE dem_notes SET notes=:notes, logged_in=:logged_in WHERE societe=:societe AND nochantier=:nochantier AND noligne=:noligne;" + execute_query(request, query, {'societe': societe, 'nochantier': nochantier, 'noligne': noligne, 'notes': notes, 'logged_in': logged_in}) + +def get_nb_dessins(request, nodossier): + societe = nodossier[0:2] + nochantier = nodossier[3:] + + query = "SELECT count(*) AS nb FROM dossier_attaches WHERE societe=:societe AND nochantier=:nochantier AND origine='FRN' AND nomfichier LIKE '%DESSIN No %';" + results = request.dbsession.execute(query, {'societe': societe, 'nochantier': nochantier}).first() + return results.nb diff --git a/mondumas/routes.py b/mondumas/routes.py index 1256eb7..acf51a4 100644 --- a/mondumas/routes.py +++ b/mondumas/routes.py @@ -33,18 +33,17 @@ def includeme(config): config.add_route('facture_select', '/facture_select/{date}') config.add_route('facture_selected', '/facture_selected/{goto}/{date}/{nofacture}') # dossier - config.add_route('croquis_edit','/croquis_edit/') config.add_route('demandes','/demandes') config.add_route('demandes_dl','/demandes_dl/{societe}/{email_from}/{email_uid}') config.add_route('dem_devis','/dem_devis') config.add_route('delete_img','/delete_img/{nodossier}/{norapport}/{origine}/{nomfic}') config.add_route('dern_suivis','/dern_suivis') + config.add_route('dessin_edit','/dessin_edit/{nodossier}/{noligne}') config.add_route('dossier_edit', '/dossier_edit/{nodossier}') config.add_route('dossier_lookup', '/dossier_lookup') config.add_route('dossier_select', '/dossier_select/{date}') config.add_route('dossier_selected', '/dossier_selected/{goto}/{date}/{nodossier}') config.add_route('dossier_view', '/dossier_view/{nodossier}') - config.add_route('note_add','/note_add/{nodossier}') config.add_route('note_edit','/note_edit/{nodossier}/{noligne}') config.add_route('rdf_bill','/rdf_bill/{no_id}') config.add_route('rdf_client','/rdf_client/{no_id}') diff --git a/mondumas/templates/dossier/croquis_edit.pt b/mondumas/templates/dossier/croquis_edit.pt deleted file mode 100644 index 40c25cf..0000000 --- a/mondumas/templates/dossier/croquis_edit.pt +++ /dev/null @@ -1,28 +0,0 @@ - -
- -
-
-
- - - - - - - -
- diff --git a/mondumas/templates/dossier/dessin_edit.pt b/mondumas/templates/dossier/dessin_edit.pt new file mode 100644 index 0000000..c0f35df --- /dev/null +++ b/mondumas/templates/dossier/dessin_edit.pt @@ -0,0 +1,60 @@ + +
+ +
+ +
+
+
+ +  Annuler + +
+ + + +
+
+
+
+
+ + + + + + +
+ diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt index 6d52228..c7ca70c 100644 --- a/mondumas/templates/dossier/dossier_view.pt +++ b/mondumas/templates/dossier/dossier_view.pt @@ -283,38 +283,24 @@ -

NOTES et CROQUIS

+

NOTES et DESSIN

+

+ +  Ajouter une NOTE + +  Ajouter dessin +


- -
- - -

NOTE

 -
- +

${item.libelle}
-
-
- - -

CROQUIS

 -
-
-
- - -

${item.libelle}

 -
-
-
@@ -394,34 +380,6 @@
- - diff --git a/mondumas/templates/dossier/note_edit.pt b/mondumas/templates/dossier/note_edit.pt index 98aa418..f1c3ddb 100644 --- a/mondumas/templates/dossier/note_edit.pt +++ b/mondumas/templates/dossier/note_edit.pt @@ -5,13 +5,6 @@
- -
- - -
-

Modifié le : ${note.modif_le.strftime('%d-%m-%Y')} par ${note.usermaj} -

 Annuler @@ -20,10 +13,16 @@
+
+ + +
+

Modifié le : ${note.modif_le.strftime('%d-%m-%Y')} par ${note.usermaj} +

-
-
+
+