fix form poste

[auf_rh_dae.git] / project / dae / forms.py

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 1ddd859..7618371 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -1,13 +1,64 @@
 # -*- encoding: utf-8 -*-
 
 # -*- encoding: utf-8 -*-
 

+from django.db.models import Q

 from django import forms
 from django.forms.models import inlineformset_factory
 from django.contrib.admin import widgets as admin_widgets 
 from django import forms
 from django.forms.models import inlineformset_factory
 from django.contrib.admin import widgets as admin_widgets 

+from ajax_select.fields import AutoCompleteSelectField

 from auf.django.workflow.forms import WorkflowFormMixin
 from datamaster_modeles import models as ref
 from auf.django.workflow.forms import WorkflowFormMixin
 from datamaster_modeles import models as ref

-

 from dae import models as dae
 from dae import models as dae

+from utils import get_employe_from_user, is_user_dans_service

 from rh_v1 import models as rh
 from rh_v1 import models as rh

+from workflow import grp_drh
+
+def _implantation_choices(obj, request):
+    # TRAITEMENT NORMAL
+    employe = get_employe_from_user(request.user)
+    # SERVICE
+    if is_user_dans_service(request.user):
+        q = Q(**{ 'id' : employe.implantation_id })
+    # REGION
+    else:
+        q = Q(**{ 'region' : employe.implantation.region })
+
+    # TRAITEMENT DRH
+    if grp_drh in request.user.groups.all():
+        q = Q()
+    return [('', '----------')] + [(i.id, unicode(i), )for i in ref.Implantation.objects.filter(q)]
+
+def _employe_choices(obj, request):
+    q = Q(id_rh__isnull=True) & Q(id_rh__isnull=True)
+
+    # TRAITEMENT NORMAL
+    employe = get_employe_from_user(request.user)
+    # SERVICE
+    if is_user_dans_service(request.user):
+        q_region_service = Q(implantation1=employe.implantation) | Q(implantation2=employe.implantation)
+    # REGION
+    else:
+        q_region_service = Q(implantation1__region=employe.implantation.region) | Q(implantation2__region=employe.implantation.region) 
+    # TRAITEMENT DRH
+    if grp_drh in request.user.groups.all():
+        q_region_service = Q()
+
+    # Construction de la liste des employés en puisant dans DAE (pas d'info) et dans rh_v1
+    # Pour le filtrage par région/service, on est obligé d'aller regarder le dossier rh_v1
+    # car l'information dans le modèle rh_v1.Employe n'existe pas.
+    dae_ = dae.Employe.objects.filter(id_rh__isnull=True)
+    copies = dae.Employe.objects.filter(Q(id_rh__isnull=False))
+    id_copies = [p.id_rh_id for p in copies.all()]
+    employes_ids = list(set([d.employe_id for d in rh.Dossier.objects.filter(q_region_service)]))
+    rhv1 = rh.Employe.objects.filter(id__in=employes_ids).exclude(id__in=id_copies)
+
+    def option_label(employe):
+        return "%s %s" % (employe.nom.upper(), employe.prenom.title())
+
+    return [('', 'Nouvel employé')] + \
+           sorted([('dae-%s' % p.id, option_label(p)) for p in dae_ | copies] +
+                  [('rh-%s' % p.id, option_label(p)) for p in rhv1],
+                  key=lambda t: t[1])
+

 
 def label_poste_display(poste):
     """Formate un visuel pour un poste dans une liste déroulante"""
 
 def label_poste_display(poste):
     """Formate un visuel pour un poste dans une liste déroulante"""

