Merge pull request #28 from cmu-delphi/bugfixes

Bugfixes

Author: dmytrotsko

src/signals/migrations/0002_auto_20241002_2027.py

@@ -33,7 +33,10 @@ class Migration(migrations.Migration):
                 ss3.display_name AS "severity_pyramid_rung",
                 ss.missingness AS "missingness",
                 ss.license AS "license",
-                ss.restrictions AS "restrictions"
+                ss.restrictions AS "restrictions",
+                ss.from_date AS "from_date",
+                ss.to_date AS "to_date",
+                ss.signal_availability_days AS "signal_availability_days"
             FROM signals_signal ss
             LEFT JOIN datasources_sourcesubdivision ds
             ON ss.source_id = ds.id

src/signals/models.py

@@ -511,6 +511,7 @@ class SignalsDbView(models.Model):
     id = models.BigIntegerField(primary_key=True)
     name = models.CharField(max_length=255)
     active = models.BooleanField()
+    display_name = models.CharField(max_length=255)
     datasource = models.CharField(max_length=255)
     description = models.TextField()
     geographic_scope = models.CharField(max_length=255)
@@ -527,6 +528,9 @@ class SignalsDbView(models.Model):
     restrictions = models.TextField()
     available_geography = models.CharField(max_length=255)
     pathogens = models.CharField(max_length=255)
+    from_date = models.DateField()
+    to_date = models.DateField()
+    signal_availability_days = models.IntegerField()
 
     class Meta:
         managed = False

src/templates/signal_sets/signal_set_detail.html

@@ -51,7 +51,7 @@ <h5>{{ signalset.data_source }}</h5>
                                     <td>
                                         <ul class="no-padding">
                                             {% for pathogen in signalset.pathogens.all %}
-                                            <a href="{% url 'signals' %}?pathogens={{ pathogen.id }}">
+                                            <a href="{% url 'signal_sets' %}?pathogens={{ pathogen.id }}">
                                                 <span class="badge rounded-pill bg-dark">
                                                     {{ pathogen|title }}
                                                 </span>
@@ -69,7 +69,7 @@ <h5>{{ signalset.data_source }}</h5>
                                     <td>
                                         <ul class="no-padding">
                                             {% for geography in signalset.available_geographies.all %}
-                                            <a href="{% url 'signals' %}?available_geography={{ geography.id }}">
+                                            <a href="{% url 'signal_sets' %}?available_geography={{ geography.id }}">
                                                 <span class="badge rounded-pill bg-dark">
                                                     {{ geography }}
                                                 </span>
@@ -124,7 +124,7 @@ <h5>{{ signalset.data_source }}</h5>
                                     <th scope="row">Severity Pyramid Rung(s)</th>
                                     <td>
                                         {% for severity_pyramid_rung in signalset.severity_pyramid_rungs.all %}
-                                            <a href="{% url 'signals' %}?severity_pyramid_rung={{ severity_pyramid_rung.id }}">
+                                            <a href="{% url 'signal_sets' %}?severity_pyramid_rung={{ severity_pyramid_rung.id }}">
                                                 <span class="badge rounded-pill bg-dark">
                                                     {{ severity_pyramid_rung }}
                                                 </span>

src/templates/signal_sets/signal_sets.html

@@ -45,11 +45,7 @@ <h2 class="accordion-header" id="flush-heading_{{ form.pathogens.auto_id }}">
                                         <input type="checkbox" class="form-check-input" id="select-all">
                                         <label class="form-check-label" for="select-all">Select all</label>
                                     </div>
-                                    <div id="div_id_pathogen" class="mb-3">
-                                        <div>
-                                            {{ form.pathogens|as_crispy_field }}
-                                        </div>
-                                    </div>
+                                    {{ form.pathogens|as_crispy_field }}
                                 </div>
                             </div>
                         </div>