From 1906ecd7d8f21dc276d15dda925d015eaa00b002 Mon Sep 17 00:00:00 2001 From: Phuoc CAO Date: Wed, 19 Jun 2019 12:00:24 +0200 Subject: [PATCH] ajout pdfkit dans production --- development.ini | 2 +- mondumas/layout.py | 10 +++-- mondumas/static/css/style.less | 41 +++++++++++++++++++++ mondumas/templates/dossier/rdf_view.pt | 11 +++++- mondumas/templates/layouts/global_layout.pt | 2 +- mondumas/views/dossier.py | 37 +++++++++++-------- 6 files changed, 80 insertions(+), 23 deletions(-) diff --git a/development.ini b/development.ini index b1a0ec8..26026d7 100644 --- a/development.ini +++ b/development.ini @@ -22,7 +22,7 @@ pyramid.includes = sqlalchemy.url = mysql://phuoc:phuoc!@localhost/bddevfac?charset=utf8 # sqlalchemy.url = mysql://root:cni/@srvbd/bddevfac?charset=utf8 -mondumas.admin_email = ctphuoc@bbox.fr +mondumas.admin_email = phuoc@caotek.fr mondumas.devfac_url = mondumas:static/DEVFAC/ mondumas.devfac_dir = /DEVFAC14/DOCS_ATTACHES diff --git a/mondumas/layout.py b/mondumas/layout.py index 18c032e..26c42cb 100644 --- a/mondumas/layout.py +++ b/mondumas/layout.py @@ -49,9 +49,13 @@ class GlobalLayout(object): def isWebPage(self): # test view name - if self.request.matched_route.name == 'rdf_rapport': - # oui, page PDF - return False + if self.request.matched_route: + if self.request.matched_route.name == 'rdf_rapport': + # oui, page PDF + return False + else: + # non, page web + return True else: # non, page web return True diff --git a/mondumas/static/css/style.less b/mondumas/static/css/style.less index d72b595..959ff70 100644 --- a/mondumas/static/css/style.less +++ b/mondumas/static/css/style.less @@ -181,4 +181,45 @@ width: 350px; height: 150px; padding: 20px; +} + +.gly-spin { + -webkit-animation: spin 2s infinite linear; + -moz-animation: spin 2s infinite linear; + -o-animation: spin 2s infinite linear; + animation: spin 2s infinite linear; +} +@-moz-keyframes spin { + 0% { + -moz-transform: rotate(0deg); + } + 100% { + -moz-transform: rotate(359deg); + } +} +@-webkit-keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + } +} +@-o-keyframes spin { + 0% { + -o-transform: rotate(0deg); + } + 100% { + -o-transform: rotate(359deg); + } +} +@keyframes spin { + 0% { + -webkit-transform: rotate(0deg); + transform: rotate(0deg); + } + 100% { + -webkit-transform: rotate(359deg); + transform: rotate(359deg); + } } \ No newline at end of file diff --git a/mondumas/templates/dossier/rdf_view.pt b/mondumas/templates/dossier/rdf_view.pt index e7155c5..7743cf8 100644 --- a/mondumas/templates/dossier/rdf_view.pt +++ b/mondumas/templates/dossier/rdf_view.pt @@ -351,8 +351,8 @@
Aperçu PDF - + Générer Facture @@ -366,6 +366,13 @@
+ + - + diff --git a/mondumas/views/dossier.py b/mondumas/views/dossier.py index 4f86871..34ae9d0 100644 --- a/mondumas/views/dossier.py +++ b/mondumas/views/dossier.py @@ -575,25 +575,30 @@ def rdf_view(request): path = '%s/%s/%s/%s' % (request.registry.settings['mondumas.devfac_dir'], 'PL', rapport.nochantier, norapport) os.makedirs(path, exist_ok=True) # générer le rapport en PDF - filename = "PL-DD%s-rapport_RDF_no_%s.PDF" % (str(rapport.nochantier), norapport) + filename = "PL-DD%s-rapport_RDF_no_%s.pdf" % (str(rapport.nochantier), norapport) 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"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) - # si generation pdf, maj de la date du rapport - new_values = {} - new_values['date_rapport'] = date.today() - update_rapport(request, nodossier, rapport.date_inter.strftime('%Y-%m-%d'), new_values) - request.session.flash(u"Le rapport a été génré avec succès.", 'success') - return HTTPFound(location=request.route_url('dossier_view', nodossier=nodossier)) + # developpement ou production + if "smtp.orange" in request.registry.settings["mail.host"] : + origin = 'https://gestion.entreprise-dumas.com/rdf_rapport/%s' % norapport + try: + pdfkit.from_url(origin, dest, options=options) + except: + 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: + origin = request.route_url('rdf_rapport', no_id=norapport) + pdfkit.from_url(origin, dest, configuration=config, options=options) + + insert_dossier_attaches(request, nodossier, 0, filename, '160 Ko', logged_in) + # si generation pdf, maj de la date du rapport + new_values = {} + new_values['date_rapport'] = date.today() + update_rapport(request, nodossier, rapport.date_inter.strftime('%Y-%m-%d'), new_values) + + 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.validate' in request.params: validate_rapport(request, norapport)