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

ajout agenda par défaut dans user

Browse Source
This commit is contained in:
Phuoc
2019-03-09 07:09:38 +01:00
parent ff7787ffaf
commit 334cc1fca4
5 changed files with 15 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mondumas/models/agenda.py
View File

@@ -23,11 +23,11 @@ def execute_query(request, query, params):
def get_users_agenda(request, user):
if user == '':
""" lire la liste des users ayant un agenda"""
query = "SELECT * FROM p_users WHERE cd_uti != 'N' and agenda != 0 AND actif != 0 ORDER BY nom;"
query = "SELECT * FROM p_users WHERE cd_uti != 'N' and cd_uti = agenda AND actif != 0 ORDER BY nom;"
results = request.dbsession.execute(query).fetchall()
else:
""" lire le user ayant un agenda"""
query = "SELECT * FROM p_users WHERE cd_uti = :user and agenda != 0 AND actif != 0 ORDER BY nom;"
query = "SELECT * FROM p_users WHERE cd_uti = :user;"
results = request.dbsession.execute(query, {'user': user}).first()
return results

18
mondumas/templates/parametres/user_edit.pt
View File

@@ -54,10 +54,15 @@
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9 checkbox">
<label><input type="checkbox" name="agenda" value="individu.agenda" id="agenda"
tal:attributes="checked individu.agenda != 0 and 'checked' or None">Peut prendre des rendez-vous
</label>
<label class="control-label col-sm-3" for="agenda">Agenda par défaut</label>
<div class="col-sm-9">
<input class="form-control" type="text" id="agenda" name="agenda" value="${individu.agenda}"
placeholder="3 caractères maximum"
data-fv-notempty="true"
data-fv-notempty-message="L'agenda est obligatoire"
data-fv-stringlength="true"
data-fv-stringlength-max="3"
data-fv-stringlength-message="3 caractères maximum" />
</div>
</div>
<div class="form-group">
@@ -73,11 +78,6 @@
<p class="form-control-static">${individu.modif_le.strftime('%d/%m/%Y - %H:%M')}</p>
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9 checkbox">
<p class="form-control-static">La fiche est active</p>
</div>
</div>
<br />
<div class="form-group">
<div class="col-sm-offset-3 col-sm-9">

10
mondumas/templates/parametres/users_list.pt
View File

@@ -43,16 +43,6 @@
return '<a href="/user_edit/' + data + '">' + data + '</a>';
},
},
{ "targets": 3,
"render": function (data, type, full, meta) {
if (data != 0) {
return '<span class="glyphicon glyphicon-calendar"></span>';
}
else {
return '';
}
},
},
{ "targets": 4,
"render": function (data, type, row, meta) {
// ajouter un link vers le login

7
mondumas/views/agenda.py
View File

@@ -114,13 +114,12 @@ def agenda(request):
agendas = get_users_agenda(request, '')
# le user est-il un commercial ?
member = get_member_info(request, logged_in)
if member['fonction'] == 'Commercial':
agenda = logged_in
member = get_member_by_id(request, logged_in)
if member.access == 0:
isCommercial = True
else:
agenda = 'S'
isCommercial = False
agenda = member.agenda
# prendre en compte les paramètres de saisie
if 'agenda' in request.params:

7
mondumas/views/parametres.py
View File

@@ -112,7 +112,7 @@ def user_edit(request):
individu['email'] = ''
individu['access'] = '0 | Production'
individu['actif'] = 1
individu['agenda'] = 0
individu['agenda'] = ''
page_title= 'Nouvelle Fiche'
else:
# lire la fiche de l'individu
@@ -133,11 +133,6 @@ def user_edit(request):
new_values['actif'] = 1
else:
new_values['actif'] = 0
# agenda coché ?
if 'agenda' in request.params:
new_values['agenda'] = 1
else:
new_values['agenda'] = 0
if new_values:
update_membre(request, cd_uti, new_values)