Merge branch 'development' into OKRS24-165

Author: dmytrotsko

src/assets/css/custom.css

@@ -67,6 +67,10 @@
     padding: 0;
 }
 
+.pt-05 {
+    padding-top: 0.5rem;
+}
+
 .border-left {
     border-left: 1px solid #e4e4e4;
 }

src/fixtures/nation.json

@@ -0,0 +1,15 @@
+[
+    {
+        "model": "signals.geographyunit",
+        "pk": 3985,
+        "fields": {
+            "created": "2024-05-27T13:52:04.705Z",
+            "modified": "2024-05-27T13:52:04.705Z",
+            "geo_id": "US",
+            "name": "United States",
+            "display_name": "United States",
+            "level": 5,
+            "geography": 5
+        }
+    }
+]

src/signal_documentation/settings.py

@@ -48,7 +48,7 @@
 
 
 # SECURITY WARNING: don't run with debug turned on in production!
-DEBUG = True
+DEBUG = bool(strtobool(os.getenv('DEBUG', 'True')))
 
 
 # SECURITY WARNING: keep the secret key used in production secret!

src/signals/filters.py

@@ -14,7 +14,7 @@
 from signals.models import (
     FormatChoices,
     Signal,
-    TimeLabelChoices,
+    TimeTypeChoices,
 )
 
 
@@ -42,7 +42,7 @@ class SignalFilter(django_filters.FilterSet):
     )
     format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.choices)
     source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all())
-    time_label = django_filters.MultipleChoiceFilter(choices=TimeLabelChoices.choices)
+    time_type = django_filters.MultipleChoiceFilter(choices=TimeTypeChoices.choices)
 
     class Meta:
         model = Signal
@@ -56,7 +56,7 @@ class Meta:
             'category',
             'format_type',
             'source',
-            'time_label',
+            'time_type',
         ]
 
     def filter_search(self, queryset, name, value) -> Any:

src/signals/forms.py

@@ -7,7 +7,7 @@
     FormatChoices,
     Pathogen,
     Signal,
-    TimeLabelChoices,
+    TimeTypeChoices,
 )
 
 
@@ -29,7 +29,7 @@ class SignalFilterForm(forms.ModelForm):
     active = forms.TypedMultipleChoiceField(choices=ActiveChoices.choices, coerce=bool, widget=forms.CheckboxSelectMultiple())
     format_type = forms.ChoiceField(choices=FormatChoices.choices, widget=forms.CheckboxSelectMultiple())
     source = forms.ModelMultipleChoiceField(queryset=SourceSubdivision.objects.all(), widget=forms.CheckboxSelectMultiple())
-    time_label = forms.ChoiceField(choices=TimeLabelChoices.choices, widget=forms.CheckboxSelectMultiple())
+    time_type = forms.ChoiceField(choices=TimeTypeChoices.choices, widget=forms.CheckboxSelectMultiple())
 
     class Meta:
         model = Signal
@@ -44,7 +44,7 @@ class Meta:
             'format_type',
             'signal_type',
             'source',
-            'time_label',
+            'time_type',
         ]
 
         widgets = {

src/signals/views.py

@@ -53,7 +53,7 @@ def get_url_params(self):
             else None,
             "format_type": [el for el in self.request.GET.getlist("format_type")],
             "source": [int(el) for el in self.request.GET.getlist("source")],
-            "time_label": [el for el in self.request.GET.getlist("time_label")]
+            "time_type": [el for el in self.request.GET.getlist("time_type")]
         }
         url_params_str = ""
         for param_name, param_value in url_params_dict.items():

src/templates/signals/epivis_export_data_block.html

@@ -106,7 +106,7 @@ <h5>Plot / Export data</h5>
 <script>
     var geoValues = [];
     var currentMode = 'epivis';
