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

ajout bouton créer DRV dans le suivi du dossier

Browse Source
This commit is contained in:
Phuoc
2018-12-10 15:29:55 +01:00
parent d5c46cd100
commit b4552076e5
8 changed files with 193 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mondumas/views/agenda.py
View File

@@ -27,9 +27,22 @@ from ..models.dossier import *
@view_config(route_name='rdv_edit', renderer='../templates/agenda/rdv_edit.pt', permission='view')
def rdv_edit(request):
logged_in = request.authenticated_userid
logged_in = request.authenticated_userid.upper()
nodossier = request.matchdict['nodossier']
nolig = request.matchdict['nolig']
# creation d'un rdv ?
if nolig == '0':
# lire le user avec agenda
agenda = get_users_agenda(request, logged_in)
if agenda:
aujourdhui = datetime.now()
create_rdv(request, nodossier, aujourdhui.strftime("%Y-%m-%d"), aujourdhui.strftime("%H:00"), 'RDV DEVIS', logged_in, logged_in)
request.session.flash(u"Le rendez-vous a été CREE avec succès.", 'success')
else:
request.session.flash(u"Vous ne pouvez pas créer de rendez-vous.", 'danger')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
url = request.route_url("rdv_edit", nodossier=nodossier, nolig=nolig)
message = ''
@@ -99,7 +112,7 @@ def agenda(request):
type_rdv = u'RDV DEVIS'
# liste des users avec agenda
agendas = get_users_agenda(request)
agendas = get_users_agenda(request, '')
# le user a-t-il un agenda ?
agenda = 'JMD'
@@ -141,7 +154,7 @@ def agenda(request):
json_event = {
'title': '%s %s' % (row.c_qualite, row.c_nom),
'description': row.c_ville.capitalize(),
'description': '%s %s' % (row.c_cp, row.c_ville.capitalize()),
'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
'allDay': False,
@@ -174,7 +187,7 @@ def planning(request):
# {"id":"a","title":"Auditorium A"}
ressources = []
# liste des users avec agenda
users = get_users_agenda(request)
users = get_users_agenda(request, '')
for row in users:
json_ressources = {
'id': row.CD_UTI,
@@ -203,7 +216,7 @@ def planning(request):
json_event = {
'resourceId': user.CD_UTI,
'title': row.c_nom,
'description': row.c_ville.capitalize(),
'description': '%s %s' % (row.c_cp, row.c_ville.capitalize()),
'start': row.rdv_debut.strftime('%Y-%m-%d %H:%M:%S'),
'end': row.rdv_fin.strftime('%Y-%m-%d %H:%M:%S'),
'allDay': False,

30
mondumas/views/dossier.py
View File

@@ -218,3 +218,33 @@ def suivi_edit(request):
'suivi': suivi,
'message': message,
}
@view_config(route_name='dossier_edit', renderer='../templates/dossier/dossier_edit.pt', permission='view')
def dossier_edit(request):
logged_in = request.authenticated_userid
nodossier = request.matchdict['nodossier']
url = request.route_url('dossier_edit', nodossier=nodossier)
dossier = get_dossier_by_no(request, nodossier)
if not dossier:
request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
return HTTPFound(location=request.route_url('dossier_lookup'))
if 'form.submitted' in request.params:
new_values = {}
for param, db_value in dossier.items():
if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
if new_values:
update_dossier(request, nodossier, new_values)
request.session.flash(u"Le dossier a été mis à jour avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
return {
'page_title': u"Modifier le dossier : %s" % nodossier,
'url': url,
'dossier': dossier,
'nodossier': nodossier,
}