phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed get status table

Browse Source
This commit is contained in:
Phuoc
2021-06-23 14:05:27 +02:00
parent 35def60078
commit 3cb7664a08
4 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
development.ini
View File

@@ -19,7 +19,7 @@ pyramid.includes =
pyramid_tm 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 # sqlalchemy.url = mysql://phuoc:phuoc!@192.168.0.31/bddevfac?charset=utf8
mondumas.admin_email = cao.thien-phuoc@orange.fr mondumas.admin_email = cao.thien-phuoc@orange.fr

10
mondumas/models/dossier.py
View File

@@ -326,6 +326,10 @@ def get_log_demandes(request, ):
return results.fetchall() return results.fetchall()
def get_status_by_id(request, code): def get_status_by_id(request, code):
query = """SELECT libelle FROM bddevfac.p_statuts WHERE code = :code""" if code == '':
results = request.dbsession.execute(query, {'code': code}) query = """SELECT * FROM p_statuts;"""
return results.fetchall() 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

2
mondumas/templates/dossier/dossier_view.pt
View File

@@ -334,7 +334,7 @@
<div class="col-xs-8"> <div class="col-xs-8">
<select class="form-control" id="status" name="status"> <select class="form-control" id="status" name="status">
<div tal:repeat="item 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> </div>
</select> </select>
</div> </div>

17
mondumas/views/dossier.py
View File

@@ -126,23 +126,18 @@ def dossier_view(request):
# select background color according to society # select background color according to society
bg_color = "bg-%s" % societe bg_color = "bg-%s" % societe
status = ["0 | Non traité", "1 | Contact pris", "2 | RDV pris", "3 | Devis établi", "4 | Devis accepté", "5 | Trav. plan", status = get_status_by_id(request, '')
"6 | Facturé", "7 | Réglé part.", "8 | Réglé", "10 | Annulé", "11 | Refusé", "12 | Attente"]
if 'form.close' in request.params: if 'form.close' in request.params:
status = request.params["status"] status = request.params["status"]
motif = request.params["motif"] 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 code >= 10:
comment = 'Le dossier est ' + libelle + ' : ' + motif
if int(code) < 10: insert_suivi(request, nodossier, comment)
comment = action + " pour ce dossier car " + motif
else:
comment = 'Le dossier est ' + action + ' car ' + motif
insert_suivi(request, nodossier, comment)
update_dossier_cloture(request, nodossier, code, logged_in) update_dossier_cloture(request, nodossier, code, logged_in)
request.session.flash(u"Le dossier a été cloturé avec succès.", 'success') request.session.flash(u"Le dossier a été cloturé avec succès.", 'success')