Fix for salaire de base bug

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

diff --git a/project/dae/forms.py b/project/dae/forms.py
index e9fa7c5..373099f 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -29,6 +29,20 @@ from .widgets import ReadOnlyChoiceWidget, ReadOnlyWidget
 from project.dae.workflow import POSTE_ETATS_BOUTONS, POSTE_ETAT_FINALISE
 
 
 from project.dae.workflow import POSTE_ETATS_BOUTONS, POSTE_ETAT_FINALISE
 
 

+def filtered_archived_fields_form_factory(*fields):
+    """
+    Retourne un model form 
+    """
+    class FilterArchivedFields(object):
+        def __init__(self, *a, **kw):
+            super(FilterArchivedFields, self).__init__(*a, **kw)
+            for f in fields:
+                self.fields[f].queryset = (
+                    self.fields[f]._queryset.filter(archive=False)
+                    )
+    return FilterArchivedFields
+
+

 class BaseInlineFormSetWithInitial(BaseInlineFormSet):
     """
     Cette classe permet de fournir l'option initial aux inlineformsets.
 class BaseInlineFormSetWithInitial(BaseInlineFormSet):
     """
     Cette classe permet de fournir l'option initial aux inlineformsets.

@@ -96,7 +110,7 @@ class BaseInlineFormSetWithInitial(BaseInlineFormSet):
 def _implantation_choices(obj, request):
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)
 def _implantation_choices(obj, request):
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)

-    q = Q(**{'zone_administrative': employe.implantation.zone_administrative})
+    q = Q(**{'zone_administrative__in': groups.get_zones_from_user(request.user)})

 
     # TRAITEMENT DRH
     user_groupes = [g.name for g in request.user.groups.all()]
 
     # TRAITEMENT DRH
     user_groupes = [g.name for g in request.user.groups.all()]

@@ -111,13 +125,13 @@ def _employe_choices(obj, request):
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)
     q_dae_region_service = Q(
     # TRAITEMENT NORMAL
     employe = groups.get_employe_from_user(request.user)
     q_dae_region_service = Q(

-        poste__implantation__zone_administrative=(
-            employe.implantation.zone_administrative
+        poste__implantation__zone_administrative__in=(
+            groups.get_zones_from_user(request.user)

         )
     )
     q_rh_region_service = Q(
         )
     )
     q_rh_region_service = Q(

-        poste__implantation__zone_administrative=(
-            employe.implantation.zone_administrative
+        poste__implantation__zone_administrative__in=(
+            groups.get_zones_from_user(request.user)

         )
     )
     # TRAITEMENT DRH
         )
     )
     # TRAITEMENT DRH

@@ -212,7 +226,11 @@ FinancementFormSet = inlineformset_factory(
 )
 
 
 )
 
 

-class DossierComparaisonForm(forms.ModelForm):
+class DossierComparaisonForm(
+    filtered_archived_fields_form_factory(
+        'classement',
+        ),
+    forms.ModelForm):

 
     recherche = AutoCompleteSelectField('dossiers', required=False)
     poste = forms.CharField(
 
     recherche = AutoCompleteSelectField('dossiers', required=False)
     poste = forms.CharField(

@@ -232,7 +250,9 @@ DossierComparaisonFormSet = modelformset_factory(
 )
 
 
 )
 
 

-class PosteComparaisonForm(forms.ModelForm):
+class PosteComparaisonForm(
+    filtered_archived_fields_form_factory('classement'),
+    forms.ModelForm):

 
     recherche = AutoCompleteSelectField('dae_postes', required=False)
 
 
     recherche = AutoCompleteSelectField('dae_postes', required=False)
 

@@ -264,7 +284,11 @@ PosteComparaisonFormSet = inlineformset_factory(
 )
 
 
 )
 
 

-class FlexibleRemunForm(forms.ModelForm):
+class FlexibleRemunForm(
+    filtered_archived_fields_form_factory(
+        'type',
+        ),
+    forms.ModelForm):

     # Utilisé dans templats.
     montant_mensuel = forms.DecimalField(required=False)
     montant = forms.DecimalField(required=True, label='Montant annuel')
     # Utilisé dans templats.
     montant_mensuel = forms.DecimalField(required=False)
     montant = forms.DecimalField(required=True, label='Montant annuel')

@@ -351,6 +375,7 @@ class GroupedInlineFormset(BaseInlineFormSet):
                 }
 
         # Assign each form to a group.
                 }
 
         # Assign each form to a group.

+        ungrouped_forms = []

         for form in self.forms:
             if bool(form.initial):
                 grp = group_accessor(form)
         for form in self.forms:
             if bool(form.initial):
                 grp = group_accessor(form)

@@ -361,17 +386,26 @@ class GroupedInlineFormset(BaseInlineFormSet):
                         'forms': [],
                         }
                 self.groups[grp[0]]['forms'].append(form)
                         'forms': [],
                         }
                 self.groups[grp[0]]['forms'].append(form)

