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 @@