phuoc/dumas_gestion
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tuning planning

Browse Source
This commit is contained in:
Phuoc
2017-05-23 10:15:31 +02:00
parent 8ae79cb808
commit b45901e05c
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mondumas/models/agenda.py
View File

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

2
mondumas/templates/agenda/planning.pt
View File

@@ -12,7 +12,7 @@
<div class="col-md-3" tal:condition="access >= 5"> <div class="col-md-3" tal:condition="access >= 5">
<select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()"> <select class="form-control" id="agenda" name="agenda" onChange="$('#frm').submit()">
<optgroup tal:repeat="item agendas"> <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> </optgroup>
</select> </select>
</div> </div>

4
mondumas/templates/user_edit.pt
View File

@@ -56,7 +56,7 @@
<div class="form-group"> <div class="form-group">
<div class="col-xs-offset-2 col-xs-7 checkbox"> <div class="col-xs-offset-2 col-xs-7 checkbox">
<label><input type="checkbox" name="agenda" value="individu.agenda" id="agenda" <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> </label>
</div> </div>
</div> </div>
@@ -68,7 +68,7 @@
</div> </div>
</div> </div>
<div class="form-group"> <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"> <div class="col-xs-7">
<p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p> <p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p>
</div> </div>

6
mondumas/views/agenda.py
View File

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