Merge pull request #151 from cmu-delphi/pre-development

Moved Country filter above Geo Level. Added Geographic Scope to the a…

Author: dmytrotsko

src/signals/admin.py

@@ -12,6 +12,7 @@
     SignalCategory,
     SignalType,
     GeographySignal,
+    GeographicScope,
 )
 from signals.resources import SignalBaseResource, SignalResource
 
@@ -100,3 +101,12 @@ class SignalAdmin(ImportExportModelAdmin):
         'has_sample_size',
     )
     resource_classes: list[type] = [SignalResource, SignalBaseResource]
+
+
+@admin.register(GeographicScope)
+class GeographicScopeAdmin(admin.ModelAdmin):
+    """
+    Admin interface for managing signal type objects.
+    """
+    list_display: tuple[Literal['name']] = ('name',)
+    search_fields: tuple[Literal['name']] = ('name',)

src/templates/signals/signals.html

@@ -59,6 +59,31 @@ <h2 class="accordion-header" id="pathogen-heading">
                                     </div>
                                 </div>
                             </div>
+                            <div class="accordion-item">
+                                <h2 class="accordion-header" id="geographic_scope-heading">
+                                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
+                                    data-bs-target="#geographic_scope-collapse" aria-expanded="false"
+                                    aria-controls="active-collapse">
+                                        <label for="id_geographic_scope" class="form-label">
+                                            Country
+                                            <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
+                                            data-bs-title="Country"
+                                            data-bs-content="{{ filters_descriptions.SignalFilter.geographic_scope }}">
+                                                <i class="bi bi-info-circle"></i>
+                                            </a>
+                                        </label>
+                                    </button>
+                                </h2>
+                                {% if form.geographic_scope.value %}
+                                <div id="geographic_scope-collapse" class="accordion-collapse" aria-labelledby="geographic_scope-heading">
+                                {% else %}
+                                <div id="geographic_scope-collapse" class="accordion-collapse collapse" aria-labelledby="geographic_scope-heading">
+                                {% endif %}
+                                    <div class="accordion-body">
+                                        {{ form.geographic_scope|as_crispy_field }}
+                                    </div>
+                                </div>
+                            </div>
                             <div class="accordion-item">
                                 <div class="accordion-header" id="available_geography-heading">
                                     <h2 class="accordion-header" id="active-heading">
@@ -112,31 +137,6 @@ <h2 class="accordion-header" id="severenity_pyramid_rungs-heading">
                                     </div>
                                 </div>
                             </div>
-                            <div class="accordion-item">
-                                <h2 class="accordion-header" id="geographic_scope-heading">
-                                    <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
-                                    data-bs-target="#geographic_scope-collapse" aria-expanded="false"
-                                    aria-controls="active-collapse">
-                                        <label for="id_geographic_scope" class="form-label">
-                                            Country
-                                            <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
-                                            data-bs-title="Country"
-                                            data-bs-content="{{ filters_descriptions.SignalFilter.geographic_scope }}">
-                                                <i class="bi bi-info-circle"></i>
-                                            </a>
-                                        </label>
-                                    </button>
-                                </h2>
-                                {% if form.geographic_scope.value %}
-                                <div id="geographic_scope-collapse" class="accordion-collapse" aria-labelledby="geographic_scope-heading">
-                                {% else %}
-                                <div id="geographic_scope-collapse" class="accordion-collapse collapse" aria-labelledby="geographic_scope-heading">
-                                {% endif %}
-                                    <div class="accordion-body">
-                                        {{ form.geographic_scope|as_crispy_field }}
-                                    </div>
-                                </div>
-                            </div>
                             <div class="accordion-item">
                                 <h2 class="accordion-header" id="source-heading">
                                     <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"