Skip to content

Commit 275e8b8

Browse files
dmytrotskodmytrotsko
committed
Moved Country filter above Geo Level. Added Geographic Scope to the admin page.
1 parent 391400e commit 275e8b8

2 files changed

Lines changed: 35 additions & 25 deletions

File tree

‎src/signals/admin.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
SignalCategory,
1313
SignalType,
1414
GeographySignal,
15+
GeographicScope,
1516
)
1617
from signals.resources import SignalBaseResource, SignalResource
1718

@@ -100,3 +101,12 @@ class SignalAdmin(ImportExportModelAdmin):
100101
'has_sample_size',
101102
)
102103
resource_classes: list[type] = [SignalResource, SignalBaseResource]
104+
105+
106+
@admin.register(GeographicScope)
107+
class GeographicScopeAdmin(admin.ModelAdmin):
108+
"""
109+
Admin interface for managing signal type objects.
110+
"""
111+
list_display: tuple[Literal['name']] = ('name',)
112+
search_fields: tuple[Literal['name']] = ('name',)

‎src/templates/signals/signals.html‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,31 @@ <h2 class="accordion-header" id="pathogen-heading">
5959
</div>
6060
</div>
6161
</div>
62+
<div class="accordion-item">
63+
<h2 class="accordion-header" id="geographic_scope-heading">
64+
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
65+
data-bs-target="#geographic_scope-collapse" aria-expanded="false"
66+
aria-controls="active-collapse">
67+
<label for="id_geographic_scope" class="form-label">
68+
Country
69+
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
70+
data-bs-title="Country"
71+
data-bs-content="{{ filters_descriptions.SignalFilter.geographic_scope }}">
72+
<i class="bi bi-info-circle"></i>
73+
</a>
74+
</label>
75+
</button>
76+
</h2>
77+
{% if form.geographic_scope.value %}
78+
<div id="geographic_scope-collapse" class="accordion-collapse" aria-labelledby="geographic_scope-heading">
79+
{% else %}
80+
<div id="geographic_scope-collapse" class="accordion-collapse collapse" aria-labelledby="geographic_scope-heading">
81+
{% endif %}
82+
<div class="accordion-body">
83+
{{ form.geographic_scope|as_crispy_field }}
84+
</div>
85+
</div>
86+
</div>
6287
<div class="accordion-item">
6388
<div class="accordion-header" id="available_geography-heading">
6489
<h2 class="accordion-header" id="active-heading">
@@ -112,31 +137,6 @@ <h2 class="accordion-header" id="severenity_pyramid_rungs-heading">
112137
</div>
113138
</div>
114139
</div>
115-
<div class="accordion-item">
116-
<h2 class="accordion-header" id="geographic_scope-heading">
117-
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"
118-
data-bs-target="#geographic_scope-collapse" aria-expanded="false"
119-
aria-controls="active-collapse">
120-
<label for="id_geographic_scope" class="form-label">
121-
Country
122-
<a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
123-
data-bs-title="Country"
124-
data-bs-content="{{ filters_descriptions.SignalFilter.geographic_scope }}">
125-
<i class="bi bi-info-circle"></i>
126-
</a>
127-
</label>
128-
</button>
129-
</h2>
130-
{% if form.geographic_scope.value %}
131-
<div id="geographic_scope-collapse" class="accordion-collapse" aria-labelledby="geographic_scope-heading">
132-
{% else %}
133-
<div id="geographic_scope-collapse" class="accordion-collapse collapse" aria-labelledby="geographic_scope-heading">
134-
{% endif %}
135-
<div class="accordion-body">
136-
{{ form.geographic_scope|as_crispy_field }}
137-
</div>
138-
</div>
139-
</div>
140140
<div class="accordion-item">
141141
<h2 class="accordion-header" id="source-heading">
142142
<button class="accordion-button collapsed" type="button" data-bs-toggle="collapse"

0 commit comments

Comments
 (0)