From 6fcc7644a260e03a9f413d2e6586c6621f5c1448 Mon Sep 17 00:00:00 2001 From: Eric Mc Sween Date: Wed, 16 May 2012 17:12:45 -0400 Subject: [PATCH] [#3134] Importation des postes --- project/dae/templates/dae/poste_consulter.html | 7 ++++++- project/dae/templates/dae/poste_importer.html | 17 +++++++++++++++++ project/dae/urls.py | 2 ++ project/dae/views.py | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 project/dae/templates/dae/poste_importer.html diff --git a/project/dae/templates/dae/poste_consulter.html b/project/dae/templates/dae/poste_consulter.html index 085975b..f698560 100644 --- a/project/dae/templates/dae/poste_consulter.html +++ b/project/dae/templates/dae/poste_consulter.html @@ -14,7 +14,12 @@

Demande d'autorisation de création de poste

Impression -{% if poste|est_editable:request.user %}Modifier{% endif %} +{% if poste|est_editable:request.user %} +Modifier +{% endif %} +{% if not poste.id_rh and perms.rh.change_poste and perms.rh.add_poste %} +Importer +{% endif %}
{% include "dae/poste_resume.html" %} diff --git a/project/dae/templates/dae/poste_importer.html b/project/dae/templates/dae/poste_importer.html new file mode 100644 index 0000000..775214a --- /dev/null +++ b/project/dae/templates/dae/poste_importer.html @@ -0,0 +1,17 @@ +{% extends 'base.html' %} + +{% block title %}RH - DAE - Importation{% endblock %} +{% block titre %}Ressources humaines{% endblock %} +{% block sous_titre %}Demande d'autorisation d'engagement{% endblock %} + +{% block main %} +

Importation d'un poste

+ +

Vous vous apprêtez à importer le poste {{ poste }} dans +le système RH.

+ +
+ + +
+{% endblock %} diff --git a/project/dae/urls.py b/project/dae/urls.py index e2a70ea..951662f 100644 --- a/project/dae/urls.py +++ b/project/dae/urls.py @@ -9,6 +9,8 @@ urlpatterns = patterns( url(r'^postes$', 'postes_liste', name='dae_postes_liste'), url(r'^poste/consulter/(?P.*)$', 'poste_consulter', name='poste_consulter'), + url(r'^poste/importer/(\d+)$', 'poste_importer', + name='poste_importer'), url(r'^poste$', 'poste', name='poste'), url(r'^poste/(?P.*)$', 'poste', name='poste'), url(r'^pieces-postes/(\d+)/(.*)$', 'poste_piece', name='poste_piece'), diff --git a/project/dae/views.py b/project/dae/views.py index 52e237e..9822f54 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -92,6 +92,20 @@ def poste_consulter(request, key): ) +def poste_importer(request, id): + poste_dae = get_object_or_404(dae.Poste, id=id) + if request.method == 'POST': + if 'confirmer' in request.POST: + poste_rh = poste_dae.importer_dans_rh() + return redirect('admin:rh_poste_change', poste_rh.id) + else: + return redirect('poste_consulter', 'dae-' + id) + else: + return render_to_response('dae/poste_importer.html', { + 'poste': poste_dae + }, RequestContext(request)) + + @dae_groupe_requis @poste_dans_ma_region_ou_service @poste_est_modifiable -- 1.7.10.4