Add formset for parameter search (not functional) and improve usability

shimatta_kenkyusho/templates/parts/components.html

@@ -16,14 +16,17 @@
                     <button class="btn btn-success" type="button" data-bs-toggle="modal" data-bs-target="#comp-edit-modal"><i class="bi bi-plus-circle"></i> Add Component</button>
                 </div>
             </form>
-            <div class="collapse mb-3" id="advanced-search-collapse">
+            <div class="collapse mb-3{% if advanced_search_shown %} show{% endif %}" id="advanced-search-collapse" aria-expanded="{% if advanced_search_shown %}true{% else %}false{% endif %}">
                 <form method="POST">
                     <div class="row">
                         <div class="col-sm">
                             {% crispy advanced_search_form %}
                         </div>
+                           {{ advanced_search_param_formset.management_form }}
                         <div class="col-sm">
-                            Foo
+                            {% for f in advanced_search_param_formset %}
+                            {% crispy f %}
+                            {% endfor %}
                         </div>
                         <input type="submit" name="submit-advanced-search" value="Search" class="btn btn-success">
                     </div>
@@ -60,7 +63,7 @@
     </div>
 </div>
 
-{% include 'parts/modals/edit-component-modal.html' with form=comp_form heading='New Component' %}
+{% include 'parts/modals/edit-component-modal.html' with form=comp_form heading='New Component' open_component_button=True %}
 
 {% endblock content %}
 {% block custom_scripts %}
@@ -69,8 +72,5 @@
 {% if comp_form.errors %}
 bootstrap.Modal.getOrCreateInstance(document.getElementById('comp-edit-modal')).show()
 {% endif %}
-{% if advanced_search_shown %}
-bootstrap.Collapse.getOrCreateInstance(document.getElementById('advanced-search-collapse')).show()
-{% endif %}
 </script>
 {% endblock custom_scripts %}

shimatta_kenkyusho/templates/parts/modals/edit-component-modal.html

@@ -2,6 +2,7 @@
 Needs following context:
 - heading
 - form EditComponentForm
+- open_component_button
 {% endcomment %}
 
 {% load static %}
@@ -21,6 +22,9 @@ Needs following context:
                 </div>
                 <div class="modal-footer">
                     <input type="submit" name="submit-edit-component" class="btn btn-primary" value="Save">
+                    {% if open_component_button %}
+                    <input type="submit" name="submit-edit-component-open" class="btn btn-primary" value="Save and Open">
+                    {% endif %}
                 </div>
             </form>
         </div>