From ac2a5fc91fb31a06fedba293e1970bc8b60514b5 Mon Sep 17 00:00:00 2001
From: Dmytro Trotsko <dmytrotsko@gmail.com>
Date: Wed, 12 Jun 2024 22:00:21 +0300
Subject: [PATCH 1/4] Changed tooltips titles.

---
 src/templates/signals/signals.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/signals/signals.html b/src/templates/signals/signals.html
index be571f9..d7446f0 100644
--- a/src/templates/signals/signals.html
+++ b/src/templates/signals/signals.html
@@ -90,7 +90,7 @@ <h2 class="accordion-header" id="active-heading">
                                         <button class="accordion-button collapsed" type="button" data-bs-toggle="collapse" data-bs-target="#available_geography-collapse" aria-expanded="false" aria-controls="active-collapse">
                                             <label for="id_available_geography" class="form-label">
                                                 Geo-level
-                                                <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Available Geography" data-bs-content="{{ filters_descriptions.SignalFilter.available_geography }}"><i class="bi bi-info-circle"></i></a>
+                                                <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover" data-bs-title="Geo-level" data-bs-content="{{ filters_descriptions.SignalFilter.available_geography }}"><i class="bi bi-info-circle"></i></a>
                                             </label>
                                         </button>
                                     </h2>
@@ -144,7 +144,7 @@ <h2 class="accordion-header" id="source-heading">
                                         <label for="id_source" class="form-label">
                                             Data Source
                                             <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
-                                            data-bs-title="Source"
+                                            data-bs-title="Data Source"
                                             data-bs-content="{{ filters_descriptions.SignalFilter.source }}">
                                                 <i class="bi bi-info-circle"></i>
                                             </a>

From c2753fcd62169bc729d51ab002fb88023ba2776e Mon Sep 17 00:00:00 2001
From: Dmytro Trotsko <dmytrotsko@gmail.com>
Date: Wed, 12 Jun 2024 22:06:02 +0300
Subject: [PATCH 2/4] Updated tooltips

---
 src/templates/signals/signals.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/templates/signals/signals.html b/src/templates/signals/signals.html
index d7446f0..dc34b24 100644
--- a/src/templates/signals/signals.html
+++ b/src/templates/signals/signals.html
@@ -33,7 +33,7 @@ <h2 class="accordion-header" id="pathogen-heading">
                                             Pathogen / Syndrome
                                             <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
                                             data-bs-title="Pathogen / Syndrome"
-                                            data-bs-content="{{ filter_descriptions.SignalFilter.pathogen }}">
+                                            data-bs-content="{{ filters_descriptions.SignalFilter.pathogen }}">
                                                 <i class="bi bi-info-circle"></i>
                                             </a>
                                         </label>
@@ -117,7 +117,7 @@ <h2 class="accordion-header" id="severenity_pyramid_rungs-heading">
                                             Severity Pyramid
                                             <a tabindex="0" role="button" class="info-button" data-bs-toggle="popover"
                                             data-bs-title="Severity Pyramid"
-                                            data-bs-content="{{ filters_descriptions.SignalFilter.severity_pyramid }}">
+                                            data-bs-content="{{ filters_descriptions.SignalFilter.severenity_pyramid_rungs }}">
                                             <i class="bi bi-info-circle"></i>
                                         </a>
                                         </label>

From 42921d58c66c6e261c6e43f44ccfbdebc39552fa Mon Sep 17 00:00:00 2001
From: Dmytro Trotsko <dmytrotsko@gmail.com>
Date: Wed, 12 Jun 2024 22:17:40 +0300
Subject: [PATCH 3/4] Added 'Signals With The Same Base' table to the Signal
 Detailed View.

---
 src/signals/models.py                    |   7 ++
 src/templates/signals/signal_detail.html | 116 +++++++++++++++++------
 2 files changed, 93 insertions(+), 30 deletions(-)

