Merged in CHOUETTE-3230-remove-autocompletecompani (pull request #1530)

CHOUETTE-3230 remove autocompletecompani Approved-by: Luc Donnet
enroute-mobi · Nov 30, 2023 · 83d5f7a · 83d5f7a
2 parents b47031a + 4dbe96b
commit 83d5f7a
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 161 deletions.
diff --git a/app/controllers/autocomplete_companies_controller.rb b/app/controllers/autocomplete_companies_controller.rb
diff --git a/app/models/vehicle_journey_control/published_journey_name.rb b/app/models/vehicle_journey_control/published_journey_name.rb
diff --git a/app/views/autocomplete_companies/autocomplete.rabl b/app/views/autocomplete_companies/autocomplete.rabl
diff --git a/app/views/compliance_controls/_form.html.slim b/app/views/compliance_controls/_form.html.slim
@@ -11,20 +11,6 @@
       - @compliance_control.class.dynamic_attributes.each do |attribute|
         - if attribute == :target
           = f.input :target, as: :grouped_select, collection: compliance_control_target_options(@compliance_control), group_method: :last, include_blank: false
-        - elsif attribute == :company_id
-          = f.input :company_id,
-            as: :select,
-            style: "width: 100%",
-            input_html: { \
-              data: { \
-                'select2-ajax': 'true',
-                'select2ed-placeholder': t('.company_name'),
-                term: 'name_cont',
-                url: autocomplete_companies_path(format: :json),
-                'select2ed-allow-clear': true \
-              } \
-            },
-            wrapper_html: { class: 'filter_menu-item select2ed' }
         - elsif attribute == :custom_field_code
           = f.input :custom_field_code, as: :grouped_select, collection: custom_fields_by_resource_type(@compliance_control_set.organisation), group_method: :last, include_blank: false
         - else

diff --git a/config/locales/compliance_controls.en.yml b/config/locales/compliance_controls.en.yml
@@ -173,11 +173,6 @@ en:
         3_vehiclejourney_5_2: "The vehicle journey with %{source_objectid} objectid has an departure time %{error_value} at stop point %{target_0_label} (%{target_0_objectid}) greater than the arrival %{reference_value} at the next stop point"
       description: Increasing chronology of the vehicle journey at stops
       prerequisite: "None"
-    vehicle_journey_control/published_journey_name:
-      messages:
-        3_vehiclejourney_8: "The vehicle journey with %{source_objectid} must have a published journey name between %{min} and %{max} for the company : %{company_name}"
-      description: Published journey name value for a company
-      prerequisite: "None"
     vehicle_journey_control/bus_capacity:
       messages:
         3_vehiclejourney_9: "The vehicle journey %{source_objectid} lacks a bus capacity"
@@ -314,8 +309,6 @@ en:
         one: "Increasing chronology of the vehicle journey at stops"
       vehicle_journey_control/bus_capacity:
         one: "Présence of bus capacity"
-      vehicle_journey_control/published_journey_name:
-        one: Value of published journey name for one company
       vehicle_journey_control/empty_time_table:
         one: A vehicle journey cannot have an empty timetable
       vehicle_journey_control/company:

diff --git a/config/locales/compliance_controls.fr.yml b/config/locales/compliance_controls.fr.yml
@@ -173,11 +173,6 @@ fr:
         3_vehiclejourney_5_2: "La course %{source_objectid} a un horaire de départ %{error_value} à l'arrêt %{target_0_label} (%{target_0_objectid}) supérieur à l'horaire d'arrivé %{reference_value} à l'arrêt suivant"
       description: "L'horaire d'arrivée à un arrêt doit être antérieur à l'horaire de départ de cet arrêt ET les horaires de départ aux arrêts doivent être dans l'ordre chronologique croissant."
       prerequisite: "Aucun"
-    vehicle_journey_control/published_journey_name:
-      messages:
-        3_vehiclejourney_8: La course %{source_objectid} doit avoir un numéro de service compris entre %{min} et %{max} pour le transporteur %{company_name}
-      description: Valeur du numéro de service pour un transporteur donné
-      prerequisite: "Aucun"
     vehicle_journey_control/bus_capacity:
       messages:
         3_vehiclejourney_9: "La course %{source_objectid} doit avoir une capacité de bus"
@@ -315,8 +310,6 @@ fr:
         one: "Chronologie croissante des horaires"
       vehicle_journey_control/bus_capacity:
         one: "Présence de la capacité du bus"
-      vehicle_journey_control/published_journey_name:
-        one: Valeur du numéro de service pour un transporteur donné
       vehicle_journey_control/empty_time_table:
         one: Une course ne doit pas être liée à un calendrier d'application vide
       vehicle_journey_control/company:

diff --git a/config/routes.rb b/config/routes.rb
@@ -438,10 +438,6 @@
     resources :compliance_control_blocks, except: %i[show index]
   end
 
-  resources :companies do
-    get :autocomplete, on: :collection, controller: 'autocomplete_companies'
-  end
-
   resources :calendars do
     get :autocomplete, on: :collection, controller: 'autocomplete_calendars'
     member do

diff --git a/spec/models/vehicle_journey_control/published_journey_name_spec.rb b/spec/models/vehicle_journey_control/published_journey_name_spec.rb