Reposition fields and attrs, adapt locales

hitobito · May 1, 2024 · 6960f88 · 6960f88
1 parent 4d9c771
commit 6960f88
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/app/views/events/_application_fields.html.haml b/app/views/events/_application_fields.html.haml
@@ -5,7 +5,7 @@
 
 
 = field_set_tag do
-  = f.labeled_input_fields(*entry.used_attributes(:application_opening_at, :application_closing_at, :application_conditions, :maximum_participants, :minimum_participants, :automatic_assignment))
+  = f.labeled_input_fields(*entry.used_attributes(:application_opening_at, :application_closing_at, :application_conditions, :maximum_participants, :minimum_participants))
 
   - entry.used?(:external_applications) do
     = f.labeled_boolean_field(:external_applications, caption: t('events.form.caption_external_applications'))
@@ -18,6 +18,9 @@
   - entry.used?(:priorization) do
     = f.labeled_boolean_field(:priorization, caption: t('events.form.caption_prioritization'))
 
+  - entry.used?(:automatic_assignment) do
+    = f.labeled_boolean_field(:automatic_assignment, caption: t('events.form.caption_automatic_assignment'))
+
   - entry.used?(:waiting_list) do
     = f.labeled_boolean_field(:waiting_list, caption: t('events.form.caption_waiting_list'))
 

diff --git a/app/views/events/_attrs_application.html.haml b/app/views/events/_attrs_application.html.haml
@@ -1,13 +1,13 @@
 = section Event::Application.model_name.human do
   %dl.dl-horizontal
+    - entry.used?(:minimum_participants) do
+      = present_labeled_attr(entry, :minimum_participants)
     - entry.used?(:application_opening_at) do
       = present_labeled_attr(entry, :application_opening_at)
     - entry.used?(:application_closing_at) do
       = present_labeled_attr(entry, :application_closing_at)
     - entry.used?(:application_closing_at) do
       = present_labeled_attr(entry, :application_closing_at)
-    - entry.used?(:minimum_participants) do
-      = present_labeled_attr(entry, :minimum_participants)
     = labeled_attr(entry, :booking_info)
     - entry.used?(:external_applications) do
       = labeled(Event.human_attribute_name(:external_applications), entry.external_application_link(@group))

diff --git a/config/locales/views.de.yml b/config/locales/views.de.yml
@@ -528,7 +528,10 @@ de:
         abgefragt werden sollen.
       caption_applications_cancelable: Teilnehmende können sich selbst abmelden.
       caption_display_booking_info: Die Anzahl Anmeldungen/Plätze ist auf der Kursliste für alle sichtbar.
-      caption_waiting_list: Wenn keine Plätze mehr frei sind, landen neue Anmeldungen automatisch auf der Warteliste.
+      caption_automatic_assignment: Anmeldungen werden automatisch zugeteilt, sofern noch freie
+        Plätze verfügbar sind.
+      caption_waiting_list: Wenn keine Plätze mehr frei sind, landen neue Anmeldungen automatisch
+        auf der nationalen Warteliste.
       caption_globally_visible: "%{model_name} ist für die ganze Datenbank sichtbar"
       label_notify_contact_on_participations: Benachrichtigung
     form_tabs:

diff --git a/db/migrate/20240423133607_add_automatic_assignment_to_events.rb b/db/migrate/20240423133607_add_automatic_assignment_to_events.rb
@@ -17,7 +17,10 @@ def down
     remove_column :events, :automatic_assignment
   end
 
+  private
+
   def event_types_using_priorization
     Event.all_types.select { |e| e.attr_used?(:priorization) }
+      .map(&:sti_name)
   end
 end