utils et lib : helpers dans utils

diff --git a/project/dae/catalogues.py b/project/dae/catalogues.py
index 743f1bd..84d8fe6 100644 (file)
--- a/project/dae/catalogues.py
+++ b/project/dae/catalogues.py
@@ -2,11 +2,12 @@
 
 from django.db.models import Q
 
-from project.dae.utils import \
+from project.utils import \
         get_employe_from_user, is_user_dans_services_centraux
-from project.dae.workflow import grp_drh
 from project.rh import models as rh
 
+from project.dae.workflow import grp_drh
+
 
 class Responsable(object):
     q = ""

diff --git a/project/dae/forms.py b/project/dae/forms.py
index 5c47b07..79f07dc 100644 (file)
--- a/project/dae/forms.py
+++ b/project/dae/forms.py
@@ -12,13 +12,15 @@ from ajax_select.fields import AutoCompleteSelectField
 from auf.django.references import models as ref
 from auf.django.workflow.forms import WorkflowFormMixin
 
-from project.dae import models as dae
-from project.dae.utils import \
+from project.rh import models as rh
+from project.utils import \
         get_employe_from_user, is_user_dans_services_centraux
+
+from project.dae import models as dae
 from project.dae.workflow import \
         grp_drh, POSTE_ETATS_BOUTONS, DOSSIER_ETAT_FINALISE, \
         POSTE_ETAT_FINALISE
-from project.rh import models as rh
+        
 
 def _implantation_choices(obj, request):
     # TRAITEMENT NORMAL

diff --git a/project/dae/managers.py b/project/dae/managers.py
index ebed47b..b5affe9 100644 (file)
--- a/project/dae/managers.py
+++ b/project/dae/managers.py
@@ -2,16 +2,17 @@
 
 from django.db.models import Q
 
-from project.dae.utils import get_employe_from_user
-from project.dae.workflow import MAP_GROUPE_ETATS_A_FAIRE
-from project.dae.workflow import \
-        grp_drh, grp_drh2, grp_accior, \
-        grp_abf, grp_haute_direction, grp_service_utilisateurs
+from project.utils import get_employe_from_user
 from project.rh.managers import \
         DossierManager as RHDossierManager, \
         PosteManager as RHPosteManager, \
         PosteComparaisonManager as RHPosteComparaisonManager, \
         DossierComparaisonManager as RHDossierComparaisonManager
+        
+from project.dae.workflow import MAP_GROUPE_ETATS_A_FAIRE
+from project.dae.workflow import \
+        grp_drh, grp_drh2, grp_accior, \
+        grp_abf, grp_haute_direction, grp_service_utilisateurs
 
 
 class TodoManagerMixin(object):

diff --git a/project/dae/utils.py b/project/dae/utils.py
deleted file mode 100644 (file)
index 95dc3bd..0000000
--- a/project/dae/utils.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-import auf.django.references.models as ref
-
-def get_employe_from_user(user):
-  """
-  Retourne un employé AUF à partir de son user Django. 
-  """
-  try:
-      employe = ref.Authentification.objects.get(courriel=user.email).id
-  except:
-      raise Exception(u"L'employé avec le courriel %s n'a pas été trouvé dans le référentiel." % user.email)
-  return employe
-
-def is_user_dans_services_centraux(user):
-    employe = get_employe_from_user(user)
-    if employe.id == 12: # monique chéry gère les DAE des amériques
-        return False
-    return employe.implantation_id in (15, 19)
-
-def is_user_dans_region(user):
-    employe = get_employe_from_user(user)
-    return not is_user_dans_services_centraux(user)
-
-

diff --git a/project/dae/workflow.py b/project/dae/workflow.py
index 5fefea0..8233fac 100644 (file)
--- a/project/dae/workflow.py
+++ b/project/dae/workflow.py
@@ -6,8 +6,7 @@ from project.groups import \
         grp_drh, grp_drh2, grp_administrateurs, grp_service_utilisateurs, \
         grp_correspondants_rh, grp_directeurs_bureau, grp_accior, grp_abf, \
         grp_haute_direction
