tuning planning

mondumas/models/agenda.py

@@ -20,13 +20,10 @@ def execute_query(request, query, params):
     mark_changed(request.dbsession)
     transaction.commit()
 
-def get_users_actifs(request,cd_uti):
-    if cd_uti =='':
-        query = "SELECT * FROM p_users WHERE agenda <> 0 ORDER BY NOM"
+def get_agendas(request):
+    """ lire la liste des personnes ayant un agenda"""
+    query = "CALL spGET_AGENDAS('T')"
     results = request.dbsession.execute(query).fetchall()
-    else:
-        query = "SELECT * FROM p_users WHERE cd_uti = :cd_uti;"
-        results = request.dbsession.execute(query, {'cd_uti': cd_uti}).first()
     return results
 
 def get_table(code):

mondumas/templates/agenda/planning.pt

@@ -12,7 +12,7 @@
 				<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.CD_UTI}" tal:attributes="selected agenda==item.CD_UTI and 'selected' or None">${item.NOM}</option>
+							<option value="${item.cd_uti}" tal:attributes="selected agenda==item.cd_uti and 'selected' or None">${item.nom}</option>
 						</optgroup>
 					</select>
 				</div>

mondumas/templates/user_edit.pt

@@ -56,7 +56,7 @@
 			<div class="form-group">
 				<div class="col-xs-offset-2 col-xs-7 checkbox">
 					<label><input type="checkbox" name="agenda" value="individu.agenda" id="agenda" 
-						tal:attributes="checked individu.agenda <> 0 and 'checked' or None">Gérer son agenda
+						tal:attributes="checked individu.agenda <> 0 and 'checked' or None">Peut prendre des rendez-vous
 					</label>
 				</div>
 			</div>
@@ -68,7 +68,7 @@
 				</div>
 			</div>
 			<div class="form-group">
-				<label class="control-label col-xs-2" for="access">Dernière modif</label>
+				<label class="control-label col-xs-2" for="access">Dernière modif.</label>
 				<div class="col-xs-7">
 					<p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p>
 				</div>

mondumas/views/agenda.py

@@ -150,16 +150,16 @@ def planning(request):
         request.session.flash(u"Identifiant %s introuvable" % (logged_in), 'danger')
         return HTTPFound(location=request.route_url("/home"))
     
-    agenda = 'JMD'
     # determiner le rôle du user 
     access = member.access
-    agendas = get_users_actifs(request,'')
+    agendas = get_agendas(request)
         
+    agenda = 'JMD'
     # prendre en compte les paramètres de saisie
     if 'agenda' in request.params:
         agenda = request.params["agenda"]
     
-    personne = get_users_actifs(request,agenda)
+    personne = get_member_by_id(request,agenda)
     rows = get_rendez_vous(request, agenda)
         
     # construire la liste des events