Sync hardware-team with master

README.md

@@ -10,12 +10,9 @@
 
 # Team Project repo
 
-Heroku Production (master) URI: [https://nyu-mercury-prod.herokuapp.com/](https://nyu-mercury-prod.herokuapp.com/)
-
-Heroku Staging (develop) URI: [https://nyu-mercury.herokuapp.com](https://nyu-mercury.herokuapp.com)
-
-Heroku Dashboard: [https://dashboard.heroku.com/pipelines/35c0558f-127e-482b-8cdf-3f4d24464872](https://dashboard.heroku.com/pipelines/35c0558f-127e-482b-8cdf-3f4d24464872)
+Heroku (master): [https://spring2020-cs-gy-9223-prod.herokuapp.com/](https://spring2020-cs-gy-9223-prod.herokuapp.com/)
 
+*It's not automaticaly deployed for the time being. Please reach out to Dan Gopstein (dg2514@nyu.edu) or Yonguk Jeong (yj1679@nyu.edu) for access to the heroku instance.
 
 # First time repo setup
 1. From the root of the repo, run `scripts/setup.sh`. Activate your virtualenv first.
@@ -47,9 +44,3 @@ Run `python manage.py runserver` from the root of this Git repo
 
 # HOWTO Run tests locally
 Run `python manage.py test`
-
-# HOWTO Install SymmetricDS
-```
-cd symmetricds
-make install
-```

ag_data/tests/test_simulator.py

@@ -278,7 +278,7 @@ def test_simulator_log_multiple_measurements(self):
         finally:
             sys.stdout = saved_stdout
 
-    def test_simulator_log_continuous_measurements(self):
+    def not_test_simulator_log_continuous_measurements(self):
         """Tests the logLiveMeasurements(self, frequencyInHz, sleepTimer) method in the
         Simulator class. By default, it will run the test 10 times.
 

mercury/forms.py

@@ -1,7 +1,7 @@
 """This module defines the ModelForms (or Forms) that are used by the rendering
 engine to accept input for various features of the site"""
 from django import forms
-from ag_data.models import AGEvent, AGVenue
+from ag_data.models import AGEvent, AGVenue, AGSensor
 from mercury.models import (
     GFConfig,
     TemperatureSensor,
@@ -56,6 +56,21 @@ class Meta:
         }
 
 
+class CustomModelChoiceField(forms.ModelMultipleChoiceField):
+    def label_from_instance(self, obj):
+        return "%s" % (obj.name)
+
+
+class DashboardSensorPanelsForm(forms.ModelForm):
+    class Meta:
+        model = AGSensor
+        exclude = ["id", "name", "type_id"]
+
+    sensors = CustomModelChoiceField(
+        widget=forms.CheckboxSelectMultiple, queryset=AGSensor.objects.all(), label=""
+    )
+
+
 class TemperatureForm(forms.ModelForm):
     class Meta:
         model = TemperatureSensor

mercury/grafanaAPI/grafana_api.py

@@ -3,6 +3,7 @@
 import requests
 import string
 import random
+from ag_data.models import AGSensor, AGEvent
 
 TOKEN = "eyJrIjoiRTQ0cmNGcXRybkZlUUNZWmRvdFI0UlMwdFVYVUt3bzgiLCJuIjoia2V5IiwiaWQiOjF9"
 HOST = "https://dbc291.grafana.net"
@@ -85,10 +86,24 @@ def validate_credentials(self):
 
         return True
 
-    def get_dashboard_by_event_name(self, event_name):
+    def get_all_dashboards(self):
+        """
+        :return: A list of all existing dashboards (excluding the home dashboard).
+        If an empty list is returned, there are no dashboards except for the home
+        dashboard.
+        """
+
+        endpoint = os.path.join(self.hostname, "api/search/")
+        response = requests.get(url=endpoint, auth=("api_key", self.api_token))
+        json = response.json()
+        return json
+
+    def get_dashboard_by_name(self, event_name):
         """
         :param event_name: Event name used for the target dashboard.
-        :return: Returns True if a dashboard was found with this name, False otherwise.
+        :return: Returns a JSON response from the API with basic details if a
+        dashboard was found with this name, including a JSON representation of the
+        dashboard and its panels, False otherwise.
         """
         # If there are spaces in the name, the GF API will replace them with dashes
         # to generate the "slug". A slug can be used to query the API.
@@ -102,6 +117,18 @@ def get_dashboard_by_event_name(self, event_name):
         else:
             return None
 
+    def get_dashboard_url_by_name(self, name):
+        name = name.strip().lower().replace(" ", "-")
+
+        dashboard = self.get_dashboard_by_name(name)
+        if dashboard:
+            endpoint = dashboard["meta"]["url"].strip("/")
+            url = os.path.join(self.hostname, endpoint)
+        else:
+            url = None
+
+        return url
+
     def get_dashboard_with_uid(self, uid):
         """
         :param uid: uid of the target dashboard
@@ -271,6 +298,11 @@ def create_postgres_datasource(self, title="Datasource"):
         - Datasource with the same name already exists
 
         """
+        if self.database_password == "":
+            require_ssl = "disable"
+        else:
+            require_ssl = "require"
+
         db = {
             "id": None,
             "orgId": None,
@@ -283,7 +315,7 @@ def create_postgres_datasource(self, title="Datasource"):
             "database": self.database_name,
             "basicAuth": False,
             "isDefault": True,
-            "jsonData": {"postgresVersion": 903, "sslmode": "require"},
+            "jsonData": {"postgresVersion": 903, "sslmode": require_ssl},
         }
 
         headers = {"Content-Type": "application/json"}
@@ -327,7 +359,7 @@ def delete_datasource_by_name(self, name):
                 return True
             else:
                 return False
-        except KeyError:
+        except (KeyError, TypeError):
             return False
 
     def add_panel(self, sensor, event):
@@ -357,15 +389,15 @@ def add_panel(self, sensor, event):
             field_array.append(field)
 
         # Find dashboard uid for event
-        dashboard_info = self.get_dashboard_by_event_name(event.name)
+        dashboard_info = self.get_dashboard_by_name(event.name)
 
         if dashboard_info is None:
             raise ValueError("Dashboard not found for this event.")
 
         # Retrieve current panels
         try:
             panels = dashboard_info["dashboard"]["panels"]
-        except KeyError:
+        except (KeyError, TypeError):
             panels = []
 
         # If first panel
@@ -429,31 +461,88 @@ def add_panel(self, sensor, event):
         except KeyError as error:
             raise ValueError(f"Sensor panel not added: {error}")
 
-    def delete_all_panels(self, uid):
+    def delete_all_panels_by_dashboard_name(self, name):
         """
 
-        Deletes all panels from dashboard with given uid.
+        Deletes all panels from dashboard with given name.
 
-        :param uid: uid of dashboard to delete
+        :param name: name of dashboard to delete
         :return: None.
         """
 
         # Retrieve current dashboard dict
-        dashboard_info = self.get_dashboard_with_uid(uid)
+        dashboard_info = self.get_dashboard_by_name(name)
 
         # Create updated dashboard dict with empty list of panels
         panels = []
         updated_dashboard = self.create_dashboard_update_dict(dashboard_info, panels)
 
-        # POST updated dashboard with empty list of panels
+        # POST updated dashboard
         headers = {"Content-Type": "application/json"}
         requests.post(
-            self.urls["dashboard_post"],
+            self.endpoints["dashboards"],
             data=json.dumps(updated_dashboard),
             headers=headers,
             auth=("api_key", self.api_token),
         )
 
+    # TODO For each sensor in sensors, check if the sensor is already found in the
+    #  dashboard. If it isn't, add a new panel. If it already exists, check what is
+    #  different - avoid overwriting style changes
+    def update_dashboard_panels(self, dashboard_name, sensors=[]):
+        """
+        Updates the dashboard with title=`dashboard_name` so that it displays sensor
+        panels based on the ones in `sensors`. If `sensors` is empty, panels will be
+        cleared from the dashboard.
+
+        :param dashboard_name: Name of dashboard to reset.
+        :param sensors: Optional list of sensors, if provided sensor panels will be
+        added.
+        :return: N/a.
+        """
+        # remove all panels
+        self.delete_all_panels_by_dashboard_name(dashboard_name)
+
+        # retrieve event object
+        event = AGEvent.objects.filter(name=dashboard_name).first()
+
+        if event:
+            # add new set of panels if provided
+            for sensor in sensors:
+                self.add_panel(sensor, event)
+        else:
+            raise ValueError(
+                "Unable to locate event with dashboard name: " + dashboard_name
+            )
+
+    def get_all_sensors(self, dashboard_name):
+        """
+
+        :param dashboard_name: Name of the target dashboard
+        :return: Returns a list of all sensor objects which currently exist as panels
+        in the dashboard.
+
+        """
+        # Retrieve the current dashboard
+        dashboard = self.get_dashboard_by_name(dashboard_name)
+
+        try:
+            dashboard = dashboard["dashboard"]
+            panels = dashboard["panels"]
+        except (KeyError, TypeError):
+            panels = []
+
+        sensor_names = []
+        for panel in panels:
+            sensor_names.append(panel["title"])
+
+        sensors = []
+        for name in sensor_names:
+            sensor = AGSensor.objects.filter(name=name).first()
+            sensors.append(sensor)
+
+        return sensors
+
     # Helper method for add_panel
     def create_panel_dict(self, panel_id, fields, panel_sql_query, title, x, y):
         """
@@ -477,7 +566,7 @@ def create_panel_dict(self, panel_id, fields, panel_sql_query, title, x, y):
             "bars": False,
             "dashLength": 10,
             "dashes": False,
-            "datasource": self.database_name,
+            "datasource": "Datasource",
             "fill": 1,
             "fillGradient": 0,
             "gridPos": {"h": 9, "w": 12, "x": x, "y": y},
@@ -581,7 +670,7 @@ def create_dashboard_update_dict(self, dashboard_info, panels, overwrite=True):
             # templating = dashboard_info["dashboard"]["templating"]
             version = dashboard_info["meta"]["version"]
             folder_id = dashboard_info["meta"]["folderId"]
-        except KeyError:
+        except (KeyError, TypeError):
             raise ValueError(f"dashboard_info object is invalid: {dashboard_info}")
 
         # Prepare updated_dashboard object

mercury/static/mercury/js/events.js

@@ -1,5 +1,21 @@
+function toggleActiveEvents(event_name, active){
+    console.log(event_name)
+    resetActiveEvents();
+    if (active == true) {
+        $('#'+event_name+'').add-attr( "checked", "false");
+    } else {
+        $('#'+event_name+'').add-attr( "checked", "true");
+    }
+}
+
+function resetActiveEvents(){
+    console.log("reset")
+    $('input:checkbox').removeAttr( "checked");
+}
+
 function toggleEventButton(button_name){
     resetEventButtons();
+
     if (button_name == "all_events"){
         $('#all-events').removeClass("hide-display");
     } else if (button_name == "create_event"){

mercury/static/mercury/style.css

@@ -7,6 +7,7 @@ body {
   font-weight: 400;
   line-height: 1.5;
   text-align: left;
+  counter-reset: Serial;
 }
 
 tr:nth-child(even) {background-color: #f2f2f2;}
@@ -2937,6 +2938,70 @@ a {
     width: 70%;
   }
 
+    /* The switch - the box around the slider */
+  .switch {
+    position: relative;
+    display: inline-block;
+    width: 60px;
+    height: 34px;
+  }
+
+  /* Hide default HTML checkbox */
+  .switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+  }
+
+  /* The slider */
+  .slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
+
+  .slider:before {
+    position: absolute;
+    content: "";
+    height: 26px;
+    width: 26px;
+    left: 4px;
+    bottom: 4px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+  }
+
+  input:checked + .slider {
+    background-color: #2196F3;
+  }
+
+  input:focus + .slider {
+    box-shadow: 0 0 1px #2196F3;
+  }
+
+  input:checked + .slider:before {
+    -webkit-transform: translateX(26px);
+    -ms-transform: translateX(26px);
+    transform: translateX(26px);
+  }
+
+  /* Rounded sliders */
+  .slider.round {
+    border-radius: 34px;
+  }
+
+  .slider.round:before {
+    border-radius: 50%;
+  }
+
+
   button,
   [type="button"],
   [type="reset"],
@@ -4445,3 +4510,8 @@ a {
   width: 50%;
 }
 
+.gfconfig-text-align {
+    text-align:left;
+    float: left;
+    width: 50%
+}