Change requests #25 #28 #30 #31

src/datasources/models.py

@@ -39,6 +39,9 @@ class SourceSubdivision(TimeStampedModel):
         on_delete=models.PROTECT
     )
 
+    class Meta:
+        ordering: list[str] = ["name"]
+
     def __str__(self) -> str:
         """
         Returns the name of the source subdivision as a string.
@@ -80,6 +83,9 @@ class DataSource(TimeStampedModel):
         related_name="data_sources"
     )
 
+    class Meta:
+        ordering: list[str] = ["name"]
+
     def __str__(self) -> str:
         """
         Returns the name of the data source as a string.

src/signals/filters.py

@@ -15,6 +15,7 @@ class Meta:
         fields: list[str] = [
             'search',
             'pathogen',
+            'active',
             'available_geography',
             'signal_type',
             'category',

src/signals/models.py

@@ -52,6 +52,7 @@ class SignalCategory(TimeStampedModel):
     )
 
     class Meta:
+        ordering: list[str] = ["name"]
         verbose_name_plural: str = "signal categories"
 
     def __str__(self) -> str:

src/signals/tests/test_views.py

@@ -14,7 +14,7 @@
 class SignalListViewTest(TestCase):
 
     def setUp(self):
-        for i in range(fake.random_int(min=1, max=100)):
+        for _ in range(fake.random_int(min=1, max=100)):
             SignalFactory()
 
     def test_signal_list_view(self):

src/signals/urls.py

@@ -5,5 +5,5 @@
 
 urlpatterns: list[URLPattern] = [
     path('', SignalsListView.as_view(), name='signals'),
-    path('signals/<pk>/', SignalsDetailView.as_view(), name='signal'),
+    path('signals/<int:pk>/', SignalsDetailView.as_view(), name='signal'),
 ]

src/templates/index.html

@@ -54,11 +54,11 @@
   <header id="header" class="header fixed-top d-flex align-items-center">
 
     <div class="d-flex align-items-center justify-content-between">
+      <i class="bi bi-list toggle-sidebar-btn"></i>
       <a href="{% url 'signals' %}" class="logo d-flex align-items-center">
         <img assets/img/logo.png" alt="">
         <span class="d-none d-lg-block">Signal Documentation</span>
       </a>
-      <i class="bi bi-list toggle-sidebar-btn"></i>
     </div><!-- End Logo -->
 
     <nav class="header-nav ms-auto">

src/templates/signals/signal_list.html

@@ -38,8 +38,8 @@ <h5 class="card-title">Signals</h5>
                     <th scope="col">Signal Type</th>
                     <th scope="col">Format</th>
                     <th scope="col">Temporal Resolution</th>
-                    <th scope="col">Signal</th>
-                    <th scope="col">Link</th>
+                    <th scope="col">Base Signal</th>
+                    <th scope="col">Links</th>
                   </tr>
                 </thead>
                 <tbody>
@@ -65,7 +65,13 @@ <h5 class="card-title">Signals</h5>
                     </td>
                     <td>{{ signal.format }}</td>
                     <td>{{ signal.time_label }}</td>
-                    <td>{{ signal.base }}</td>
+                    <td>
+                      {% if signal.base %}
+                        <a href="{% url 'signal' pk=signal.base.id %}">{{ signal.base.id }}</a>
+                      {% else %}
+                        --/--
+                      {% endif %}
+                    </td>
                     <td>
                       {% for link in signal.links.all %}
                       <ul class="list-group list-group-flush">
@@ -102,12 +108,23 @@ <h5 class="card-title">Search</h5>
             <div class="card-body">
               <h5 class="card-title">{{ filter.form.pathogen.label }}</h5>
               <select name="{{ filter.form.pathogen.name }}" class="form-select">
+                <option value="">---------</option>
                 {% for choice in filter.form.pathogen.field.choices %}
                   <option value="{{ choice.0 }}">{{ choice.1 }}</option>
                 {% endfor %}
               </select>
             </div>
           </div>
+          <div class="form-group">
+            <div class="card-body">
+              <h5 class="card-title">{{ filter.form.active.label }}</h5>
+              <select name="{{ filter.form.active.name }}" class="form-select" >
+                  <option value="">---------</option>
+                  <option value="True">True</option>
+                  <option value="False">False</option>
+              </select>
+            </div>
+          </div>
           <div class="form-group">
             <div class="card-body">
               <h5 class="card-title">{{ filter.form.available_geography.label }}</h5>