Merge branch 'feature/432_modality_fields_order' into 'develop'

Swapped order of modality fields

Closes FDM/rdm-system/antleaf-projectmanagement#432

See merge request !337

hyrax/app/views/hyrax/crc_datasets/complex_modalities/_form.html.erb

@@ -30,19 +30,19 @@
                 <%= hidden_field_tag :add_modalities_to_session, @complex_session.id %>
               <% end %>
               <div class="base-terms">
-                <div class="form-group complex-form-field">
-                  <%= f.label :modality_title, t('rdms.fields.complex_modality.title'), class:'form-label' %>
+                <div class="form-group complex-form-field"> 
+                  <%= f.label :modality, t('rdms.fields.complex_modality.modality'), class:'form-label' %>
                   <ul class="listing" aria-live="polite">
-                    <li><%= f.text_field :modality_title, class:'form-control folder-name', data: { validation_path: validate_modality_title_crc_dataset_complex_modalities_path(@crc_dataset), parent_id: @complex_session.id, current_object_id: @complex_modality.id } %></li>
-                    <p class="folder_name_error" style="display: none"></p>
+                    <li><%= f.select :modality, options_for_select(ModalityService.new.select_all_options, @complex_modality.modality), {prompt: 'choose modalities'}, { class:'form-control' } %></li>
                   </ul>
                 </div>
               </div>
               <div class="base-terms">
-                <div class="form-group complex-form-field"> 
-                  <%= f.label :modality, t('rdms.fields.complex_modality.modality'), class:'form-label' %>
+                <div class="form-group complex-form-field">
+                  <%= f.label :modality_title, t('rdms.fields.complex_modality.title'), class:'form-label' %>
                   <ul class="listing" aria-live="polite">
-                    <li><%= f.select :modality, options_for_select(ModalityService.new.select_all_options, @complex_modality.modality), {prompt: 'choose modalities'}, { class:'form-control' } %></li>
+                    <li><%= f.text_field :modality_title, class:'form-control folder-name', data: { validation_path: validate_modality_title_crc_dataset_complex_modalities_path(@crc_dataset), parent_id: @complex_session.id, current_object_id: @complex_modality.id } %></li>
+                    <p class="folder_name_error" style="display: none"></p>
                   </ul>
                 </div>
               </div>