added user position in dropdown panel"

mondumas/layout.py

@@ -9,7 +9,7 @@ from pyramid.security import authenticated_userid
 
 @layout_config(template='templates/layouts/global_layout.pt')
 class GlobalLayout(object):
-		page_title = u"Pagode Tinh-Do"
+		# page_title = u"Pagode Tinh-Do"
 
 		def __init__(self, context, request):
 				self.context = context

mondumas/panels.py

@@ -14,11 +14,20 @@ def dropdown_menu_panel(context, request):
         member = get_member_by_id(request, logged_in)
         fullname = member.NOM
         email = member.email
+        if member.access == 9:
+            logged_in_fonction = 'Administrateur'
+        elif member.access == 8:
+            logged_in_fonction = 'Comptabilité'
+        elif member.access == 5:
+            logged_in_fonction = 'Gestion'
+        else:
+            logged_in_fonction = 'Production'       
 
     return {
         'logged_in': logged_in,
         'logged_in_name': fullname,
         'logged_in_email': email,
+        'logged_in_fonction': logged_in_fonction,
         }
 
 

mondumas/templates/agenda/agenda.pt

@@ -5,17 +5,20 @@
 	<div class="form-group">
 		<div class="row">
 			<div class="col-md-2">
-				<a class="btn btn-primary" role="button" href="/home">
+				<a class="btn btn-primary" role="button" href="/">
 					<span class="glyphicon glyphicon-chevron-left"></span> Retour</a>
 			</div>
 			<form method="POST" id="frm">
-				<div class="col-md-3">
+				<div class="col-md-3" tal:condition="access >= 5">
 					<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()">
 						<optgroup tal:repeat="item agendas">
 							<option value="${item.code}" tal:attributes="selected agenda==item.code and 'selected' or None">${item.nom}</option>
 						</optgroup>
 					</select>
 				</div>
+				<div class="col-md-3" tal:condition="access >= 5">
+					<input type="hidden" name="agenda" value="${agenda}"/>
+				</div>
 			</form>
 			<div class="col-md-5">
 				<p>

mondumas/templates/agenda/dossier_view.pt

@@ -96,8 +96,8 @@
         <tr tal:repeat="detail details">
             <td>${detail.DATE.strftime('%d/%m/%Y')}</td>
             <td>
-                <span tal:condition="detail.DATEVI==None"></span>
-                <span tal:condition="detail.DATEVI<>None">
+                <span tal:condition="detail.rdv_debut==None"></span>
+                <span tal:condition="detail.rdv_debut<>None">
                     <a href="${request.route_url('rdv_edit', nodossier=nodossier, nolig=detail.NOLIG)}">
                         ${detail.rdv_debut.strftime('%d/%m/%Y %H:%M')}</a>
                 </span>

mondumas/templates/layouts/global_layout.pt

@@ -73,7 +73,7 @@
     <br />
     <div class="container">
         <h1>${page_title}</h1>
-
+		<br />
         <div id="messages" tal:attributes="class request.is_xhr and 'ajax-replace' or None">
             <div tal:repeat="queue ('', 'info', 'success', 'warning', 'danger')"
                tal:omit-tag="">

mondumas/templates/panels/dropdown_menu_panel.pt

@@ -4,7 +4,8 @@
 	<ul class="dropdown-menu">
 		<li class="dropdown-header">
 			${logged_in_email}<br />
-			Identifiant : ${logged_in}
+			Identifiant : ${logged_in}<br />
+			Fonction: ${logged_in_fonction}
 		</li>
 
 		<li class="divider"></li>

mondumas/views/agenda.py

@@ -103,14 +103,20 @@ def agenda(request):
     logged_in = authenticated_userid(request)
     member = get_member_by_id(request, logged_in)
     if member:
+        access = member.access
+        # determiner l'agenda du user 
         agenda = member.agenda
         if not agenda:
             agenda = 'J'
     else:
         agenda = 'J'
         
-    # lire les différents AGENDAS
+    if access >= 5:
+        # si gestionnaire, lire les différents AGENDAS
         agendas = get_agendas(request,'')
+    else:
+        agendas = []
+        
     # prendre en compte les paramètres de saisie
     if 'agenda' in request.params:
         agenda = request.params["agenda"]
@@ -152,5 +158,6 @@ def agenda(request):
         'fullcalendar_events': json.dumps(events),
         'agendas': agendas,
         'agenda': agenda,
+        'access': access,
     }
 

production.ini

@@ -70,8 +70,8 @@ level = NOTSET
 formatter = generic
 
 [handler_exc_handler]
-class = FileHandler
-args = ('%(here)s/exception.log',)
+class = handlers.RotatingFileHandler
+args = ('exception.log', 'a', 10000000, 10)
 level = ERROR
 formatter = exc_formatter