Merge branch 'feature/import-2023-07-18'

govpf · Oct 17, 2023 · 71484af · 71484af
2 parents e1f219c + 776adee
commit 71484af
Show file tree

Hide file tree

Showing 77 changed files with 922 additions and 264 deletions.
diff --git a/app/assets/stylesheets/badges.scss b/app/assets/stylesheets/badges.scss
@@ -19,15 +19,6 @@
     background-color: $orange;
     color: #FFFFFF;
   }
-
-  &.procedure-synthese-badge {
-    color: $white;
-    background-color: $dark-grey;
-    margin-left: 3px;
-    padding-left: $default-spacer;
-    padding-right: $default-spacer;
-    vertical-align: baseline;
-  }
 }
 
 .badge-group {

diff --git a/app/assets/stylesheets/buttons.scss b/app/assets/stylesheets/buttons.scss
@@ -229,6 +229,8 @@
 ul.dropdown-items {
   padding-inline-start: 0;
   list-style: none;
+  margin-top: 0;
+  margin-bottom: 0;
 }
 
 .dropdown-items {

diff --git a/app/assets/stylesheets/dossier_champs.scss b/app/assets/stylesheets/dossier_champs.scss
@@ -30,3 +30,44 @@
     opacity: 1;
   }
 }
+
+.editable-champ {
+  ul {
+    list-style-type: square;
+    list-style-position: outside;
+    padding-left: 30px;
+  }
+
+  ul ul {
+    list-style-type: circle;
+  }
+
+
+  ol {
+    list-style-type: decimal;
+    list-style-position: outside;
+    padding-left: 30px;
+  }
+
+  table {
+    width: 90%;
+    margin-left: auto;
+    margin-right: auto;
+  }
+
+  td {
+    border-bottom: 1px solid $border-grey;
+  }
+
+  th {
+    font-weight: bold;
+    text-align: center;
+    padding: (2 * $default-spacer) 2px;
+    vertical-align: middle;
+    border-bottom: 1px solid $border-grey;
+  }
+
+  tbody tr:hover {
+    background-color: $border-grey;
+  }
+}
diff --git a/app/assets/stylesheets/dossier_views.scss b/app/assets/stylesheets/dossier_views.scss
@@ -22,6 +22,12 @@
     }
   }
 
