From 3cb7664a082b92569a0d5f82b8eb8c61b2e66596 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Wed, 23 Jun 2021 14:05:27 +0200
Subject: [PATCH] fixed get status table

---
 development.ini                            |  2 +-
 mondumas/models/dossier.py                 | 10 +++++++---
 mondumas/templates/dossier/dossier_view.pt |  2 +-
 mondumas/views/dossier.py                  | 17 ++++++-----------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/development.ini b/development.ini
index 22ee6c6..3640f35 100644
--- a/development.ini
+++ b/development.ini
@@ -19,7 +19,7 @@ pyramid.includes =
     pyramid_tm
 
     
-sqlalchemy.url = mysql://phuoc:phuoc!@localohost/bddevfac?charset=utf8
+sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8
 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
 
 mondumas.admin_email = cao.thien-phuoc@orange.fr
diff --git a/mondumas/models/dossier.py b/mondumas/models/dossier.py
index a640e60..79f9153 100644
--- a/mondumas/models/dossier.py
+++ b/mondumas/models/dossier.py
@@ -326,6 +326,10 @@ def get_log_demandes(request, ):
     return results.fetchall()
 
 def get_status_by_id(request, code):
-    query = """SELECT libelle FROM bddevfac.p_statuts WHERE code = :code"""
-    results = request.dbsession.execute(query, {'code': code})
-    return results.fetchall()
\ No newline at end of file
+    if code == '':
+        query = """SELECT * FROM p_statuts;"""
+        results = request.dbsession.execute(query,).fetchall()
+    else:
+        query = """SELECT * FROM p_statuts WHERE code = :code;"""
+        results = request.dbsession.execute(query, {'code': code}).first()
+    return results
\ No newline at end of file
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt
index 9b029ed..3f5aa92 100644
--- a/mondumas/templates/dossier/dossier_view.pt
+++ b/mondumas/templates/dossier/dossier_view.pt
@@ -334,7 +334,7 @@
 						<div class="col-xs-8">
 							<select class="form-control" id="status" name="status">
 								<div tal:repeat="item status">
-									<option value="${item}" tal:attributes="selected dossier.STATUS==item[0] and 'selected' or None">${item}</option>
+									<option tal:attributes="selected dossier.STATUS==item.code and 'selected' or None">${item.code} | ${item.libelle}</option>
 								</div>
 							</select>
 						</div>
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 2153b5d..c45a0c9 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -126,23 +126,18 @@ def dossier_view(request):
     # select background color according to society
     bg_color = "bg-%s" % societe
 
-    status = ["0 | Non traité", "1 | Contact pris", "2 | RDV pris", "3 | Devis établi", "4 | Devis accepté", "5 | Trav. plan", 
-        "6 | Facturé", "7 | Réglé part.", "8 | Réglé", "10 | Annulé", "11 | Refusé", "12 | Attente"]
+    status = get_status_by_id(request, '')
 
     if 'form.close' in request.params:
         status = request.params["status"]
         motif = request.params["motif"]
 
-        code = status[:2].strip()
+        code, libelle = status.split(' | ')
+        code = int(code)
 
-        action = str(get_status_by_id(request, code)[0].libelle)
-
-        if int(code) < 10:
-            comment = action + " pour ce dossier car " + motif
-        else:
-            comment = 'Le dossier est ' + action + ' car ' + motif
-
-        insert_suivi(request, nodossier, comment)
+        if code >= 10:
+            comment = 'Le dossier est ' + libelle + ' : ' + motif
+            insert_suivi(request, nodossier, comment)
 
         update_dossier_cloture(request, nodossier, code, logged_in)
         request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')