ajout module Default et suivi_edit.pt
This commit is contained in:
@@ -25,6 +25,7 @@ from ..security import groupfinder
|
||||
import json
|
||||
|
||||
from ..models.default import *
|
||||
from ..models.agenda import *
|
||||
|
||||
def to_decimal(x):
|
||||
import decimal
|
||||
@@ -52,14 +53,14 @@ def to_percent(x):
|
||||
return (u"%.2f " % x).replace('.', ',') + "%"
|
||||
|
||||
|
||||
@view_config(route_name='home', renderer='../templates/home.pt', permission='view')
|
||||
@view_config(route_name='home', renderer='../templates/default/home.pt', permission='view')
|
||||
def home(request):
|
||||
return {
|
||||
'page_title': 'Bienvenue',
|
||||
'project': 'mondumas',
|
||||
}
|
||||
|
||||
@view_config(route_name='envoyer_mdp', renderer='../templates/envoyer_mdp.pt')
|
||||
@view_config(route_name='envoyer_mdp', renderer='../templates/default/envoyer_mdp.pt')
|
||||
def envoyer_mdp(request):
|
||||
url = request.route_url('envoyer_mdp')
|
||||
message = u''
|
||||
@@ -92,7 +93,7 @@ Le lien suivant vous dirigera vers une page où vous pourrez ré-initialiser vot
|
||||
'message': message,
|
||||
}
|
||||
|
||||
@view_config(route_name='changer_mdp', renderer='../templates/changer_mdp.pt', permission='view')
|
||||
@view_config(route_name='changer_mdp', renderer='../templates/default/changer_mdp.pt', permission='view')
|
||||
def changer_mdp(request):
|
||||
url = request.route_url('changer_mdp')
|
||||
logged_in = request.authenticated_userid
|
||||
@@ -117,7 +118,7 @@ def changer_mdp(request):
|
||||
'message': message,
|
||||
}
|
||||
|
||||
@view_config(route_name='redefinir_mdp', renderer='../templates/redefinir_mdp.pt')
|
||||
@view_config(route_name='redefinir_mdp', renderer='../templates/default/redefinir_mdp.pt')
|
||||
def redefinir_mdp(request):
|
||||
lien = request.matchdict["lien"]
|
||||
url = request.route_url('redefinir_mdp', lien=lien)
|
||||
@@ -144,7 +145,7 @@ def redefinir_mdp(request):
|
||||
}
|
||||
|
||||
|
||||
@view_config(route_name='login', renderer='../templates/login.pt', permission='view')
|
||||
@view_config(route_name='login', renderer='../templates/default/login.pt', permission='view')
|
||||
@forbidden_view_config(renderer='../templates/login.pt')
|
||||
def login(request):
|
||||
|
||||
@@ -213,11 +214,20 @@ gestion.entreprise-dumas.com
|
||||
mailer.send_immediately(message)
|
||||
|
||||
|
||||
@view_config(route_name='chantier_lookup', renderer='../templates/chantier_lookup.pt', permission='view')
|
||||
def chantier_lookup(request):
|
||||
@view_config(route_name='dossier_lookup', renderer='../templates/default/dossier_lookup.pt', permission='view')
|
||||
@view_config(route_name='dossier_select', renderer='../templates/default/dossier_lookup.pt', permission='view')
|
||||
def dossier_lookup(request):
|
||||
|
||||
# recherche chantier
|
||||
url = request.route_url('chantier_lookup')
|
||||
if 'dossier_select' in request.current_route_path() :
|
||||
# récupérer les paramètres de l'appel de la view
|
||||
datePlan = request.matchdict['date']
|
||||
# sélectionner dossier -> goto planning
|
||||
goto_url = '/dossier_selected/agenda/%s/' % datePlan
|
||||
url = request.route_url('dossier_select', date=datePlan)
|
||||
else:
|
||||
# recherche dossier -> goto fiche dossier
|
||||
goto_url = '/dossier_selected/dossier_view/%s/' % date.today().strftime('%Y-%m-%d')
|
||||
url = request.route_url('dossier_lookup')
|
||||
|
||||
message = u''
|
||||
societes = ['PE','ME','PL','PO','CD']
|
||||
@@ -225,6 +235,7 @@ def chantier_lookup(request):
|
||||
liste=[]
|
||||
name = u''
|
||||
cb_tous = "non"
|
||||
|
||||
if 'form.submitted' in request.params:
|
||||
name = request.params['name']
|
||||
societe = request.params['societe']
|
||||
@@ -246,6 +257,7 @@ def chantier_lookup(request):
|
||||
return {
|
||||
'page_title': u"Rechercher un chantier",
|
||||
'url': url,
|
||||
'goto_url': goto_url,
|
||||
'message': message,
|
||||
'dt_data': json.dumps(liste),
|
||||
'societes': societes,
|
||||
@@ -253,3 +265,97 @@ def chantier_lookup(request):
|
||||
'name': name,
|
||||
'cb_tous': cb_tous,
|
||||
}
|
||||
|
||||
@view_config(route_name='dossier_view', renderer='../templates/default/dossier_view.pt', permission='view')
|
||||
def dossier_view(request):
|
||||
nodossier = request.matchdict['nodossier']
|
||||
url = request.route_url("dossier_view", nodossier=nodossier)
|
||||
|
||||
dossier = get_dossier_by_no(request, nodossier)
|
||||
if dossier is None:
|
||||
request.session.flash(u"Le dossier no %s est introuvable" % (nodossier), 'danger')
|
||||
return HTTPFound(location=request.route_url("chantier_lookup"))
|
||||
# lire tous le suivi du dossier
|
||||
details = get_dossier_rdv_by_no(request, nodossier, '0')
|
||||
# lire toutes les dossiers du chantiers
|
||||
documents = get_documents_byChantier(request, nodossier)
|
||||
return {
|
||||
'page_title': u"Dossier : %s" % (nodossier),
|
||||
'nodossier': nodossier,
|
||||
'dossier': dossier,
|
||||
'details': details,
|
||||
'documents': documents,
|
||||
}
|
||||
|
||||
@view_config(route_name='dossier_selected', permission='view')
|
||||
def dossier_selected(request):
|
||||
|
||||
# récupérer les paramètres de l'appel de la view
|
||||
goto = request.matchdict['goto']
|
||||
datePlan = request.matchdict['date']
|
||||
nodossier = request.matchdict['nodossier']
|
||||
|
||||
# fiche dossier
|
||||
dossier = get_dossier_by_no(request, nodossier)
|
||||
# memorize nodossier et nom dossier
|
||||
request.session['mem_nodossier'] = nodossier
|
||||
request.session['mem_nomdossier'] = dossier.C_NOM
|
||||
if goto == 'dossier_view':
|
||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||
else:
|
||||
return HTTPFound(location=request.route_url('agenda', date=datePlan))
|
||||
|
||||
@view_config(route_name='suivi_edit', renderer='../templates/default/suivi_edit.pt', permission='view')
|
||||
def suivi_edit(request):
|
||||
|
||||
logged_in = request.authenticated_userid
|
||||
nodossier = request.matchdict['nodossier']
|
||||
nolig = request.matchdict['nolig']
|
||||
url = request.route_url("suivi_edit", nodossier=nodossier, nolig=nolig)
|
||||
|
||||
message = ''
|
||||
if nolig == '0':
|
||||
# nouveau
|
||||
suivi = {}
|
||||
suivi['COMMENT'] = ''
|
||||
suivi['COMMENTVI'] = ''
|
||||
suivi['USERMAJ'] = logged_in.upper()
|
||||
suivi['DATEMAJ'] = datetime.now()
|
||||
page_title= 'Nouveau suivi'
|
||||
else:
|
||||
# lire le suivi
|
||||
suivi = get_dossier_rdv_by_no(request, nodossier, nolig)
|
||||
if not suivi:
|
||||
request.session.flash(u"Suivi non trouvé : %s" % nodossier, 'warning')
|
||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||
|
||||
page_title= u"Modification du suivi %s" % (nolig)
|
||||
|
||||
if 'form.submitted' in request.params:
|
||||
new_values = {}
|
||||
for param, db_value in suivi.items():
|
||||
if param in request.params and request.params[param] != db_value:
|
||||
new_values[param] = request.params[param]
|
||||
|
||||
if new_values:
|
||||
new_values['USERMAJ'] = logged_in.upper()
|
||||
new_values['DATE'] = date.today()
|
||||
|
||||
update_suivi(request, nodossier, nolig, new_values)
|
||||
request.session.flash(u"Le suivi a été mis à jour avec succès.", 'success')
|
||||
|
||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||
|
||||
if 'form.deleted' in request.params:
|
||||
delete_rdv(request, nodossier, nolig)
|
||||
request.session.flash(u"Le suivi a été supprimé avec succès.", 'success')
|
||||
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
|
||||
|
||||
return {
|
||||
'page_title': page_title,
|
||||
'url': url,
|
||||
'nodossier': nodossier,
|
||||
'nolig': nolig,
|
||||
'suivi': suivi,
|
||||
'message': message,
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user