-    
+
     function getFilteredGeographicValues(geographicType) {
         var data = geoValues.reduce((data, geoValue) => {
             if (geoValue.geoType === geographicType) {
@@ -130,7 +130,7 @@ <h5>Plot / Export data</h5>
         } else {
             data = [];
         }
-        
+
 
         $('#geographic_value').select2({
             data: data,
@@ -146,7 +146,7 @@ <h5>Plot / Export data</h5>
 
     function handleModeChange(mode) {
         document.getElementById("epivis-form").reset();
-        
+
         var choose_dates = document.getElementsByName('choose_date');
         if (mode === 'epivis') {
             currentMode = 'epivis';
@@ -179,7 +179,7 @@ <h5>Plot / Export data</h5>
     $(document).ready(function () {
         {% for geography in signal.available_geography.all %}
             {% for unit in geography.geography_units.all %}
-                geoValues.push({'id': '{{ unit.geo_id }}', 'geoType': '{{ unit.geography }}', 'text': '{{ unit.display_name }}'});   
+                geoValues.push({'id': '{{ unit.geo_id }}', 'geoType': '{{ unit.geography }}', 'text': '{{ unit.display_name }}'});
             {% endfor %}
         {% endfor %}
 
@@ -201,11 +201,14 @@ <h5>Plot / Export data</h5>
 
     function submitMode(event) {
         event.preventDefault();
-        
+
         var dataSource = document.getElementById('source').value;
         var dataSignal = document.getElementById('signal').value;
         var geographicType = document.getElementById('geographic_type').value;
-        var geographicValue = $('#geographic_value').select2('data').map((el) => el.id).join(',');
+        // geographicValue is a comma separated string of geographic values. type can be string or integer
+        // in case of string, it should be converted to lowercase
+        // else it will be treated as integer
+        var geographicValue = $('#geographic_value').select2('data').map((el) => (typeof el.id === 'string') ? el.id.toLowerCase() : el.id).join(',');
 
         if (geographicType === 'Choose...' || geographicValue === '') {
             showWarningAlert("Geographic Type or Geographic Value is not selected.");

src/templates/signals/signal_detail.html

@@ -73,10 +73,11 @@ <h5>About this signal</h5>
                                         <td>
                                             <ul class="no-padding">
                                                 {% for pathogen in signal.pathogen.all %}
-                                                <span
-                                                    class="badge rounded-pill bg-dark"
-                                                    >{{ pathogen|title }}</span
-                                                >
+                                                <a href="{% url 'signals' %}?pathogen={{ pathogen.id }}">
+                                                    <span class="badge rounded-pill bg-dark">
+                                                        {{ pathogen|title }}
+                                                    </span>
+                                                </a>
                                                 {% endfor %}
                                             </ul>
                                         </td>
@@ -86,10 +87,11 @@ <h5>About this signal</h5>
                                         <td>
                                             <ul class="no-padding">
                                                 {% for geography in signal.available_geography.all %}
-                                                <span
-                                                    class="badge rounded-pill bg-dark"
-                                                    >{{ geography }}</span
-                                                >
+                                                <a href="{% url 'signals' %}?available_geography={{ geography.id }}">
+                                                    <span class="badge rounded-pill bg-dark">
+                                                        {{ geography }}
+                                                    </span>
+                                                </a>
                                                 {% endfor %}
                                             </ul>
                                         </td>
@@ -99,10 +101,11 @@ <h5>About this signal</h5>
                                         <td>
                                             <ul class="no-padding">
                                                 {% for signal_type in signal.signal_type.all %}
-                                                <span
-                                                    class="badge rounded-pill bg-dark"
-                                                    >{{ signal_type }}</span
-                                                >
+                                                <a href="{% url 'signals' %}?signal_type={{ signal_type.id }}">
+                                                    <span class="badge rounded-pill bg-dark">
+                                                        {{ signal_type }}
+                                                    </span>
+                                                </a>
                                                 {% endfor %}
                                             </ul>
                                         </td>

src/templates/signals/signals.html

@@ -186,13 +186,13 @@ <h2 class="accordion-header" id="available_geography-heading">
                                     </label>
                                 </button>
                               </h2>
-                                {% if form.time_label.value %}
-                                  <div id="time_label-collapse" class="accordion-collapse" aria-labelledby="time_label-heading">
+                                {% if form.time_type.value %}
+                                  <div id="time_type-collapse" class="accordion-collapse" aria-labelledby="time_type-heading">
                                 {% else %}
-                                  <div id="time_label-collapse" class="accordion-collapse collapse" aria-labelledby="time_label-heading">
+                                  <div id="time_type-collapse" class="accordion-collapse collapse" aria-labelledby="time_type-heading">
                                 {% endif %}
                                 <div class="accordion-body">
-                                    {{ form.time_label|as_crispy_field }}
+                                    {{ form.time_type|as_crispy_field }}
                                 </div>
                               </div>
                             </div>
@@ -207,7 +207,14 @@ <h2 class="accordion-header" id="available_geography-heading">
         </div>
         <div class="col-9">
             <div class="row margin-bottom-1rem d-flex justify-content-end">
-                <div class="col-4">
+                <div class="col-6">
+                    <div class="input-group mb-3 d-flex justify-content-start">
+                        <span class="pt-05">
+                            Showing {{ signals|length }} row{{ signals|length|pluralize:"s" }}.
+                        </span>
+                    </div>
+                </div>
+                <div class="col-6">
                     <div class="input-group mb-3 d-flex justify-content-end">
                         <label class="input-group-text form-label" for="id_order_by" id="order_by_label">Sort By</label>
                         {{ form.order_by|as_crispy_field }}
@@ -216,7 +223,7 @@ <h2 class="accordion-header" id="available_geography-heading">
             </div>
             <div class="row">
                 <div class="card signals-list-card no-padding">
-                    <div class="card-header d-flex justify-content-between align-items-center">
+                    <div class="card-header d-flex justify-content-between align-items-center table-responsive">
                         <table class="table table-borderless table-hover">
                             <thead>
                                 <tr>
@@ -243,7 +250,7 @@ <h2 class="accordion-header" id="available_geography-heading">
                                         {% else %}
                                             <td><i class="bi bi-circle-fill" style="color:red;" ></i></td>
                                         {% endif %}
-                                        <td>{{ signal.source }}</td>
+                                        <td>{{ signal.source.data_source }}</td>
                                         <td>{{ signal.description }}</td>
                                         <td>
                                             {% for pathogen in signal.pathogen.all %}
@@ -252,7 +259,7 @@ <h2 class="accordion-header" id="available_geography-heading">
                                         </td>
                                         <td>
                                             {% if signal.base %}
-                                            <a href="{% url 'signal' pk=signal.base.id %}">{{ signal.base.id }}</a>
+                                            <a href="{% url 'signal' pk=signal.base.id %}">{{ signal.display_name }}</a>
                                             {% else %}
                                             --/--
                                             {% endif %}