retrait de PDF

diff --git a/buildout.cfg b/buildout.cfg
index 4f47352..22dfa48 100644 (file)
--- a/buildout.cfg
+++ b/buildout.cfg
@@ -22,10 +22,12 @@ eggs =
     django-reversion
     simplejson
     django-ajax-selects
     django-reversion
     simplejson
     django-ajax-selects

-    reportlab
-    html5lib
-    pyPDF
-    pisa
+# LA PROD ne dispose que de reportlab 2.1, incompatible avec
+# les versions de pisa assez évoluées pour un bon rendu.
+#    reportlab
+#    html5lib
+#    pyPDF
+#    pisa

 
 [versions]
 django-admin-tools = 0.4.0
 
 [versions]
 django-admin-tools = 0.4.0

@@ -36,10 +38,11 @@ auf.django.auth = 0.5.2dev
 django-reversion = 1.3.3
 auf.django.workflow = 0.10dev
 django-ajax-selects = 1.1.4
 django-reversion = 1.3.3
 auf.django.workflow = 0.10dev
 django-ajax-selects = 1.1.4

-reportlab = 2.5
-html5lib = 0.90
-pyPDF = 1.13
-pisa = 3.0.33
+
+#reportlab = 2.5
+#html5lib = 0.90
+#pyPDF = 1.13
+#pisa = 3.0.33

 
 [django] 
 recipe = auf.recipe.django
 
 [django] 
 recipe = auf.recipe.django

diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html
index 077910a..65801c4 100644 (file)
--- a/project/dae/templates/dae/embauche_consulter.html
+++ b/project/dae/templates/dae/embauche_consulter.html
@@ -11,7 +11,7 @@
 
 {% block main %}
 <h1 class="gauche">Demandes d'autorisation d'engagement de personnel</h1>
 
 {% block main %}
 <h1 class="gauche">Demandes d'autorisation d'engagement de personnel</h1>

-<a class="droite bouton-action" target="_blank" href="?mode=pdf">PDF</a>
+<a class="droite bouton-action" target="_blank" href="?mode=vpdf">Format impression</a>

 <a class="droite bouton-action" href="{% url embauche dossier.poste.key dossier.id %}">Modifier</a>
 <div class="visualClear"></div>
 
 <a class="droite bouton-action" href="{% url embauche dossier.poste.key dossier.id %}">Modifier</a>
 <div class="visualClear"></div>
 

diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html
index 5e01b74..c0cdb1a 100644 (file)
--- a/project/dae/templates/dae/poste_consulter.html
+++ b/project/dae/templates/dae/poste_consulter.html
@@ -14,7 +14,7 @@ Demande d'autorisation d'embauche
 {% block main %}
 
 <h1 class="gauche">Demande d'autorisation de création de poste</h1>
 {% block main %}
 
 <h1 class="gauche">Demande d'autorisation de création de poste</h1>

-<a class="droite bouton-action" target="_blank" href="?mode=pdf">PDF</a>
+<a class="droite bouton-action" target="_blank" href="?mode=vpdf">Format impression</a>

 <a class="droite bouton-action" href="{% url poste poste.key %}">Modifier</a>
 <div class="visualClear"></div>
 
 <a class="droite bouton-action" href="{% url poste poste.key %}">Modifier</a>
 <div class="visualClear"></div>
 

diff --git a/project/dae/views.py b/project/dae/views.py
index dc07e68..33e3bbb 100644 (file)
--- a/project/dae/views.py
+++ b/project/dae/views.py
@@ -17,7 +17,6 @@ from django.contrib import messages
 from django.conf import settings
 
 from reversion.models import Version
 from django.conf import settings
 
 from reversion.models import Version

-import ho.pisa as pisa

 
 from project.dae import models as dae
 from project.rh_v1 import models as rh
 
 from project.dae import models as dae
 from project.rh_v1 import models as rh

@@ -30,8 +29,6 @@ from decorators import dae_groupe_requis, \
                        poste_est_modifiable
 from forms import *
 
                        poste_est_modifiable
 from forms import *
 

-pisa.showLogging()
-

 def devises():
     liste = []
     for d in rh.Devise.objects.all():
 def devises():
     liste = []
     for d in rh.Devise.objects.all():

@@ -50,6 +47,8 @@ def reponse_pdf(template_src, context_dict):
     """
     Générer une réponse HTTP avec un PDF
     """
     """
     Générer une réponse HTTP avec un PDF
     """

+    import ho.pisa as pisa
+    pisa.showLogging()

     css = ""
     for f in ('css/pdf.css', 'css/dae.css'):
         css_file = os.path.join(settings.MEDIA_ROOT, f)
     css = ""
     for f in ('css/pdf.css', 'css/dae.css'):
         css_file = os.path.join(settings.MEDIA_ROOT, f)