Merge pull request #50 from cmu-delphi/staging

Prep for production deployment

Author: dmytrotsko

src/assets/css/style.css

@@ -1349,6 +1349,10 @@ h6 {
     padding-left: 0px!important;
 }
 
+.select2-dropdown {
+    z-index: 9999!important;
+}
+
 .popover {
     max-width: 50%;
 }
@@ -1367,4 +1371,18 @@ h6 {
 
 .tableformat td:nth-child(1){
     width: 10rem;
-}
+}
+
+
+.float{
+	position:fixed;
+	width:150px;
+	height:60px;
+	bottom:40px;
+	right:40px;
+	text-align:center;
+}
+
+.form-check > label.form-check-label {
+    display: block!important; /* Ensure the label takes up the full width */
+}

src/assets/js/select_signals.js

@@ -0,0 +1,92 @@
+// Function to update the modal content
+function updateSelectedSignalsModal() {
+    var selectedSignals = localStorage.getItem('selectedSignals');
+    var signals = selectedSignals ? JSON.parse(selectedSignals) : {};
+
+    var selectedSignalsList = document.getElementById('selectedSignalsList');
+    selectedSignalsList.innerHTML = ''; // Clear existing items
+
+
+    for (const signal in signals) {
+        let data = JSON.parse(localStorage.getItem("selectedSignals"))[signal];
+        console.log(data);
+        var tr = document.createElement('tr');
+        var memberName = document.createElement('td');
+        memberName.textContent = data['info']['memberName'];
+        tr.appendChild(memberName);
+        var memberDescription = document.createElement('td');
+        memberDescription.textContent = data['info']['memberDescription'];
+        tr.appendChild(memberDescription);
+        var dataSource = document.createElement('td');
+        dataSource.textContent = data['epivis']['params']['data_source'];
+        tr.appendChild(dataSource);
+        var signalName = document.createElement('td');
+        signalName.textContent = data['epivis']['params']['signal'];
+        tr.appendChild(signalName);
+        var timeType = document.createElement('td');
+        timeType.textContent = data['epivis']['params']['time_type'];
+        tr.appendChild(timeType);
+        var geoType = document.createElement('td');
+        geoType.textContent = data['epivis']['params']['geo_type'];
+        tr.appendChild(geoType);
+        var geoValue = document.createElement('td');
+        geoValue.textContent = data['epivis']['params']['geo_value'];
+        tr.appendChild(geoValue);
+        selectedSignalsList.appendChild(tr);
+    }
+}
+
+function addSelectedSignals(dataSource, timeType, signalSetEndpoint) {
+    let selectedSignals = localStorage.getItem("selectedSignals");
+    selectedSignals = selectedSignals ? JSON.parse(selectedSignals) : {};
+    var dataSignals = Array.from(document.getElementsByName('selectedSignal'), (signal) => (signal.checked) ? signal : null).filter((el) => el !== null);
+    var geographicType = document.getElementById('geographic_type').value;
+    // 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.");
+        return;
+    }
+
+    var geographicValues = geographicValue.split(',');
+    dataSignals.forEach((signal) => {
+        geographicValues.forEach((geographicValue) => {
+            selectedSignals[`${signal.value}_${geographicValue}`] = {
+                info: {
+                    memberName: signal.getAttribute('data-member-name'),
+                    memberDescription: signal.getAttribute('data-member-description'), 
+                },
+                epivis: {
+                color: '#' + (Math.random() * 0xFFFFFF << 0).toString(16).padStart(6, '0'),
+                title: "value",
+                params: {
+                    _endpoint: signalSetEndpoint,
+                    data_source: dataSource,
+                    signal: signal.value,
+                    time_type: timeType,
+                    geo_type: geographicType,
+                    geo_value: geographicValue
+                }
+            }
+            };
+        });
+    });
+    localStorage.setItem("selectedSignals", JSON.stringify(selectedSignals));
+    updateSelectedSignalsModal();
+    $("#showSelectedSignalsButton").show();
+}
+
+
+
+document.addEventListener('DOMContentLoaded', function() {
+    // Call the function to update the modal content when the page loads
+    updateSelectedSignalsModal();
+
+});
+
+
+
+//for (const signal in JSON.parse(localStorage.getItem("selectedSignals"))) {console.log(JSON.parse(localStorage.getItem("selectedSignals"))[signal])}

src/rest_api/__init__.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

src/rest_api/admin.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class RestApiConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
+    name = 'rest_api'

src/rest_api/apps.py

@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.

src/rest_api/migrations/__init__.py

@@ -0,0 +1,27 @@
+from rest_framework.serializers import ModelSerializer, SlugRelatedField
+
+from signals.models import Signal, Geography
+
+
+class SignalSerializer(ModelSerializer):
+    """
+    Serializer for the Signal model.
+    """
+
+    source = SlugRelatedField(read_only=True, slug_field="name")
+    signal_type = SlugRelatedField(read_only=True, slug_field="name")
+    available_geography = SlugRelatedField(many=True, read_only=True, slug_field="name")
+
+    class Meta:
+        model = Signal
+        fields = ["name", "source", "signal_type", "available_geography", "time_type"]
+
+
+class AvailableGeographySerializer(ModelSerializer):
+    """
+    Serializer for the AvailableGeography model.
+    """
+
+    class Meta:
+        model = Geography
+        fields = ["name", "display_name"]

src/rest_api/models.py

@@ -0,0 +1,12 @@
+from django.urls import path
+from django.urls.resolvers import URLPattern
+
+from rest_api.views import api_signal_detail_view, api_available_geography_view
+
+
+urlpatterns: list[URLPattern] = [
+    path("rest_api/signal/<int:pk>", api_signal_detail_view, name="api_signal_detail"),
+    path("rest_api/signal/", api_signal_detail_view, name="api_signal_detail"),
+    path("rest_api/geo_level/<int:pk>", api_available_geography_view, name="api_available_geography_detail"),
+    path("rest_api/geo_level/", api_available_geography_view, name="api_available_geography_detail")
+]

src/rest_api/serializers.py

@@ -0,0 +1,59 @@
+from rest_framework.decorators import api_view
+from rest_framework.response import Response
+
+from rest_api.serializers import SignalSerializer, AvailableGeographySerializer
+from signals.models import Signal, Geography
+
+
+@api_view(
+    [
+        "GET",
+    ]
+)
+def api_signal_detail_view(request, pk):
+    """
+    API view for getting a single Signal object.
+
+    Args:
+        request: The request object.
+        pk: The primary key of the Signal object.
+
+    Returns:
+        Response: The response object.
+    """
+
+    try:
+        signal = Signal.objects.get(pk=pk)
+    except Signal.DoesNotExist:
+        return Response(status=404)
+
+    if request.method == "GET":
+        serializer = SignalSerializer(signal)
+        return Response(serializer.data)
+
+
+@api_view(
+    [
+        "GET",
+    ]
+)
+def api_available_geography_view(request, pk):
+    """
+    API view for getting a single Geography.
+
+    Args:
+        request: The request object.
+        pk: The primary key of the Geography object.
+
+    Returns:
+        Response: The response object.
+    """
+
+    try:
+        geography = Geography.objects.get(pk=pk)
+    except Geography.DoesNotExist:
+        return Response(status=404)
+
+    if request.method == "GET":
+        serializer = AvailableGeographySerializer(geography)
+        return Response(serializer.data)