+            else:
+                ungrouped_forms.append(form)
+            

     
     

-        # Add extra forms (n extra for each grop).
-        tmp_extras = []
-        for i in xrange(len(self.groups) * self.extra):
-            tmp_extras.insert(0,
-        self._construct_form(self.initial_form_count() + i))
-
+        # Distribuer les extras de django dans les groupes, et ajouter
+        # des extras pour les groupes en nécessitant.
+        f_count = len(self.forms)

         for g in self.groups:
         for g in self.groups:

-            for i in xrange(self.extra):
-                self.groups[g]['forms'].append(tmp_extras.pop())
-            
+            for i in xrange(f_count, f_count + self.extra):
+                if len(ungrouped_forms) == 0:
+                    f_count += 1
+
+                if len(ungrouped_forms) > 0:
+                    new_form = ungrouped_forms.pop()
+                else:
+                    new_form = self._construct_form(i)
+                    self.forms.append(new_form)
+
+                self.groups[g]['forms'].append(new_form)
+                

 
         # Override form choices with the data provided in
         # choice_overrides
 
         # Override form choices with the data provided in
         # choice_overrides

@@ -385,41 +419,6 @@ class GroupedInlineFormset(BaseInlineFormSet):
         # Create an iterable for easier access in template.
         self.group_list = self.groups.values()
 
         # Create an iterable for easier access in template.
         self.group_list = self.groups.values()
 

-    # def set_groups(self, group_accessor, groups, group_order=[]):
-    #     """
-    #     group_accessor: A function that will get the key and name from
-    #     each form.
-    #     group_order: list the group keys here in a list and
-    #     GroupedInlineFormset.groups will be ordered (ordereddict) by
-    #     the key sequence provided here. Any missing key from the
-    #     sequence will 
-    #     """
-
-    #     # Build group list.
-    #     self.groups = OrderedDict()
-    #     temp_groups = {}
-    #     # self.groups_and_forms = []
-    #     for form in self.forms:
-    #         group_key, group_name = group_accessor(form)
-    #         if not temp_groups.has_key(group_key):
-    #             temp_groups[group_key] = {
-    #                 'name': group_name,
-    #                 'key': group_key,
-    #                 'forms': [],
-    #                 }
-    #         temp_groups[group_key]['forms'].append(form)
-
-    #     for order_key in group_order:
-    #         if temp_groups.has_key(order_key):
-    #             self.groups[order_key] = temp_groups.pop(order_key)
-
-    #     for key in temp_groups:
-    #         self.groups[key] = temp_groups[key]
-
-    #     del temp_groups
-            
-    #     self.group_list = self.groups.values()
-

 
 def remun_formset_factory(parent_model,
                           model,
 
 def remun_formset_factory(parent_model,
                           model,

@@ -477,7 +476,11 @@ def remun_formset_factory(parent_model,
     return FormSet
 
 
     return FormSet
 
 

-def remun_formset_factory_factory(read_only=False, parent_model=dae.Dossier, model=dae.Remuneration):
+def remun_formset_factory_factory(
+    read_only=False,
+    parent_model=dae.Dossier,
+    model=dae.Remuneration,
+    exclude_archived=False):

     """
     Don't we love factory factories?
     """
     """
     Don't we love factory factories?
     """

@@ -487,6 +490,13 @@ def remun_formset_factory_factory(read_only=False, parent_model=dae.Dossier, mod
     can_delete = False if read_only else True
     form_class = ReadOnlyRemunForm if read_only else FlexibleRemunForm
 
     can_delete = False if read_only else True
     form_class = ReadOnlyRemunForm if read_only else FlexibleRemunForm
 

+    choice_override_extra_q = {}
+
+    if exclude_archived:
+        choice_override_extra_q.update({
+            'archive': False
+            })
+    

     return remun_formset_factory(
         parent_model,
         model,
     return remun_formset_factory(
         parent_model,
         model,

@@ -494,56 +504,57 @@ def remun_formset_factory_factory(read_only=False, parent_model=dae.Dossier, mod
         extra=extras,
         can_delete=can_delete,
         read_only=read_only,
         extra=extras,
         can_delete=can_delete,
         read_only=read_only,

-        groups = [
-            (u'Traitement', u'Traitement',),
-            (u'Indemnité', u'Indemnité',),
-            (u'Charges', u'Charges',),
-            (u'Accessoire', u'Accessoire',),
-            (u'RAS', u'Rémunération autre source',),
-            ],
+        groups = rh.NATURE_REMUNERATION_CHOICES,

         choice_overrides = {
             u'Traitement': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(
         choice_overrides = {
             u'Traitement': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(

-                        nature_remuneration=u'Traitement').values_list(
+                        nature_remuneration=u'Traitement',
+                        **choice_override_extra_q).values_list(

                         'id', 'nom')
                     )
                 },
             u'Indemnité': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(
                         'id', 'nom')
                     )
                 },
             u'Indemnité': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(

-                        nature_remuneration=u'Indemnité').values_list(
+                        nature_remuneration=u'Indemnité',
+                        **choice_override_extra_q).values_list(

                         'id', 'nom')
                     )
                 },
             u'Charges': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(
                         'id', 'nom')
                     )
                 },
             u'Charges': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(

-                        nature_remuneration=u'Charges').values_list(
+                        nature_remuneration=u'Charges',
+                        **choice_override_extra_q).values_list(

                         'id', 'nom')
                     )
                 },
             u'Accessoire': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(
                         'id', 'nom')
                     )
                 },
             u'Accessoire': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(

-                        nature_remuneration=u'Accessoire').values_list(
+                        nature_remuneration=u'Accessoire',
+                        **choice_override_extra_q).values_list(

                         'id', 'nom')
                     )
                 },
             u'RAS': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(
                         'id', 'nom')
                     )
                 },
             u'RAS': {
                 'type': [null_choice] + list(
                     rh.TypeRemuneration.objects.filter(

-                        nature_remuneration=u'RAS').values_list(
+                        nature_remuneration=u'RAS',
+                        **choice_override_extra_q).values_list(

                         'id', 'nom')
                     )
                 },
                         'id', 'nom')
                     )
                 },

