création acces = Consultation et table p_acces

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)

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
+    return results
+
+def get_p_acces(request):
+    query = """SELECT * FROM p_acces ORDER BY code;"""
+    results = request.dbsession.execute(query).fetchall()
+    return results