service

diff --git a/project/legacy/management/commands/rh_import_legacy.py b/project/legacy/management/commands/rh_import_legacy.py
index da02d54..cbb4877 100644 (file)
--- a/project/legacy/management/commands/rh_import_legacy.py
+++ b/project/legacy/management/commands/rh_import_legacy.py
@@ -8,6 +8,7 @@ from django.core.management.base import BaseCommand
 from django.db import connection
 from django.db.models import Q, Max
 
+from auf.django.references import models as ref
 from project.legacy import models as legacy
 from project.rh import models as rh
 
@@ -133,12 +134,21 @@ def sync_typeposte():
 def sync_service():
     cursor = connection.cursor()
     cursor.execute('TRUNCATE rh_service')
-    for service in legacy.DirectionService.objects.all():
+    #for service in legacy.DirectionService.objects.all():
+    #    rh.Service.objects.create(
+    #        id=service.id_direction_service,
+    #        nom=service.direction_service,
+    #        archive=not bool(service.actif),
+    #    )
+    
+    # Création des services à partir de la table de références
+    for s in ref.Service.objects.all():
         rh.Service.objects.create(
-            id=service.id_direction_service,
-            nom=service.direction_service,
-            archive=not bool(service.actif),
+            id=s.id,
+            nom=s.nom,
+            archive=s.actif,
         )
+    
 
 def sync_poste():
     cursor = connection.cursor()

diff --git a/project/rh/models.py b/project/rh/models.py
index 96ae6d1..cf8e68d 100644 (file)
--- a/project/rh/models.py
+++ b/project/rh/models.py
@@ -993,7 +993,11 @@ class Service(AUFMetadata):
         verbose_name_plural = u"Services"
 
     def __unicode__(self):
-        return u'%s' % (self.nom)
+        if self.archive:
+            archive = u"(archivé)"
+        else:
+            archive = "" 
+        return u'%s %s' % (self.nom, archive)
 
 
 TYPE_ORGANISME_CHOICES = (