diff --git a/src/signals/models.py b/src/signals/models.py
index ca79251..3700ea6 100644
--- a/src/signals/models.py
+++ b/src/signals/models.py
@@ -571,6 +571,13 @@ def has_all_demographic_scopes(self) -> bool:
         """
         return self.demographic_scope.count() == DemographicScope.objects.count()
 
+    @property
+    def same_base_signals(self):
+        """
+        Returns the signals that have the same base signal.
+        """
+        return self.base.base_for.all() if self.base else None
+
     class Meta:
         unique_together = ['name', 'source']
         ordering: list[str] = ["modified"]
diff --git a/src/templates/signals/signal_detail.html b/src/templates/signals/signal_detail.html
index bec7e6f..79fc862 100644
--- a/src/templates/signals/signal_detail.html
+++ b/src/templates/signals/signal_detail.html
@@ -181,15 +181,15 @@ <h5>About this signal</h5>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <th scope="row">Available Since</th>
+                                        <th scope="row">Temporal Scope Start</th>
                                         <td>
-                                            {{ signal.from_date }}
+                                            {{ signal.temporal_scope_start }}
                                         </td>
                                     </tr>
                                     <tr>
-                                        <th scope="row">Available Until</th>
+                                        <th scope="row">Temporal Scope End</th>
                                         <td>
-                                            {{ signal.to_date }}
+                                            {{ signal.temporal_scope_end }}
                                         </td>
                                     </tr>
                                     <tr>
@@ -218,40 +218,96 @@ <h5>Signals with same base</h5>
                                         <th scope="col">Active</th>
                                         <th scope="col">Data Source</th>
                                         <th scope="col">Description</th>
-                                        <th scope="col">Pathogen/Disease Area</th>
-                                        <th scope="col">Base Signal</th>
-                                        <th scope="col">Last Updated</th>
+                                        <th scope="col">Geographic Scope</th>
+                                        <th scope="col">Geographic Granularity, aka Geo-Level</th>
+                                        <th scope="col">Available Since</th>
+                                        <th scope="col">Available Until</th>
+                                        <th scope="col">Temporal Granularity</th>
+                                        <th scope="col">Reporting Cadence</th>
+                                        <th scope="col">Reporting Lag(nominal)</th>
+                                        <th scope="col">Revision Cadence</th>
+                                        <th scope="col">Demographic Scope</th>
+                                        <!--<th scope="col">Demographic Disaggregation</th> -->
+                                        <th scope="col">Pathogen / Syndrome</th>
+                                        <th scope="col">Severity Pyramid Rungs</th>
+                                        <th scope="col">Missingness</th>
+                                        <th scope="col">License / Data Use Restrictions</th>
                                     </tr>
                                 </thead>
                                 <tbody>
                                     {% for signal in signal.same_base_signals %}
-                                        <tr classs="clickable-table-row">
-                                            <td onClick="location.href='{% url 'signal' pk=signal.id %}';" class="clickable-table-cell">{{ signal.display_name }}</td>
-                                            {% if signal.active == True %}
-                                            <td><i class="bi bi-circle-fill" style="color:green;" ></i></td>
-                                            {% else %}
-                                                <td><i class="bi bi-circle-fill" style="color:red;" ></i></td>
-                                            {% endif %}
-                                            <td>{{ signal.source.data_source }}</td>
-                                            <td>{{ signal.description }}</td>
-                                            <td>
-                                                {% for pathogen in signal.pathogen.all %}
-                                                <span class="badge rounded-pill bg-dark">{{ pathogen|title }}</span>
-                                                {% endfor %}
+                                        <tr>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.display_name }}
                                             </td>
-                                            <td>
-                                                {% if signal.base %}
-                                                <a href="{% url 'signal' pk=signal.base.id %}">{{ signal.display_name }}</a>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {% if signal.active == True%}
+                                                <i class="bi bi-circle-fill" style="color:green;"></i>
                                                 {% else %}
-                                                --/--
+                                                <i class="bi bi-circle-fill" style="color:red;"></i>
                                                 {% endif %}
                                             </td>
-                                            <td>
-                                                {% if signal.last_updated %}
-                                                    {{ signal.last_updated|date:"Y-m-d" }}
-                                                {% else %}
-                                                    --/--
-                                                {% endif %}
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.source.external_name }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.description }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.geographic_scope.name }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {% for geography in signal.geography_signals.all %}
+                                                    <span class="badge rounded-pill bg-dark">
+                                                        {{ geography.display_name }}
+                                                    </span>
+                                                {% endfor %}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.temporal_scope_start }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.temporal_scope_end }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.time_type }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.reporting_cadence }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.typical_reporting_lag }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.typical_revision_cadence }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {% for demographic_scope in signal.demographic_scope.all %}
+                                                    <span>
+                                                        {{ demographic_scope }}
+                                                    </span>
+                                                {% endfor %}
+                                            </td>
+                                            <!-- <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                Place for Demographic Disaggregation
+                                            </td> -->
+                                            <td cla ss="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {% for pathogen in signal.pathogen.all %}
+                                                    <span class="badge rounded-pill bg-dark">
+                                                        {{ pathogen|title }}
+                                                    </span>
+                                                {% endfor %}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.severenity_pyramid_rungs }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.missingness }}
+                                            </td>
+                                            <td class="clickable-table-cell" onClick="location.href='{% url 'signal' pk=signal.id %}';">
+                                                {{ signal.license }}
+                                                <br>
+                                                {{ signal.restrictions }}
                                             </td>
                                         </tr>
                                     {% endfor %}

From d9610977e772107e211c1011f8b56e7f7b0da664 Mon Sep 17 00:00:00 2001
From: Dmytro Trotsko <dmytrotsko@gmail.com>
Date: Wed, 12 Jun 2024 22:23:01 +0300
Subject: [PATCH 4/4] Minor naming adjustments.

---
 src/templates/signals/signal_detail.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/templates/signals/signal_detail.html b/src/templates/signals/signal_detail.html
index 79fc862..6f6eab2 100644
--- a/src/templates/signals/signal_detail.html
+++ b/src/templates/signals/signal_detail.html
@@ -83,13 +83,13 @@ <h5>About this signal</h5>
                                         </td>
                                     </tr>
                                     <tr>
-                                        <th scope="row">Geography</th>
+                                        <th scope="row">Geographic Granularity, aka Geo-Level</th>
                                         <td>
                                             <ul class="no-padding">
-                                                {% for geography in signal.available_geography.all %}
+                                                {% for geography in signal.geography_signals.all %}
                                                 <a href="{% url 'signals' %}?available_geography={{ geography.id }}">
                                                     <span class="badge rounded-pill bg-dark">
-                                                        {{ geography }}
+                                                        {{ geography.display_name }}
                                                     </span>
                                                 </a>
                                                 {% endfor %}