Merge branch 'development' of https://github.com/cmu-delphi/signal_documentation into OKRS24-187-Signals-Add-a-filter-to-show-only-base-signals

Author: BrainIsDead

src/assets/css/custom.css

@@ -67,6 +67,10 @@
     padding: 0;
 }
 
+.pt-05 {
+    padding-top: 0.5rem;
+}
+
 .border-left {
     border-left: 1px solid #e4e4e4;
 }
@@ -125,4 +129,8 @@
 
 .select2-container .select2-selection--single .select2-selection__rendered {
     padding-left: 0px!important;
-}
+}
+
+.popover {
+    max-width: 50%;
+}

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

src/templates/index.html

@@ -27,6 +27,9 @@
     <link href="{% static 'vendor/remixicon/remixicon.css' %}" rel="stylesheet">
     <link href="{% static 'vendor/simple-datatables/style.css' %}" rel="stylesheet">
 
+    <!-- Vendor JS Files -->
+    <script src="{% static 'vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
+
     <!-- Template Main CSS File -->
     <link href="{% static 'css/style.css' %}" rel="stylesheet" />
     <link href="{% static 'css/custom.css' %}" rel="stylesheet" />
@@ -106,28 +109,27 @@
     <footer class="py-3 my-4">
       <ul class="nav justify-content-center border-bottom pb-3 mb-3">
         <li class="nav-item">
-          <a href="#" class="nav-link px-2 text-muted">Home</a>
+          <a href="https://delphi.cmu.edu/about/" class="nav-link px-2 text-muted">Delphi</a>
         </li>
         <li class="nav-item">
-          <a href="#" class="nav-link px-2 text-muted">Features</a>
+          <a href="https://cmu-delphi.github.io/delphi-epidata/" class="nav-link px-2 text-muted">API</a>
         </li>
         <li class="nav-item">
-          <a href="#" class="nav-link px-2 text-muted">Pricing</a>
+          <a href="https://github.com/cmu-delphi/" class="nav-link px-2 text-muted">GitHub</a>
         </li>
         <li class="nav-item">
-          <a href="#" class="nav-link px-2 text-muted">FAQs</a>
+          <a href="https://www.cmu.edu/" class="nav-link px-2 text-muted">CMU</a>
         </li>
         <li class="nav-item">
-          <a href="#" class="nav-link px-2 text-muted">About</a>
+          <a href="https://delphi.cmu.edu/covidcast/" class="nav-link px-2 text-muted">Overview</a>
         </li>
       </ul>
-      <p class="text-center text-muted">© 2022 Company, Inc</p>
+      <p class="text-center text-muted">© 2024, Delphi Group</p>
     </footer>
 
     <!-- Template Main JS File -->
 
     <script src="{% static 'vendor/apexcharts/apexcharts.min.js' %}"></script>
-    <script src="{% static 'vendor/bootstrap/js/bootstrap.bundle.min.js' %}"></script>
     <script src="{% static 'vendor/chart.js/chart.umd.js' %}"></script>
     <script src="{% static 'vendor/echarts/echarts.min.js' %}"></script>
     <script src="{% static 'vendor/quill/quill.min.js' %}"></script>
@@ -136,7 +138,7 @@
 
     <script src="{% static 'js/main.js' %}"></script>
 
-    
+
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/js/select2.min.js"></script>
   </body>
 </html>

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.");