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

améliorer le rapport de RDF

Browse Source
This commit is contained in:
Phuoc
2019-04-19 16:49:48 +02:00
parent 5dde12849f
commit e3c62af198
13 changed files with 295 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mondumas/views/dossier.py
View File

@@ -427,6 +427,7 @@ def rdf_edit(request):
elements_clos = get_rdf_causes(request, 'C05')
elements_couvert = get_rdf_causes(request, 'C06')
voisins = get_rdf_causes(request, 'C07')
tierce_personnes = get_rdf_causes(request, 'C08')
if 'form.submitted' in request.params:
new_values = {}
@@ -502,6 +503,7 @@ def rdf_edit(request):
'elements_clos': elements_clos,
'elements_couvert': elements_couvert,
'voisins':voisins,
'tierce_personnes': tierce_personnes,
}
@view_config(route_name='rdf_list', renderer='../templates/dossier/rdf_list.pt', permission='view')
@@ -560,10 +562,11 @@ def rdf_view(request):
dest = "mondumas/static/DEVFAC/DOCS_ATTACHES/PL/%s/%s" % (str(rapport.nochantier), filename)
origin = request.route_url('rdf_rapport', no_id=norapport)
config = pdfkit.configuration(wkhtmltopdf="C:\\Program Files\\wkhtmltopdf\\bin\\wkhtmltopdf.exe")
# import pdb;pdb.set_trace()
try:
pdfkit.from_url(origin, dest, configuration=config, options=options)
except:
request.session.flash(u"Une erreur est survenue pendant la génération du PDF.", 'danger')
request.session.flash(u"Erreur de génération du PDF. Pensez à créer le lien static/DEVFAC", 'danger')
return HTTPFound(location=request.route_url('rdf_view', no_id=norapport))
else:
insert_dossier_attaches(request, nodossier, 0, filename, '160 Ko', logged_in)
@@ -575,9 +578,15 @@ def rdf_view(request):
request.session.flash(u"Le rapport a été génré avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
if 'form.delete' in request.params:
delete_rapport(request, norapport)
request.session.flash(u"Le rapporta été supprimé avec succès.", 'success')
return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier))
return {
'page_title': "Dossier %s : Rapport no %s du %s" % (nodossier, norapport, rapport.date_inter.strftime('%d-%m-%Y')),
'page_title': "Rapport no %s du %s" % (norapport, rapport.date_inter.strftime('%d-%m-%Y')),
'url': url,
'pt_name': 'rdf_view',
'logged_in': logged_in,
'rapport': rapport,
'nodossier': nodossier,
@@ -588,7 +597,7 @@ def rdf_view(request):
'docs_url': request.static_url(request.registry.settings['mondumas.devfac_url']),
}
@view_config(route_name='rdf_rapport', renderer='../templates/dossier/rdf_rapport.pt')
@view_config(route_name='rdf_rapport', renderer='../templates/dossier/rdf_view.pt')
def rdf_rapport(request):
norapport = request.matchdict['no_id']
@@ -605,6 +614,8 @@ def rdf_rapport(request):
return {
'page_title': '',
'url': '',
'pt_name': 'rdf_rapport',
'rapport': rapport,
'nodossier': nodossier,
'nochantier': rapport.nochantier,