diff --git a/mondumas/models/default.py b/mondumas/models/default.py index c496128..a22da27 100644 --- a/mondumas/models/default.py +++ b/mondumas/models/default.py @@ -33,31 +33,29 @@ def get_member_by_mdp_oublie(request, lien): def get_member_by_id(request, mbr_id): if mbr_id == '0': - query = "SELECT * FROM p_users ORDER BY cd_uti" + query = """SELECT p_users.*, p_acces.libelle FROM p_users + INNER JOIN p_acces ON p_acces.code = p_users.access + ORDER BY cd_uti""" results = request.dbsession.execute(query).fetchall() else: # lire le membres par son identifianr - query = """SELECT * FROM p_users WHERE CD_UTI=:mbr_id;""" + query = """SELECT p_users.*, p_acces.libelle FROM p_users + INNER JOIN p_acces ON p_acces.code = p_users.access + WHERE CD_UTI=:mbr_id;""" results = request.dbsession.execute(query, {'mbr_id': mbr_id}).first() return results def get_member_info(request, logged_in): # lire le membres par son identifianr - query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;""" + query = """SELECT u.nom, u.email, u.access, u.societe, p_acces.libelle FROM p_users u + INNER JOIN p_acces ON p_acces.code = u.access + WHERE CD_UTI=:logged_in;""" results = request.dbsession.execute(query, {'logged_in': logged_in}).first() - if results.access == 9: - fonction = 'Administrateur' - elif results.access == 8: - fonction = 'Comptabilité' - elif results.access == 5: - fonction = 'Gestion' - else: - fonction = 'Production' return { 'nom': results.nom, 'email': results.email, - 'fonction': fonction, + 'fonction': results.libelle, 'societe': results.societe, } @@ -88,9 +86,6 @@ def update_membre(request, cd_uti, new_values): for param in new_values.keys(): if param == 'nom': new_values['nom'] = new_values['nom'].upper() - if param == 'access': - ' ne prend que le 1er caractère' - new_values['access'] = new_values['access'][0] if s: s += ",%s=:%s" % (param, param) diff --git a/mondumas/models/parametres.py b/mondumas/models/parametres.py index 0a8acef..c229442 100644 --- a/mondumas/models/parametres.py +++ b/mondumas/models/parametres.py @@ -1,17 +1,8 @@ # -*- coding: utf8 -*- -from sqlalchemy import text -from sqlalchemy.ext.declarative import declarative_base -from sqlalchemy.orm import ( - scoped_session, - sessionmaker, -) from zope.sqlalchemy import ( - ZopeTransactionExtension, mark_changed ) -from datetime import * -import dateutil.relativedelta import transaction def execute_query(request, query, params): @@ -33,7 +24,6 @@ def get_rappels_rdv(request): return results.fetchall() def get_dossiers_byChantier(request, societe, name): - query = "CALL spGET_DOSSIERS_byChantier('%s','%s','%s');" % (societe, 'DE', name.replace("'","''")) results = request.dbsession.execute(query).fetchall() return results @@ -226,4 +216,9 @@ def get_tarifs_byGroupe(request, groupe): def get_tarif(request, groupe, ref): query = "SELECT * FROM tarifs WHERE groupe = :groupe and ref = :ref;" results = request.dbsession.execute(query, {'groupe': groupe, 'ref': ref}).first() - return results \ No newline at end of file + return results + +def get_p_acces(request): + query = """SELECT * FROM p_acces ORDER BY code;""" + results = request.dbsession.execute(query).fetchall() + return results diff --git a/mondumas/templates/agenda/agenda.pt b/mondumas/templates/agenda/agenda.pt index 7fbeea4..25bbd94 100644 --- a/mondumas/templates/agenda/agenda.pt +++ b/mondumas/templates/agenda/agenda.pt @@ -8,7 +8,7 @@
-
diff --git a/mondumas/templates/agenda/rdv_edit.pt b/mondumas/templates/agenda/rdv_edit.pt index 11f592a..c64e475 100644 --- a/mondumas/templates/agenda/rdv_edit.pt +++ b/mondumas/templates/agenda/rdv_edit.pt @@ -61,7 +61,7 @@
Annuler -
-
+
@@ -51,7 +51,7 @@
- +
@@ -62,7 +62,7 @@
- +
@@ -77,7 +77,7 @@
- +
@@ -91,7 +91,7 @@
- +
@@ -105,7 +105,7 @@
- +
@@ -133,7 +133,7 @@
- +
diff --git a/mondumas/templates/devis/devis_view.pt b/mondumas/templates/devis/devis_view.pt index 58dfa63..1e062fd 100644 --- a/mondumas/templates/devis/devis_view.pt +++ b/mondumas/templates/devis/devis_view.pt @@ -61,7 +61,7 @@

Statut : ${entete.libelle}    - [ Modifier le statut ] + [ Modifier le statut ]

Dernière modif. le ${entete.DATEMAJ.strftime('%d/%m/%Y à %H:%M')} par ${entete.USERMAJ}

@@ -70,7 +70,7 @@
- +
@@ -98,8 +98,8 @@ - - + +
Total HT Total TVA${detail.REF} ${detail.LIB} ${detail.QTE}${layout.to_euroz(detail.PRIXHT)}${layout.to_euroz(detail.MTHT)}${layout.to_euroz(detail.PRIXHT)}${layout.to_euroz(detail.MTHT)} ${detail.USERMAJ}
diff --git a/mondumas/templates/dossier/dossier_view.pt b/mondumas/templates/dossier/dossier_view.pt index 2073f77..dcdea79 100644 --- a/mondumas/templates/dossier/dossier_view.pt +++ b/mondumas/templates/dossier/dossier_view.pt @@ -9,7 +9,8 @@

CHANTIER

- +  Modifier @@ -100,7 +101,7 @@

Statut : ${dossier.libelle}    - [ Modifier le statut ] + [ Modifier le statut ]

Dernière modif. le ${dossier.DATEMAJ.strftime('%d/%m/%Y à %H:%M')} par ${dossier.USERMAJ}

@@ -138,7 +139,7 @@

SUIVI du DOSSIER

-

+

Nouvelle ligne @@ -207,7 +208,7 @@ ${detail.date.strftime('%d-%m-%Y')} ${detail.nomcli} - ${layout.to_euro(detail.montant)} + ${layout.to_euro(detail.montant)} ${detail.status} @@ -215,6 +216,7 @@

+

DOCUMENTS TECHNIQUES

diff --git a/mondumas/templates/dossier/suivi_edit.pt b/mondumas/templates/dossier/suivi_edit.pt index c8a14b6..d522dd1 100644 --- a/mondumas/templates/dossier/suivi_edit.pt +++ b/mondumas/templates/dossier/suivi_edit.pt @@ -36,7 +36,7 @@

Annuler -