-        
-from project.dae.utils import \
+from project.utils import \
         is_user_dans_services_centraux, is_user_dans_region
 
 dae_groupes = (

diff --git a/project/lib.py b/project/lib.py
deleted file mode 100644 (file)
index a472ace..0000000
--- a/project/lib.py
+++ /dev/null
@@ -1,50 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-from auf.django.references import models as ref
-from django.contrib.auth.models import Group
-
-from project.rh import models as rh
-
-
-def get_employe_from_user(user):
-    """
-    Retourne un employé AUF (rh.Employe) à partir de son user Django.
-    """
-    try:
-        ref_employe = ref.Authentification.objects.get(courriel=user.email).id
-        employe = rh.Employe.objects.get(id=ref_employe.id)
-        ref_employe = ref.Employe.objects.get(id=employe.id)
-        employe.courriel = ref_employe.courriel
-        employe.tel_pro_poste = ref_employe.telephone_poste
-        employe.tel_pro_ip = ref_employe.telephone_ip
-    except:
-        employe = rh.Employe.objects.none()
-    return employe
-
-
-def get_employe_from_id(id):
-    """
-    Retourne un employé AUF (rh.Employe) à partir de son id.
-    """
-    try:
-        employe = rh.Employe.objects.get(id=id)
-        employe.courriel = ref.Employe.objects.get(id=employe.id).courriel
-    except:
-        employe = rh.Employe.objects.none()
-    return employe
-
-
-def safe_create_groupe(name=None, id=None):
-    """
-    Création d'un groupe prédéfini. Retourne None, quand la création
-    ne peut se faire. (C'est le cas au syncdb, quand la table de groupe
-    n'a pas été créée encore).
-    """
-    try:
-        if name:
-            grp, created = Group.objects.get_or_create(name=name)
-        elif id:
-            grp, created = Group.objects.get_or_create(id=id)
-    except:
-        return None
-    return grp

diff --git a/project/recrutement/admin.py b/project/recrutement/admin.py
index b3fe227..a426eed 100644 (file)
--- a/project/recrutement/admin.py
+++ b/project/recrutement/admin.py
@@ -14,7 +14,9 @@ from reversion.admin import VersionAdmin
 from auf.django.emploi.models import OffreEmploi, Candidat, CandidatPiece
 from auf.django.references.models import Region, Bureau
 
-from project.dae.utils import get_employe_from_user as get_emp
+from project.utils import get_employe_from_user as get_emp
+from project.rh import models as rh
+
 from project.recrutement.forms import OffreEmploiForm
 from project.recrutement.models import \
         Evaluateur, CandidatEvaluation, \
@@ -26,7 +28,6 @@ from project.recrutement.workflow import \
         grp_administrateurs_recrutement, \
         grp_correspondants_rh_recrutement, \
         grp_haute_direction_recrutement
-from project.rh import models as rh
 
 
 ### CONSTANTES

diff --git a/project/rh/admin.py b/project/rh/admin.py
index de0cb63..94418d3 100644 (file)
--- a/project/rh/admin.py
+++ b/project/rh/admin.py
@@ -17,8 +17,8 @@ import auf.django.references.models as ref
 
 from project.decorators import in_drh_or_admin
 from project.groups import grp_correspondants_rh
+from project.utils import get_employe_from_user
 
-from project.dae.utils import get_employe_from_user
 import project.rh.models as rh
 from project.rh.forms import \
         ContratForm, AyantDroitForm, EmployeAdminForm, AjaxSelect, DossierForm

diff --git a/project/utils.py b/project/utils.py
index ac839bd..705ba57 100644 (file)
--- a/project/utils.py
+++ b/project/utils.py
@@ -8,12 +8,15 @@ def get_employe_from_user(user):
   """
   try:
       employe = ref.Authentification.objects.get(courriel=user.email).id
+      # ajouter coordonnées via ref.Employe? (courriel, tel, etc.)
   except:
       raise Exception(u"L'employé avec le courriel %s n'a pas été trouvé dans le référentiel." % user.email)
   return employe
 
 def is_user_dans_services_centraux(user):
     employe = get_employe_from_user(user)
+    if employe.id == 12: # monique chéry gère les DAE des amériques
+        return False
     return employe.implantation_id in (15, 19)
 
 def is_user_dans_region(user):