From 64af14192cdf68d9b3d545c0f83d7e3ff41b10d4 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Fri, 18 Nov 2011 14:41:06 -0500 Subject: [PATCH] =?utf8?q?[#2313]=20Utiliser=20la=20m=C3=AAme=20page=20HTML=20?= =?utf8?q?pour=20l'affichage=20=C3=A0=20l'=C3=A9cran=20et=20l'impression?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- buildout.cfg | 11 -- project/dae/templates/dae/embauche_consulter.html | 12 +- project/dae/templates/dae/embauche_pdf.html | 153 --------------------- project/dae/templates/dae/poste_consulter.html | 11 +- project/dae/templates/dae/poste_pdf.html | 41 ------ project/dae/views.py | 38 +---- project/media/css/dae.css | 1 + project/media/css/pdf.css | 34 ----- project/media/css/print.css | 29 ++++ 9 files changed, 51 insertions(+), 279 deletions(-) delete mode 100644 project/dae/templates/dae/embauche_pdf.html delete mode 100644 project/dae/templates/dae/poste_pdf.html delete mode 100644 project/media/css/pdf.css create mode 100644 project/media/css/print.css diff --git a/buildout.cfg b/buildout.cfg index 522bf3c..e79f25e 100644 --- a/buildout.cfg +++ b/buildout.cfg @@ -24,13 +24,6 @@ eggs = django-ajax-selects django-sendfile -# 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 django = 1.2.5 @@ -41,10 +34,6 @@ django-reversion = 1.3.3 auf.django.workflow = 0.14dev django-ajax-selects = 1.1.4 django-sendfile = 0.2.1 -#reportlab = 2.5 -#html5lib = 0.90 -#pyPDF = 1.13 -#pisa = 3.0.33 [django] recipe = auf.recipe.django diff --git a/project/dae/templates/dae/embauche_consulter.html b/project/dae/templates/dae/embauche_consulter.html index 92fa228..adc5fbe 100644 --- a/project/dae/templates/dae/embauche_consulter.html +++ b/project/dae/templates/dae/embauche_consulter.html @@ -7,11 +7,12 @@ {% block extrahead %} + {% endblock %} {% block main %}

Demande d'autorisation d'engagement de personnel

-Format impression +Impression {% if dossier|est_editable:request.user %} Modifier {% endif %} @@ -181,14 +182,21 @@ {% endfor %} +

Votre validation (ou commentaire)

Ce dossier est actuellement à l'état {{ dossier.get_etat_display }}.

- {% if validationForm.get_etats_disponibles %}{{ validationForm.commentaire }}{% endif %}
{{ validationForm.get_input_etats_as_buttons|safe }}
+
+

Signatures

+

____________________________________________________________

+

____________________________________________________________

+

____________________________________________________________

+
+ {% endblock %} diff --git a/project/dae/templates/dae/embauche_pdf.html b/project/dae/templates/dae/embauche_pdf.html deleted file mode 100644 index 7f4a0cb..0000000 --- a/project/dae/templates/dae/embauche_pdf.html +++ /dev/null @@ -1,153 +0,0 @@ -{% load dae %} - - - - - - - - - -

Demande d'autorisation d'engagement de personnel

- -

SECTION 1 - POSTE

-{% with dossier.poste as poste %} -{% include 'dae/poste_resume.html' %} -{% endwith %} - -

SECTION 2 - PERSONNEL ENGAGÉ

-
-
-

Personne

-
- - - - - - -
Mobilité interne{% if dossier.mobilite_interne %}oui{% else %}non{% endif %} -
-
-
-
- - - - - - - -
Employé{{ dossier.employe }}
- -
- -
-

Comparaison salariale

-dans la région pour les employés occupant un poste similaire - - - - - - - - - - {% for dc in dossier.comparaisons.all %} - - - - - - - - {% endfor %} - -
ImplantationEmployéPosteSalaireSalaire EUR
{{ dc.implantation }}{{ dc.personne }}{{ dc.poste }}{{ dc.montant }} {{ dc.devise }}{{ dc.montant_euros }} EUR
-
- - -
- {% comment %}Wrapper du formulaire de dossier{% endcomment %} - {% include "dae/embauche-dossier-consulter.html" %} -
- -
-

Pièces jointes

- - -
- -

SECTION 3 - COÛT GLOBAL

- -
- - {% include 'dae/embauche-remun-consulter.html' %} -
-
- -

SECTION 4 - JUSTIFICATION DE LA DEMANDE (OBLIGATOIRE)

-

A - Justification du poste

-

{{ poste.justification }}

- -

B - Justification de l'employé

- - - - - - - - - -
Nouvel employéRenouvellement, prolongation, reclassement, mobilité interne
-

{{ dossier.justif_nouveau_statut_label }}

- {{ dossier.justif_nouveau_statut|default:"∅" }} -

{{ dossier.justif_nouveau_tmp_remplacement_label }}

- {{ dossier.justif_nouveau_tmp_remplacement|default:"∅" }} -

{{ dossier.justif_nouveau_salaire_label }}

- {{ dossier.justif_nouveau_salaire|default:"∅" }} -

{{ dossier.justif_nouveau_commentaire_label }}

- {{ dossier.justif_nouveau_commentaire|default:"∅" }} - 		-

{{ dossier.justif_rempl_type_contrat_label }}

- {{ dossier.justif_rempl_type_contrat|default:"∅"}} -

{{ dossier.justif_rempl_statut_employe_label }}

- {{ dossier.justif_rempl_statut_employe|default:"∅"}} -

{{ dossier.justif_rempl_evaluation_label }}

- {{ dossier.justif_rempl_evaluation|default:"∅"}} -

{{ dossier.justif_rempl_salaire_label }}

- {{ dossier.justif_rempl_salaire|default:"∅" }} -

{{ dossier.justif_rempl_commentaire_label }}

- {{ dossier.justif_rempl_commentaire|default:"∅" }} -
- -
-

Validations

- - - - - - -{% for commentaire in dossier.historique_desc %} - {% include "dae/ligne_validation.html" %} -{% endfor %} -
ActionCommentaire
-
- -
-

Signatures

- -

____________________________________________________________

-

____________________________________________________________

-

____________________________________________________________

-
- - - diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html index 34ead6b..d8bd89e 100644 --- a/project/dae/templates/dae/poste_consulter.html +++ b/project/dae/templates/dae/poste_consulter.html @@ -7,12 +7,13 @@ {% block extrahead %} + {% endblock %} {% block main %}

Demande d'autorisation de création de poste

-Format impression +Impression {% if poste|est_editable:request.user %}Modifier{% endif %}
@@ -31,10 +32,10 @@ {% endfor %} +

Votre validation

Le poste est actuellement à l'état : {{ poste.get_etat_display }}.

- {% if validationForm.get_etats_disponibles %}{{ validationForm.commentaire }}{% endif %}
@@ -42,5 +43,11 @@
+
+

Signatures

+

____________________________________________________________

+

____________________________________________________________

+

____________________________________________________________

+
{% endblock %} diff --git a/project/dae/templates/dae/poste_pdf.html b/project/dae/templates/dae/poste_pdf.html deleted file mode 100644 index 5290ab6..0000000 --- a/project/dae/templates/dae/poste_pdf.html +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - -

Demande d'autorisation de création de poste

-
- - {% include "dae/poste_resume.html" %} - -
-

Validations

- - - - - - - {% for commentaire in poste.historique_desc %} - {% include "dae/ligne_validation.html" %} - {% endfor %} -
ActionCommentaire
-
- -
-

Signatures

- -

____________________________________________________________

-

____________________________________________________________

-

____________________________________________________________

-
- - - diff --git a/project/dae/views.py b/project/dae/views.py index e011ac8..b631248 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -53,28 +53,6 @@ def devises(): liste.append(data) return liste -def reponse_pdf(template_src, context_dict): - """ - 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 += open(css_file, 'r').read() - context_dict['css'] = css - - template = get_template(template_src) - context = Context(context_dict) - html = template.render(context) - result = StringIO.StringIO() - pdf = pisa.pisaDocument(html, result, encoding='UTF-8') - if not pdf.err: - return HttpResponse(result.getvalue(), mimetype='application/pdf') - return HttpResponse("impossible de générer le pdf! %s" % html) - - @dae_groupe_requis def index(request): return render_to_response('dae/index.html', {}, RequestContext(request)) @@ -105,14 +83,7 @@ def poste_consulter(request, key): 'comparaisons_internes': comparaisons_internes } - mode = request.GET.get('mode', None) - if mode is None: - return render_to_response('dae/poste_consulter.html', vars, RequestContext(request)) - if mode == 'pdf': - return reponse_pdf('dae/poste_pdf.html', vars) - if mode == 'vpdf': - return render_to_response('dae/poste_pdf.html', vars, RequestContext(request)) - + return render_to_response('dae/poste_consulter.html', vars, RequestContext(request)) @dae_groupe_requis @poste_dans_ma_region_ou_service @@ -259,12 +230,7 @@ def embauche_consulter(request, dossier_id): } mode = request.GET.get('mode', None) - if mode is None: - return render_to_response('dae/embauche_consulter.html', vars, RequestContext(request)) - if mode == 'pdf': - return reponse_pdf('dae/embauche_pdf.html', vars) - if mode == 'vpdf': - return render_to_response('dae/embauche_pdf.html', vars, RequestContext(request)) + return render_to_response('dae/embauche_consulter.html', vars, RequestContext(request)) @dae_groupe_requis def embauche_choisir_poste(request): diff --git a/project/media/css/dae.css b/project/media/css/dae.css index 7e15c6c..0ab09a3 100644 --- a/project/media/css/dae.css +++ b/project/media/css/dae.css @@ -18,3 +18,4 @@ h2.section {width:100%; background-color: #D0E8F8; text-align: center; color: #5 .justifications h4 {font-weight: bold; } .pagination { text-align: center; } table.listing { width: 100%; } +.print-only { display: none; } diff --git a/project/media/css/pdf.css b/project/media/css/pdf.css deleted file mode 100644 index 7ea90b3..0000000 --- a/project/media/css/pdf.css +++ /dev/null @@ -1,34 +0,0 @@ -p, ul { margin: 6px 0;} - -body { margin:0; padding:0; background:#fff; color:#454545; font:0.7em verdana, arial, helvetica, sans-serif; } - -h1 { margin:10px 0 0 0; padding:0; color:#d15517; font-size:120%;font-weight:bold; } -h2 { margin:10px 0 0 0; padding:0; color:#5f5f5f; font-size:100%; } -h3 { margin:10px 0 0 0; padding:0; color:#5f5f5f; font-size:90%; } -h4 { margin:10px 0 0 0; padding:0; color:#5f5f5f; font-size:80%; } -h5 { margin:10px 0 0 0; padding:0; background:inherit; color:#5f5f5f; font-size:130%; } - -li {margin-left: 1em; line-height:1.4em; } -p {line-height:1.4em; text-align: justify; } - -a:link, a:visited { color:#0643bb; text-decoration:none; } -a:active { color:#990000; text-decoration:none; } -a:hover { color:#d15517; text-decoration:none; } -a img { border:none; } - -strong {font-weight: bold;} - -form { margin:8px 17px 0 0; padding:0px; } -fieldset {border: none; } -label {font-weight: bold;} - -table { margin:10px 0px; border-collapse:collapse; padding:5px; } -table th, table td{ font-size: 70%; border-top:1px solid #d0e8f8; border-left:1px solid #d0e8f8; padding: 5px; } -table { border-bottom:1px solid #d0e8f8; border-right:1px solid #d0e8f8; } -th { height:28px; border-top:2px solid #d0e8f8; padding:0 10px; background-color:#F8FBFD; font-size:14px; text-align:left; font-weight: bold;} -td { vertical-align: top; } - -.cell-nombre { padding-right:0px; text-align:right; } -.row1, .even {} -.row2, .odd { background-color:#EFEFEF; } -.signature {margin: 36px 0px;} diff --git a/project/media/css/print.css b/project/media/css/print.css new file mode 100644 index 0000000..0f22c3b --- /dev/null +++ b/project/media/css/print.css @@ -0,0 +1,29 @@ +p, ul { margin: 6px 0;} + +* { font-family: Verdana, Arial, Helvetica, sans-serif; } +body { font-size: 8pt; } +#main { padding: 0; } + +h1, h2, h3, h4, h5 { font-weight: bold; } +h1 { font-size: 140%; } +h2 { font-size: 120%; } +h3, h4, h5 { font-size: 100%; } + +li {margin-left: 1em; line-height:1.4em; } +p {line-height:1.4em; text-align: justify; } + +table th, table td { font-size: 100% } +strong {font-weight: bold;} + +fieldset {border: none; } +label {font-weight: bold;} + +.cell-nombre { padding-right:0px; text-align:right; } +.row1, .even {} +.row2, .odd { background-color:#EFEFEF; } +.signature {margin: 36px 0px;} +.info { font-size: 100%; } + +a.bouton-action, #header, #footer, #menu, form { display: none; } + +.print-only { display: block; } -- 1.7.10.4