+  .edit-identity-content {
+    .champ-row {
+      padding: 0;
+    }
+  }
+
   .edit-identity-action {
     .dropdown-content {
       padding: $default-padding;

diff --git a/app/assets/stylesheets/dsfr.scss b/app/assets/stylesheets/dsfr.scss
@@ -84,6 +84,11 @@ fieldset {
   display: none;
 }
 
+// on souhaite que le dropdown s'adapate correctement en largeur
+.fr-translate .fr-menu__list.max-content {
+  width: max-content;
+}
+
 // on veut ferrer à droite le dropdown de sélecteur de langue
 @media (min-width: 62em) {
   .fr-nav__item.custom-fr-translate-flex-end {

diff --git a/app/assets/stylesheets/forms.scss b/app/assets/stylesheets/forms.scss
@@ -6,7 +6,7 @@
   ul {
     list-style-type: square;
     list-style-position: outside;
-    padding-left: 30px;
+    // padding-left: 30px;
   }
 
   ul ul {

diff --git a/app/assets/stylesheets/procedure_list.scss b/app/assets/stylesheets/procedure_list.scss
@@ -3,10 +3,6 @@
 @import "mixins";
 
 .procedure-list {
-  .procedure-item {
-    background-color: rgba(0, 0, 0, 0.02);
-  }
-
   .procedure-logo-link {
     background-image: none;
   }
@@ -20,9 +16,6 @@
     background-position: 95% 50%;
   }
 
-  .procedure-status {
-    margin-left: auto;
-  }
 
   .procedure-stats {
     list-style-type: none;

diff --git a/app/assets/stylesheets/procedure_logo.scss b/app/assets/stylesheets/procedure_logo.scss
@@ -7,7 +7,6 @@
 
   background-color: #FFFFFF;
   background-position: 95% 50%;
-  border: 1px solid $border-grey;
   height: 84px;
   width: 84px;
   margin-right: $default-padding;

diff --git a/app/components/dossiers/batch_alert_component/batch_alert_component.en.yml b/app/components/dossiers/batch_alert_component/batch_alert_component.en.yml
@@ -2,56 +2,74 @@ en:
   archiver:
     finish:
       text_success:
-        one: 1/1 file has been archived
+        one: "%{success_count}/1 file has been archived"
         other: "%{success_count}/%{count} files have been archived"
     in_progress:
       text_success:
-        one: 1/1 is being archived
+        one: "1 is being archived"
         other: "%{success_count}/%{count} files have been archived"
   passer_en_instruction:
     finish:
       text_success:
-        one: 1/1 file has been changed to instructing
+        one: "%{success_count}/1 file has been changed to instructing"
         other: "%{success_count}/%{count} files have been changed to instructing"
     in_progress:
       text_success:
-        one: 1/1 is being changed to instructing
+        one: "1 is being changed to instructing"
         other: "%{success_count}/%{count} files have been changed to instructing"
   accepter:
     finish:
       text_success:
-        one: 1/1 file has been accepted
+        one: "%{success_count}/1 file has been accepted"
         other: "%{success_count}/%{count} files have been accepted"
     in_progress:
       text_success:
-        one: 1/1 is being accepted
+        one: "1 is being accepted"
         other: "%{success_count}/%{count} files have been accepted"
+  refuser:
+    finish:
+      text_success:
+        one: "%{success_count}/1 file has been refused"
+        other: "%{success_count}/%{count} files have been refused"
+    in_progress:
+      text_success:
+        one: "1 is being refused"
+        other: "%{success_count}/%{count} files have been refused"
+  classer_sans_suite:
+    finish:
+      text_success:
+        one: "%{success_count}/1 file has been closed without continuation"
+        other: "%{success_count}/%{count} files have been closed without continuation"
+    in_progress:
+      text_success:
+        one: "1 is being closed without continuation"
+        other: "%{success_count}/%{count} files have been closed without continuation"
   follow:
     finish:
       text_success:
-        one: 1/1 file has been followed
+        one: "%{success_count}/1 file has been followed"
         other: "%{success_count}/%{count} files have been followed"
     in_progress:
       text_success:
-        one: 1/1 is being followed
+        one: "1 is being followed"
         other: "%{success_count}/%{count} files have been followed"
   unfollow:
     finish:
       text_success:
-        one: 1/1 file has been unfollowed
+        one: "%{success_count}/1 file has been unfollowed"
         other: "%{success_count}/%{count} files have been unfollowed"
     in_progress:
       text_success:
-        one: 1/1 is being unfollowed
+        one: "1 is being unfollowed"
         other: "%{success_count}/%{count} files have been unfollowed"
   repasser_en_construction:
     finish:
       text_success:
-        one: 1/1 file has been changed to in progress
+        one: "%{success_count}/1 file has been changed to in progress"
         other: "%{success_count}/%{count} files have been changed to in progress"
     in_progress:
       text_success:
-        one: 1/1 is being changed to in progress
+        one: "1 is being changed to in progress"
         other: "%{success_count}/%{count} files have been changed to in progress"
   title:
     finish: The bulk action is finished

diff --git a/app/components/dossiers/batch_alert_component/batch_alert_component.fr.yml b/app/components/dossiers/batch_alert_component/batch_alert_component.fr.yml
@@ -2,56 +2,74 @@ fr:
   archiver:
     finish:
       text_success:
-        one: 1 dossier a été archivé
+        one: "%{success_count}/1 dossier a été archivé"
         other: "%{success_count}/%{count} dossiers ont été archivés"
     in_progress:
       text_success:
-        one: 1 dossier sera archivé
+        one: "1 dossier est en cours d'archivage"
         other: "%{success_count}/%{count} dossiers ont été archivés"
   passer_en_instruction:
     finish:
       text_success:
-        one: 1 dossier a été passé en instruction
+        one: "%{success_count}/1 dossier a été passé en instruction"
         other: "%{success_count}/%{count} dossiers ont été passés en instruction"
     in_progress:
       text_success:
-        one: 1 dossier sera passé en instruction
+        one: "1 dossier est en cours d'instruction"
         other: "%{success_count}/%{count} dossiers ont été passés en instruction"
   accepter:
     finish:
       text_success:
-        one: 1 dossier a été accepté
+        one: "%{success_count}/1 dossier a été accepté"
         other: "%{success_count}/%{count} dossiers ont été acceptés"
     in_progress:
       text_success:
-        one: 1 dossier sera accepté
+        one: "1 dossier est en cours d'acceptation"
         other: "%{success_count}/%{count} dossiers ont été acceptés"
+  refuser:
+    finish:
+      text_success:
+        one: "%{success_count}/1 dossier a été refusé"
+        other: "%{success_count}/%{count} dossiers ont été refusés"
+    in_progress:
+      text_success:
+        one: "1 dossier est en cours de refus"
+        other: "%{success_count}/%{count} dossiers ont été refusés"
+  classer_sans_suite:
+    finish:
+      text_success:
+        one: "%{success_count}/1 dossier a été classé sans suite"
+        other: "%{success_count}/%{count} dossiers ont été classés sans suite"
+    in_progress:
+      text_success:
+        one: "1 dossier est en cours de classement sans suite"
+        other: "%{success_count}/%{count} dossiers ont été classés sans suite"
   follow:
     finish:
       text_success:
-        one: 1 dossier a été suivi
+        one: "%{success_count}/1 dossier a été suivi"
         other: "%{success_count}/%{count} dossiers ont été suivis"
     in_progress:
       text_success:
-        one: 1 dossier sera suivi
+        one: "1 dossier est en cours d'être suivi"
         other: "%{success_count}/%{count} dossiers ont été suivis"
   unfollow:
     finish:
       text_success:
-        one: 1 dossier n'est plus suivi
+        one: "%{success_count}/1 dossier n'est plus suivi"
         other: "%{success_count}/%{count} dossiers ne sont plus suivis"
     in_progress:
       text_success:
-        one: 1 dossier ne sera plus suivi
+        one: "1 dossier est en cours de ne plus être suivi"
         other: "%{success_count}/%{count} dossiers ne sont plus suivis"
   repasser_en_construction:
     finish:
       text_success:
-        one: 1 dossier a été repassé en construction
+        one: "%{success_count}/1 dossier a été repassé en construction"
         other: "%{success_count}/%{count} dossiers ont été repassés en construction"
     in_progress:
       text_success:
-        one: 1 dossier sera repassé en construction
+        one: "1 dossier est en cours d'être repassé en construction"
         other: "%{success_count}/%{count} dossiers ont été repassés en construction"
   title:
     finish: L’action de masse est terminée

diff --git a/app/components/dossiers/batch_operation_component.rb b/app/components/dossiers/batch_operation_component.rb
@@ -15,7 +15,7 @@ def operations_for_dossier(dossier)
     when Dossier.states.fetch(:en_construction)
       [BatchOperation.operations.fetch(:passer_en_instruction)]
     when Dossier.states.fetch(:en_instruction)
-      [BatchOperation.operations.fetch(:accepter), BatchOperation.operations.fetch(:repasser_en_construction)]
+      [BatchOperation.operations.fetch(:accepter), BatchOperation.operations.fetch(:refuser), BatchOperation.operations.fetch(:classer_sans_suite), BatchOperation.operations.fetch(:repasser_en_construction)]
     when Dossier.states.fetch(:accepte), Dossier.states.fetch(:refuse), Dossier.states.fetch(:sans_suite)
       [BatchOperation.operations.fetch(:archiver)]
     else
@@ -58,10 +58,33 @@ def available_operations
             },
 
             {
-              label: t(".operations.accepter"),
-              operation: BatchOperation.operations.fetch(:accepter)
-            },
+              instruction:
+                            [
+                              {
+                                label: t(".operations.accepter"),
+                                operation_description: t(".operations.accepter_description"),
+                                operation: BatchOperation.operations.fetch(:accepter),
+                                operation_class_name: 'accept',
+                                placeholder: t(".placeholders.accepter")
+                              },
+
+                              {
+                                label: t(".operations.refuser"),
+                                operation_description: t(".operations.refuser_description"),
+                                operation: BatchOperation.operations.fetch(:refuser),
+                                operation_class_name: 'refuse',
+                                placeholder: t(".placeholders.refuser")
+                              },
 
+                              {
+                                label: t(".operations.classer_sans_suite"),
+                                operation_description: t(".operations.classer_sans_suite_description"),
+                                operation: BatchOperation.operations.fetch(:classer_sans_suite),
+                                operation_class_name: 'without-continuation',
+                                placeholder: t(".placeholders.classer_sans_suite")
+                              }
+                            ]
+            },
             {
               label: t(".operations.unfollow"),
               operation: BatchOperation.operations.fetch(:unfollow)

diff --git a/app/components/dossiers/batch_operation_component/batch_operation_component.en.yml b/app/components/dossiers/batch_operation_component/batch_operation_component.en.yml
@@ -2,7 +2,19 @@ fr:
   operations:
     archiver: 'Archive selected files'
     passer_en_instruction: 'Change selected files to instructing'
+    instruction: Instructing files
     accepter: 'Accept seleted files'
+    accepter_description: Users will be notified that their file has been accepted
+    refuser: 'Refuse seleted files'
+    refuser_description: Users will be notified that their file has been refused
+    without_continuation: 'Close without continuation seleted files'
+    without_continuation_description: Users will be notified that their file has been closed without continuation
     follow: 'Follow seleted files'
     unfollow: 'Unfollow seleted files'
     repasser_en_construction: 'Change selected files to in progress'
+    other: Other batch operations
+    confirm: Do you confirm the batch operation for selected files ?
+  placeholders:
+    accepter: "Explain to users why their file is accepted (optional)"
+    refuser: "Explain to users why their file is refused (mandatory)"
+    classer_sans_suite: "Explain to users why their file is closed without continuation (mandatory)"
diff --git a/app/components/dossiers/batch_operation_component/batch_operation_component.fr.yml b/app/components/dossiers/batch_operation_component/batch_operation_component.fr.yml
@@ -2,7 +2,19 @@ fr:
   operations:
     archiver: 'Archiver les dossiers'
     passer_en_instruction: 'Passer les dossiers en instruction'
+    instruction: Instruire les dossiers
     accepter: 'Accepter les dossiers'
+    accepter_description: Les usagers seront informés que leur dossier a été accepté
+    refuser: 'Refuser les dossiers'
+    refuser_description: Les usagers seront informés que leur dossier a été refusé
+    classer_sans_suite: 'Classer sans suite les dossiers'
+    classer_sans_suite_description: Les usagers seront informés que leur dossier a été classé sans suite
     follow: 'Suivre les dossiers'
     unfollow: 'Ne plus suivre les dossiers'
     repasser_en_construction: 'Repasser les dossiers en construction'
+    other: Autres actions multiples
+    confirm: Confirmez-vous le traitement multiple des dossiers sélectionnés ?
+  placeholders:
+    accepter: "Expliquez aux demandeurs pourquoi leur dossier est accepté (facultatif)"
+    refuser: "Expliquez aux demandeurs pourquoi leur dossier est accepté (obligatoire)"
+    classer_sans_suite: "Expliquez aux demandeurs pourquoi leur dossier est accepté (obligatoire)"