From 498881f4ae1589834fe37eef50c61dacf8badc65 Mon Sep 17 00:00:00 2001 From: davin baragiotta Date: Tue, 5 Apr 2011 18:31:56 -0400 Subject: [PATCH] ergonomie de base #1382 --- project/dae/models.py | 6 +++--- project/dae/templates/dae/index.html | 25 +++++++++++++++++++++---- project/dae/templates/dae/poste.html | 14 +++++++++----- project/dae/urls.py | 7 ++++--- project/dae/views.py | 7 +++++++ project/rh/templates/rh/index.html | 19 +++++++++++++------ project/templates/menu.html | 4 ++-- project/urls.py | 5 +---- 8 files changed, 60 insertions(+), 27 deletions(-) diff --git a/project/dae/models.py b/project/dae/models.py index 52e3db1..4573ce2 100644 --- a/project/dae/models.py +++ b/project/dae/models.py @@ -44,12 +44,12 @@ class PosteManager(models.Manager): class Poste(models.Model): # Modèle existant id_rh = models.ForeignKey(rh.Poste, null=True, related_name='+', - editable=False) - nom = models.CharField(max_length=255) + editable=False, verbose_name="Mise à jour du poste") + nom = models.CharField(max_length=255, verbose_name="Nom du poste") implantation = models.ForeignKey(ref.Implantation) type_poste = models.ForeignKey(rh.TypePoste, null=True, related_name='+') service = models.ForeignKey(rh.Service, related_name='+') - responsable = models.ForeignKey(rh.Poste, related_name='+') + responsable = models.ForeignKey(rh.Poste, related_name='+', verbose_name="Poste du responsable") regime_travail = models.DecimalField(max_digits=12, decimal_places=2, default=100) regime_travail_nb_heure_semaine = models.DecimalField(max_digits=12, diff --git a/project/dae/templates/dae/index.html b/project/dae/templates/dae/index.html index d91941f..da12da4 100644 --- a/project/dae/templates/dae/index.html +++ b/project/dae/templates/dae/index.html @@ -1,9 +1,26 @@ {% extends 'base.html' %} -{% block title %} - Autorisation d'embauche -{% endblock %} +{% block title %}RH - DAE{% endblock %} +{% block titre %}Ressources humaines{% endblock %} +{% block sous_titre %}Demande d'autorisation d'embauche{% endblock %} {% block main %} - Poste +

Demande d'autorisation d'embauche (DAE)

+ +

+Ce module vous permet la gestion de deux types de demandes : +

+ +

Demandes d'autorisation de création de poste

+ + +

Demandes d'autorisation d'engagement de personnel

+ + {% endblock %} diff --git a/project/dae/templates/dae/poste.html b/project/dae/templates/dae/poste.html index 4784db9..c230531 100644 --- a/project/dae/templates/dae/poste.html +++ b/project/dae/templates/dae/poste.html @@ -1,5 +1,9 @@ {% extends 'base.html' %} +{% block title %}RH - DAE{% endblock %} +{% block titre %}Ressources humaines{% endblock %} +{% block sous_titre %}Demande d'autorisation d'embauche{% endblock %} + {% block extrahead %} @@ -9,19 +13,19 @@ rel="stylesheet" /> {% endblock %} -{% block title %} - Formulaire poste -{% endblock %} - {% block main %} +

Demande d'autorisation de création de poste

+ +

{% if new %} Nouveau poste {% else %} - Poste + Mise à jour du poste : {{ poste }} {% endif %}

+
{{ form.as_table }} diff --git a/project/dae/urls.py b/project/dae/urls.py index 25f2708..d6674c9 100644 --- a/project/dae/urls.py +++ b/project/dae/urls.py @@ -3,10 +3,11 @@ from django.conf.urls.defaults import patterns, url urlpatterns = patterns( 'project.dae.views', - (r'^$', 'index'), + url(r'^$', 'index', name='dae_index'), url(r'^poste/(?P.*)/financement$', 'financement', name='financement'), url(r'^poste/(?P.*)/financement/(?P\d*)$', 'financement', name='financement'), - url(r'^poste$', 'poste', name='poste'), - url(r'^poste/(?P.*)$', 'poste', name='poste'), + url(r'^postes$', 'postes_liste', name='dae_postes_liste'), + url(r'^poste/soumettre$', 'poste', name='poste'), + url(r'^poste/soumettre/(?P.*)$', 'poste', name='poste'), ) diff --git a/project/dae/views.py b/project/dae/views.py index fda10e9..f463e74 100644 --- a/project/dae/views.py +++ b/project/dae/views.py @@ -52,6 +52,13 @@ def poste(request, key=None): return render_to_response('dae/poste.html', vars, RequestContext(request)) +def postes_liste(request): + """ Liste des postes + """ + postes = dae.Poste.objects.all() + vars = dict() + vars['postes'] = postes + return render_to_response('dae/postes_liste.html', vars, RequestContext(request)) def financement(request, key=None, id=None): """ Formulaire pour une source de financement pour un poste. """ diff --git a/project/rh/templates/rh/index.html b/project/rh/templates/rh/index.html index 51aebfc..20c5de5 100644 --- a/project/rh/templates/rh/index.html +++ b/project/rh/templates/rh/index.html @@ -1,14 +1,21 @@ {% extends 'base.html' %} -{% block title %}Ressources humaines{% endblock %} +{% block title %}RH{% endblock %} +{% block titre %}Ressources humaines{% endblock %} +{% block sous_titre %}Accueil{% endblock %} -{% block content %} -

Gestion des ressources humaines

- -

Autorisation d'embauche

+{% block main %} +

Ressources humaines

+

+L'ensemble des applications RH sera regroupé dans ce système de gestion des ressources humaines (SGRH). +

+

+Voici les modules actuellement disponibles : +

{% endblock %} + diff --git a/project/templates/menu.html b/project/templates/menu.html index cbbeac9..37f1b87 100644 --- a/project/templates/menu.html +++ b/project/templates/menu.html @@ -1,6 +1,6 @@ {% load auf_menu %} diff --git a/project/urls.py b/project/urls.py index 2c1364e..d8e2d04 100644 --- a/project/urls.py +++ b/project/urls.py @@ -9,14 +9,11 @@ handler500 # Pyflakes urlpatterns = patterns( '', - ######## page d'accueil de demo ###### - (r'^$', 'auf.django.skin.views.demo'), - ###################################### url(r'^admin_tools/', include('admin_tools.urls')), (r'^admin/', include(admin.site.urls)), - (r'^dae/', include('project.dae.urls')), (r'^connexion/$', 'django.contrib.auth.views.login'), (r'^deconnexion/$', 'django.contrib.auth.views.logout'), + (r'^dae/', include('project.dae.urls')), (r'^', include('project.rh.urls')), ) -- 1.7.10.4