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

finaliser tests cabinet + expet

Browse Source
This commit is contained in:
Phuoc
2021-01-16 17:12:25 +01:00
parent 9873197d42
commit b3fb088d9f
8 changed files with 298 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

101
mondumas/views/parametres.py
View File

@@ -552,6 +552,13 @@ def cabinets(request):
@view_config(route_name='cabinet_edit', renderer='../templates/parametres/cabinet_edit.pt', permission='view')
def cabinet_edit(request):
logged_in = request.authenticated_userid
# lire la fiche de l'utilisateur
member = get_member_by_id(request, logged_in)
access = member.access
if access < 5:
request.session.flash(u"Vous n'êtes pas autorisé à modifier les cabinets", 'danger')
return HTTPFound(location=request.route_url('cabinets'))
code = request.matchdict['code']
url = request.route_url("cabinet_edit", code=code)
@@ -559,18 +566,18 @@ def cabinet_edit(request):
message = ''
if code == '0':
# nouveau
cabinet = {}
cabinet = {}
cabinet['NOM'] = ''
cabinet['TEL1'] = ''
cabinet['TEL2'] = ''
cabinet['TELP'] = ''
cabinet['ADR'] = ''
cabinet['ADR2'] = ''
cabinet['TELP'] = ''
cabinet['ADRESSE'] = ''
cabinet['ADRESSE2'] = ''
cabinet['VILLE'] = ''
cabinet['VILLE'] = ''
cabinet['afficher'] = 1
cabinet['modif_le'] = datetime.now()
page_title= 'Nouveau cabinet'
code_postal = '69001 - LYON'
experts = []
else:
# lire cabinets
@@ -583,12 +590,31 @@ def cabinet_edit(request):
code_postal = '%s - %s' % (cabinet.CP, cabinet.VILLE)
experts = get_experts_by_id(request, cabinet.CODE, '0')
if 'form.submitted' in request.params:
code = request.params['code']
if 'form.submitted' in request.params:
new_values = {}
for param, db_value in cabinet.items():
if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
# controle saisie code postal
code_postal = request.params['code_postal']
cp = code_postal.split(' - ')
if len(cp) < 2:
message = 'Code postal invalide. Veuillez sélectionner un parmi la liste.'
else:
new_values['CP'] = cp[0]
new_values['VILLE'] = cp[1]
update_cabinet(request, code, libelle)
request.session.flash(u"Le cabinet a été mis à jour avec succès.", 'success')
# afficher coché ?
if 'afficher' in request.params:
new_values['afficher'] = 1
else:
new_values['afficher'] = 0
if new_values:
update_cabinet(request, code, new_values)
request.session.flash(u"Le cabinet a été mis à jour avec succès.", 'success')
return HTTPFound(location=request.route_url('cabinets'))
if 'form.deleted' in request.params:
@@ -599,6 +625,7 @@ def cabinet_edit(request):
return {
'page_title': page_title,
'url': url,
'cabinet': cabinet,
'code': code,
'experts': experts,
'code_postal': code_postal,
@@ -608,6 +635,13 @@ def cabinet_edit(request):
@view_config(route_name='expert_edit', renderer='../templates/parametres/expert_edit.pt', permission='view')
def expert_edit(request):
logged_in = request.authenticated_userid
# lire la fiche de l'utilisateur
member = get_member_by_id(request, logged_in)
access = member.access
if access < 5:
request.session.flash(u"Vous n'êtes pas autorisé à modifier les experts", 'danger')
return HTTPFound(location=request.route_url('cabinets'))
code_cab = request.matchdict['code_cab']
code_exp = request.matchdict['code_exp']
@@ -616,47 +650,50 @@ def expert_edit(request):
message = ''
if code_exp == '0':
# nouveau
expert = {}
expert = {}
expert['CODE_CAB'] = code_cab
expert['CODE_EXP'] = code_exp
expert['NOM'] = ''
expert['TEL1'] = ''
expert['TEL2'] = ''
expert['TELP'] = ''
expert['ADR'] = ''
expert['ADR2'] = ''
expert['CP'] = ''
expert['VILLE'] = ''
expert['TEL2'] = ''
expert['email'] = ''
expert['en_activite'] = 1
expert['modif_le'] = datetime.now()
page_title= 'Nouveau expert'
else:
# lire experts
# lire experts
expert = get_experts_by_id(request, code_cab, code_exp)
if not expert:
request.session.flash(u"expert non trouvé : %s" % code, 'warning')
if not expert:
request.session.flash(u"expert non trouvé : %s" % code_exp, 'warning')
return HTTPFound(location=request.route_url("cabinet_edit", code=code_cab))
page_title= "Modification de %s" % (expert.NOM)
code_postal = '%s - %s' % (expert.CP, expert.VILLE)
page_title= "Modification de %s" % (expert.NOM)
if 'form.submitted' in request.params:
code = request.params['code']
if 'form.submitted' in request.params:
new_values = {}
for param, db_value in expert.items():
if param in request.params and request.params[param] != db_value:
new_values[param] = request.params[param]
update_expert(request, code, libelle)
request.session.flash(u"Le expert a été mis à jour avec succès.", 'success')
# en_activite coché ?
if 'en_activite' in request.params:
new_values['en_activite'] = 1
else:
new_values['en_activite'] = 0
if new_values:
update_expert(request, code_cab, code_exp, new_values)
request.session.flash(u"L'expert a été mis à jour avec succès.", 'success')
return HTTPFound(location=request.route_url("cabinet_edit", code=code_cab))
if 'form.deleted' in request.params:
delete_expert(request, code)
request.session.flash(u"Le expert a été supprimé avec succès.", 'success')
if 'form.deleted' in request.params:
delete_expert(request, code_cab, code_exp)
request.session.flash(u"L'expert a été supprimé avec succès.", 'success')
return HTTPFound(location=request.route_url("cabinet_edit", code=code_cab))
return {
'page_title': page_title,
'url': url,
'expert': expert,
'experts': experts,
'expert': expert,
'code_exp': code_exp,
'message': message,