@@ -67,19 +118,7 @@ class JustificationAutreEmployeForm(inlineformset_factory(dae.Dossier,
                 j.save()
         super(self.__class__, self).__init__(*args, **kwargs)
 
                 j.save()
         super(self.__class__, self).__init__(*args, **kwargs)
 

-class PosteValidationForm(forms.ModelForm):
-    """ Validation d'un poste"""
-    class Meta:
-        model = dae.Poste
-        fields = (
-            'validation_bureau_regional',
-            'validation_drh',
-            'validation_secretaire_general',
-            'validation_recteur',
-            )    
-
-from ajax_select.fields import AutoCompleteSelectField
-class PosteForm(WorkflowFormMixin):
+class PosteForm(forms.ModelForm):

     """ Formulaire des postes. """
     
     
     """ Formulaire des postes. """
     
     

@@ -101,7 +140,6 @@ class PosteForm(WorkflowFormMixin):
                   'comp_ong_min', 'comp_ong_max',
                   'comp_autre_min', 'comp_autre_max',
                   'justification',
                   'comp_ong_min', 'comp_ong_max',
                   'comp_autre_min', 'comp_autre_max',
                   'justification',

-                  'etat',

                   )
         widgets = dict(appel=forms.RadioSelect(),
                        nom=forms.TextInput(attrs={'size': 60},),
                   )
         widgets = dict(appel=forms.RadioSelect(),
                        nom=forms.TextInput(attrs={'size': 60},),

@@ -135,8 +173,10 @@ class PosteForm(WorkflowFormMixin):
         car le "id" de chaque choix est spécial (voir _poste_choices).
 
         """
         car le "id" de chaque choix est spécial (voir _poste_choices).
 
         """

+        request = kwargs.pop('request')

         super(PosteForm, self).__init__(*args, **kwargs)
         super(PosteForm, self).__init__(*args, **kwargs)

-        self.fields['poste'].choices = self._poste_choices()
+        self.fields['poste'].choices = self._poste_choices(request)
+        self.fields['implantation'].choices = _implantation_choices(self, request)

 
         # Quand le dae.Poste n'existe pas, on recherche dans les dossiers rhv1
         if self.instance and self.instance.id is None:
 
         # Quand le dae.Poste n'existe pas, on recherche dans les dossiers rhv1
         if self.instance and self.instance.id is None:

@@ -146,17 +186,17 @@ class PosteForm(WorkflowFormMixin):
                 self.initial['nom'] = "%s %s" % (self.initial['nom'], self.instance.get_complement_nom())
 
 
                 self.initial['nom'] = "%s %s" % (self.initial['nom'], self.instance.get_complement_nom())
 
 

-    def _poste_choices(self):
+    def _poste_choices(self, request):

         """ Menu déroulant pour les postes.
 
         Constitué des postes de dae et des postes de rh_v1 qui n'ont pas
         d'équivalent dans dae.
 
         """
         """ Menu déroulant pour les postes.
 
         Constitué des postes de dae et des postes de rh_v1 qui n'ont pas
         d'équivalent dans dae.
 
         """

-        dae_ = dae.Poste.objects.filter(actif=True, id_rh__isnull=True)
-        copies = dae.Poste.objects.exclude(id_rh__isnull=True)
+        dae_ = dae.Poste.objects.ma_region_ou_service(request.user).filter(actif=True, id_rh__isnull=True)
+        copies = dae.Poste.objects.ma_region_ou_service(request.user).exclude(id_rh__isnull=True)

         id_copies = [p.id_rh_id for p in copies.all()]
         id_copies = [p.id_rh_id for p in copies.all()]

-        rhv1 = rh.Poste.objects.filter(actif=True).exclude(id__in=id_copies)
+        rhv1 = rh.Poste.objects.ma_region_ou_service(request.user).filter(actif=True).exclude(id__in=id_copies)

         # Optimisation de la requête
         rhv1 = rhv1.select_related(depth=1)
 
         # Optimisation de la requête
         rhv1 = rhv1.select_related(depth=1)
 

@@ -203,14 +243,14 @@ class ChoosePosteForm(forms.ModelForm):
     # La liste des choix est laissée vide. Voir PosteForm.__init__.
     poste = forms.ChoiceField(choices=(), required=False)
 
     # La liste des choix est laissée vide. Voir PosteForm.__init__.
     poste = forms.ChoiceField(choices=(), required=False)
 

-    def __init__(self, *args, **kwargs):
+    def __init__(self, request=None, *args, **kwargs):

         super(ChoosePosteForm, self).__init__(*args, **kwargs)
         super(ChoosePosteForm, self).__init__(*args, **kwargs)

-        self.fields['poste'].choices = self._poste_choices()
+        self.fields['poste'].choices = self._poste_choices(request)

 
 

-    def _poste_choices(self):
+    def _poste_choices(self, request):

         """ Menu déroulant pour les postes. """
         """ Menu déroulant pour les postes. """

-        dae_ = dae.Poste.objects.filter(id_rh__isnull=True)
-        copies = dae.Poste.objects.exclude(id_rh__isnull=True)
+        dae_ = dae.Poste.objects.ma_region_ou_service(request.user).filter(id_rh__isnull=True)
+        copies = dae.Poste.objects.ma_region_ou_service(request.user).exclude(id_rh__isnull=True)

         id_copies = [p.id_rh_id for p in copies.all()]
 
         return [('', '----------')] + \
         id_copies = [p.id_rh_id for p in copies.all()]
 
         return [('', '----------')] + \

@@ -227,32 +267,31 @@ class EmployeForm(forms.ModelForm):
     # La liste des choix est laissée vide. Voir Poste.__init__ pour la raison.
     employe = forms.ChoiceField(choices=(), required=False)
 
     # La liste des choix est laissée vide. Voir Poste.__init__ pour la raison.
     employe = forms.ChoiceField(choices=(), required=False)
 

-    def __init__(self, *args, **kwargs):
+    def __init__(self, request, *args, **kwargs):

         """ Mise à jour dynamique du contenu du menu des employés. """
         super(EmployeForm, self).__init__(*args, **kwargs)
         """ Mise à jour dynamique du contenu du menu des employés. """
         super(EmployeForm, self).__init__(*args, **kwargs)

-        self.fields['employe'].choices = self._employe_choices()
+        self.fields['employe'].choices = _employe_choices(self, request)

 
 

-    def _employe_choices(self):
-        """ Menu déroulant pour les employés. """
-        dae_ = dae.Employe.objects.filter(id_rh__isnull=True)
-        copies = dae.Employe.objects.exclude(id_rh__isnull=True)
-        id_copies = [p.id_rh_id for p in copies.all()]
-        rhv1 = rh.Employe.objects.exclude(id__in=id_copies)
-
-        def option_label(employe):
-            return "%s %s" % (employe.nom.upper(), employe.prenom.title())
-
-        return [('', 'Nouvel employé')] + \
-               sorted([('dae-%s' % p.id, option_label(p)) for p in dae_ | copies] +
-                      [('rh-%s' % p.id, option_label(p)) for p in rhv1],
-                      key=lambda t: t[1])

 
 
 class DossierForm(forms.ModelForm):
     """ Formulaire des dossiers. """
     class Meta:
 
 
 class DossierForm(forms.ModelForm):
     """ Formulaire des dossiers. """
     class Meta:

+        exclude= ('etat', )

         model = dae.Dossier
         widgets = dict(statut_residence=forms.RadioSelect(),
                        contrat_date_debut=admin_widgets.AdminDateWidget(),
                        contrat_date_fin=admin_widgets.AdminDateWidget(),
                     )
         model = dae.Dossier
         widgets = dict(statut_residence=forms.RadioSelect(),
                        contrat_date_debut=admin_widgets.AdminDateWidget(),
                        contrat_date_fin=admin_widgets.AdminDateWidget(),
                     )

+
+class PosteWorkflowForm(WorkflowFormMixin):
+    
+    class Meta:
+        fields = ('etat', )
+        model = dae.Poste
+
+class DossierWorkflowForm(WorkflowFormMixin):
+    
+    class Meta:
+        fields = ('etat', )
+        model = dae.Dossier