From 0b18da08525bdaab48c3bb0e4af703a002922436 Mon Sep 17 00:00:00 2001
From: Phuoc CAO <phuoc@caotek.fr>
Date: Tue, 23 Apr 2019 16:50:45 +0200
Subject: [PATCH] ajouter societe par defaut dans user

---
 mondumas/models/default.py                 |  3 ++-
 mondumas/templates/parametres/user_edit.pt | 10 ++++++++++
 mondumas/views/dossier.py                  | 11 ++++++++++-
 mondumas/views/parametres.py               |  4 ++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/mondumas/models/default.py b/mondumas/models/default.py
index f6b4b44..f00024f 100644
--- a/mondumas/models/default.py
+++ b/mondumas/models/default.py
@@ -36,7 +36,7 @@ def get_member_by_id(request, mbr_id):
 
 def get_member_info(request, logged_in):
     # lire le membres par son identifianr
-    query = """SELECT nom, email, access FROM p_users WHERE CD_UTI=:logged_in;"""
+    query = """SELECT nom, email, access, societe FROM p_users WHERE CD_UTI=:logged_in;"""
     results = request.dbsession.execute(query, {'logged_in': logged_in}).first()
     if results.access == 9:
         fonction = 'Administrateur'
@@ -51,6 +51,7 @@ def get_member_info(request, logged_in):
         'nom': results.nom,
         'email': results.email,
         'fonction': fonction,
+        'societe': results.societe,
         }
 
 def update_membre_mdp_oublie(request, login):
diff --git a/mondumas/templates/parametres/user_edit.pt b/mondumas/templates/parametres/user_edit.pt
index cfb826c..6418926 100644
--- a/mondumas/templates/parametres/user_edit.pt
+++ b/mondumas/templates/parametres/user_edit.pt
@@ -65,6 +65,16 @@
 						data-fv-stringlength-message="3 caractères maximum" />
 				</div>
 			</div>
+			<div class="form-group">
+				<label class="control-label col-xs-3" for="societe">Société par défaut</label>
+				<div class="col-xs-9">
+					<select class="form-control" id="societe" name="societe">
+						<div tal:repeat="item societes">
+							<option value="${item}" tal:attributes="selected individu.societe==item and 'selected' or None">${item}</option>
+						</div>
+					</select>
+				</div>
+			</div>
 			<div class="form-group">
 				<div class="col-sm-offset-3 col-sm-9 checkbox">
 					<label><input type="checkbox" name="actif" value="individu.actif" id="actif" 
diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py
index 0c0e384..6abb809 100644
--- a/mondumas/views/dossier.py
+++ b/mondumas/views/dossier.py
@@ -44,9 +44,13 @@ def dossier_lookup(request):
         goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
         url = request.route_url('dossier_lookup')
 
+    logged_in = request.authenticated_userid.upper()
     message = ''
     societes = ['PE','ME','PL','PO','CD'] 
-    societe = 'PE'
+    member = get_member_by_id(request, logged_in)
+    societe_defaut = member.societe
+    societe = societe_defaut
+    access_defaut = member.access
     liste=[]
     name = ''
     cb_tous = "non"
@@ -54,6 +58,11 @@ def dossier_lookup(request):
     if 'form.submitted' in request.params:
         name = request.params['name']
         societe = request.params['societe']
+        if access_defaut > 0:
+            societe = request.params['societe']
+        else:
+            societe = societe_defaut
+            
         # si afficher tous les fiches ?
         if 'cb_tous' in request.params: 
             cb_tous = "oui" 
diff --git a/mondumas/views/parametres.py b/mondumas/views/parametres.py
index b44ba16..832e27a 100644
--- a/mondumas/views/parametres.py
+++ b/mondumas/views/parametres.py
@@ -103,6 +103,7 @@ def user_edit(request):
     url = request.route_url('user_edit', cd_uti=cd_uti)
     message = ''
     access = ["0 | Production", "5 | Gestion", u"8 | Comptabilité", "9 | Administration"]
+    societes = ['PE','ME','PL','PO','CD'] 
     
     if cd_uti == '0':
         # nouveau
@@ -113,6 +114,7 @@ def user_edit(request):
         individu['access'] = '0 | Production'
         individu['actif'] = 1
         individu['agenda'] = ''
+        individu['societe'] = ''
         page_title= 'Nouvelle Fiche'
     else:
         # lire la fiche de l'individu 
@@ -149,6 +151,8 @@ def user_edit(request):
         'url': url,
         'individu': individu,
         'access': access,
+        'societes': societes,
+        'societe': societes,
         'message': message,
         'lienmdp': '%s/%s' % (individu.CD_UTI, date.today().strftime('%d%m%Y'))
     }