-            }
+            },

         )
 
         )
 

+

 RemunForm = remun_formset_factory_factory(
     read_only=False,
     parent_model=dae.Dossier,
     model=dae.Remuneration,
 RemunForm = remun_formset_factory_factory(
     read_only=False,
     parent_model=dae.Dossier,
     model=dae.Remuneration,

+    exclude_archived=True,

 )
 
 ReadOnlyRemunFormSet = remun_formset_factory_factory(
 )
 
 ReadOnlyRemunFormSet = remun_formset_factory_factory(

@@ -565,7 +576,10 @@ DossierCompReadOnlyRemunFormSet = remun_formset_factory_factory(
     )
 
 
     )
 
 

-class PosteForm(forms.ModelForm):
+class PosteForm(filtered_archived_fields_form_factory(
+        'classement_min',
+        'classement_max',),
+                forms.ModelForm):

     """ Formulaire des postes. """
 
     # On ne propose que les services actifs
     """ Formulaire des postes. """
 
     # On ne propose que les services actifs

@@ -747,7 +761,13 @@ class EmployeForm(forms.ModelForm):
         self.fields['employe'].choices = _employe_choices(self, request)
 
 
         self.fields['employe'].choices = _employe_choices(self, request)
 
 

-class DossierForm(forms.ModelForm):
+class DossierForm(
+    filtered_archived_fields_form_factory(
+        'classement',
+        'classement_anterieur',
+        'classement_titulaire_anterieur',
+        ),
+    forms.ModelForm):

     """ Formulaire des dossiers. """
     class Meta:
         exclude = ('etat', 'employe', 'poste', 'date_debut',)
     """ Formulaire des dossiers. """
     class Meta:
         exclude = ('etat', 'employe', 'poste', 'date_debut',)

@@ -788,23 +808,23 @@ class DossierWorkflowForm(WorkflowFormMixin):
         super(DossierWorkflowForm, self).save()
         poste = self.instance.poste
 
         super(DossierWorkflowForm, self).save()
         poste = self.instance.poste
 

-        # créer le commentaire automatique pour le poste associé
-        commentaire = WorkflowCommentaire()
-        commentaire.content_object = poste
-        texte = u"Validation automatique à travers le dossier [%s] de %s\n%s" %(
+        if poste.etat == self._etat_initial:
+            poste.etat = self.instance.etat
+            poste.save()
+
+            # créer le commentaire automatique pour le poste associé
+            commentaire = WorkflowCommentaire()
+            commentaire.content_object = poste
+            texte = u"Validation automatique à travers le dossier [%s] de %s\n%s" %(

                 self.instance.id,
                 self.instance,
                 self.data.get('commentaire', ''),
                 )
                 self.instance.id,
                 self.instance,
                 self.data.get('commentaire', ''),
                 )

-        commentaire.texte = texte
-        commentaire.etat_initial = self.instance._etat_courant
-        commentaire.etat_final = self.instance.etat
-        commentaire.owner = self.request.user
-        commentaire.save()
-
-        # force l'état du poste
-        poste.etat = self.instance.etat
-        poste.save()
+            commentaire.texte = texte
+            commentaire.etat_initial = self.instance._etat_courant
+            commentaire.etat_final = self.instance.etat
+            commentaire.owner = self.request.user
+            commentaire.save()

 
 
 class ContratForm(forms.ModelForm):
 
 
 class ContratForm(forms.ModelForm):