X-Git-Url: https://git.auf.org/?p=auf_rh_dae.git;a=blobdiff_plain;f=project%2Fdae%2Furls.py;h=e866c25476af072134a561f62c5d9b794716f3c0;hp=7384b2e80c4f80cade4c8736a296de2a7e78f198;hb=79c57a2fdf637f37a5d1349db3eca043c38fff2e;hpb=105dd778d77002fe803d1f05c0ca4646ca435a9e

diff --git a/project/dae/urls.py b/project/dae/urls.py
index 7384b2e..e866c25 100644
--- a/project/dae/urls.py
+++ b/project/dae/urls.py
@@ -1,5 +1,6 @@
 # -*- encoding: utf-8 -*
-from django.conf.urls.defaults import patterns, url, include
+
+from django.conf.urls.defaults import patterns, url
 
 urlpatterns = patterns(
     'project.dae.views',
@@ -7,46 +8,59 @@ urlpatterns = patterns(
 
     # poste
     url(r'^postes$', 'postes_liste', name='dae_postes_liste'),
-    url(r'^poste/consulter/(?P<key>.*)$', 'poste_consulter', name='poste_consulter'),
+    url(r'^poste/consulter/(?P<key>.*)$', 'poste_consulter',
+        name='poste_consulter'),
+    url(r'^poste/importer/(\d+)$', 'poste_importer',
+        name='poste_importer'),
     url(r'^poste$', 'poste', name='poste'),
     url(r'^poste/(?P<key>.*)$', 'poste', name='poste'),
     url(r'^pieces-postes/(\d+)/(.*)$', 'poste_piece', name='poste_piece'),
 
     # embauche
     url(r'^embauches$', 'embauches_liste', name='dae_embauches_liste'),
-    url(r'^embauches-finalisees$', 'embauches_finalisees', name='embauches_finalisees'),
+    url(r'^embauches-finalisees$', 'embauches_finalisees',
+        name='embauches_finalisees'),
     url(r'^embauche$', 'embauche_choisir_poste', name='embauche'),
-    url(r'^embauche/consulter/(?P<dossier_id>.*)$', 'embauche_consulter', name='embauche_consulter'),
-    url(r'^embauche/(?P<key>.*)/(?P<dossier_id>.*)$', 'embauche', name='embauche'),
+    url(r'^embauche/consulter/(?P<dossier_id>.*)$', 'embauche_consulter',
+        name='embauche_consulter'),
+    url(r'^embauche/importer/(?P<dossier_id>.*)$', 'embauche_importer',
+        name='embauche_importer'),
+    url(r'^embauche/(?P<key>.*)/(?P<dossier_id>.*)$', 'embauche',
+        name='embauche'),
     url(r'^embauche/(?P<key>.*)$', 'embauche', name='embauche'),
 
     # contrats
-    url(r'^embauches/(?P<dossier_id>\d+)/contrats/ajouter$', 'embauche_ajouter_contrat',
-        name='embauche_ajouter_contrat'),
+    url(r'^embauches/(?P<dossier_id>\d+)/contrats/ajouter$',
+        'embauche_ajouter_contrat', name='embauche_ajouter_contrat'),
     url(r'^contrats/(\d+)/fichier/(.*)$', 'contrat', name='contrat'),
-    url(r'^contrats/(\d+)/supprimer$', 'contrat_supprimer', name='contrat_supprimer'),
+    url(r'^contrats/(\d+)/supprimer$', 'contrat_supprimer',
+        name='contrat_supprimer'),
 
     # DAE numérisée
-    url(r'^embauches/(\d+)/dae_numerisee$', 'dae_numerisee', name='dae_numerisee'),
+    url(r'^embauches/(\d+)/dae_numerisee$', 'dae_numerisee',
+        name='dae_numerisee'),
     url(r'^embauches/(\d+)/dae_numerisee/modifier$', 'dae_numerisee_modifier',
         name='dae_numerisee_modifier'),
-    url(r'^embauches/(\d+)/dae_numerisee/supprimer$', 'dae_numerisee_supprimer',
-        name='dae_numerisee_supprimer'),
-
-    url(r'^importer$', 'importer_choix_dossier', name='importer_dae'),
+    url(r'^embauches/(\d+)/dae_numerisee/supprimer$',
+        'dae_numerisee_supprimer', name='dae_numerisee_supprimer'),
 
     # ajax
     url(r'^employe$', 'employe', name='employe'),
     url(r'^employe/(?P<key>.*)$', 'employe', name='employe'),
     url(r'^dossier$', 'dossier', name='dossier'),
-    url(r'^dossier/(?P<poste_key>.*)/(?P<employe_key>.*)$', 'dossier', name='dossier'),
-    url(r'^pieces-dossiers/(\d+)/(.*)$', 'dossier_piece', name='dossier_piece'),
-    url(r'^dossier_resume/(?P<dossier_id>.*)$', 'dossier_resume', name='dossier_resume'),
-    url(r'^poste_resume/(?P<dossier_id>.*)$', 'poste_resume', name='poste_resume'),
+    url(r'^dossier/(?P<poste_key>.*)/(?P<employe_key>.*)$', 'dossier',
+        name='dossier'),
+    url(r'^pieces-dossiers/(\d+)/(.*)$', 'dossier_piece',
+        name='dossier_piece'),
+    url(r'^dossier_resume/(?P<dossier_id>.*)$', 'dossier_resume',
+        name='dossier_resume'),
+    url(r'^poste_resume/(?P<dossier_id>.*)$', 'poste_resume',
+        name='poste_resume'),
     url(r'^salaire$', 'salaire', name='salaire'),
     url(r'^salaire/(.*)/(.*)/(.*)$', 'salaire', name='salaire'),
     url(r'^coefficient$', 'coefficient', name='dae_coefficient'),
-    url(r'^liste_valeurs_point$', 'liste_valeurs_point', name='liste_valeurs_point'),
+    url(r'^liste_valeurs_point$', 'liste_valeurs_point',
+        name='liste_valeurs_point'),
     url(r'^liste_postes$', 'liste_postes', name='liste_postes'),
     url(r'^devise$', 'devise', name='dae_devise'),
     url(r'^devises$', 'devises', name='devises'),