View new sensor models

mercury/migrations/0012_auto_20200320_1735.py

@@ -0,0 +1,30 @@
+# Generated by Django 2.2.11 on 2020-03-20 17:35
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mercury', '0011_merge_20200314_0111'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='agmeasurement',
+            name='measurement_event',
+        ),
+        migrations.RemoveField(
+            model_name='agmeasurement',
+            name='measurement_sensor',
+        ),
+        migrations.DeleteModel(
+            name='AGEvent',
+        ),
+        migrations.DeleteModel(
+            name='AGMeasurement',
+        ),
+        migrations.DeleteModel(
+            name='AGSensor',
+        ),
+    ]

mercury/migrations/0016_merge_20200323_1532.py

@@ -0,0 +1,14 @@
+# Generated by Django 2.2.6 on 2020-03-23 15:32
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mercury', '0015_gfconfig_gf_db_grafana_name'),
+        ('mercury', '0012_auto_20200320_1735'),
+    ]
+
+    operations = [
+    ]

mercury/migrations/0017_agevent.py

@@ -0,0 +1,25 @@
+# Generated by Django 2.2.6 on 2020-03-23 15:55
+
+from django.db import migrations, models
+import django.utils.timezone
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('mercury', '0016_merge_20200323_1532'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='AGEvent',
+            fields=[
+                ('event_uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('event_name', models.CharField(blank=True, max_length=40)),
+                ('event_date', models.DateTimeField(default=django.utils.timezone.now)),
+                ('event_description', models.CharField(blank=True, max_length=100)),
+                ('event_location', models.CharField(blank=True, max_length=100)),
+            ],
+        ),
+    ]

mercury/models.py

@@ -1,42 +1,8 @@
 from django.db import models
-from django.contrib.postgres.fields import JSONField
 import uuid
 from django.utils import timezone
 
 
-class AGEvent(models.Model):
-    """This model stores the information about events. When a new event is created,
-    a UUID4-typed event_uuid will be assigned to this event and also store the current
-    date for this event. """
-
-    event_uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
-    event_name = models.CharField(max_length=40, blank=True)
-    event_date = models.DateTimeField(default=timezone.now)
-    event_description = models.CharField(max_length=100, null=False, blank=True)
-    event_location = models.CharField(max_length=100, null=False, blank=True)
-
-
-class AGSensor(models.Model):
-    sensor_id = models.AutoField(primary_key=True)
-    sensor_name = models.CharField(max_length=1024, blank=True)
-    sensor_processing_formula = models.IntegerField(default=0, null=False)
-    sensor_format = JSONField()
-
-
-class AGMeasurement(models.Model):
-    measurement_uuid = models.UUIDField(
-        primary_key=True, default=uuid.uuid4, editable=False
-    )
-    measurement_timestamp = models.DateTimeField(default=timezone.now, blank=False)
-    measurement_event = models.ForeignKey(
-        AGEvent, on_delete=models.CASCADE, blank=False, null=False
-    )
-    measurement_sensor = models.ForeignKey(
-        AGSensor, on_delete=models.CASCADE, blank=False, null=False
-    )
-    measurement_value = JSONField()
-
-
 class GFConfig(models.Model):
     """
     Grafana configs
@@ -56,6 +22,18 @@ class GFConfig(models.Model):
     gf_current = models.BooleanField(default=False, blank=True)
 
 
+class AGEvent(models.Model):
+    """This model stores the information about events. When a new event is created,
+    a UUID4-typed event_uuid will be assigned to this event and also store the current
+    date for this event. """
+
+    event_uuid = models.UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
+    event_name = models.CharField(max_length=40, blank=True)
+    event_date = models.DateTimeField(default=timezone.now)
+    event_description = models.CharField(max_length=100, null=False, blank=True)
+    event_location = models.CharField(max_length=100, null=False, blank=True)
+
+
 class TemperatureSensor(models.Model):
     """This model represents the Temperature sensor that we expect to
     be potentially available in the future in the NYU Motorsports

mercury/static/mercury/js/sensor.js

@@ -1,51 +1,22 @@
 function addRow(){
-  var sensorList, field_name_li, field_type_li, field_name_input, field_type_select,
-  float_option, string_option, bool_option;
-
-  fields = document.getElementById("field-list");
-  // Make field name input
-  field_name_input = document.createElement("input");
-  field_name_input.setAttribute("type","text");
-  field_name_input.setAttribute("name","field-name");
-  field_name_input.setAttribute("class","inline-block-child");
-  fields.appendChild(field_name_input);
-
-  //Make field type
-  field_type_select = document.createElement("select");
-  field_type_select.setAttribute("name", "field-type");
-  field_type_select.setAttribute("class", "inline-block-child");
-
-  float_option = document.createElement("option");
-  float_option.setAttribute("value", "float");
-  float_option.appendChild(document.createTextNode("Float"));
-  field_type_select.appendChild(float_option);
-
-  string_option = document.createElement("option");
-  string_option.setAttribute("value", "string");
-  string_option.appendChild(document.createTextNode("String"));
-  field_type_select.appendChild(string_option);
-
-  bool_option = document.createElement("option");
-  bool_option.setAttribute("value", "bool");
-  bool_option.appendChild(document.createTextNode("Boolean"));
-  field_type_select.appendChild(bool_option);
-
-  fields.appendChild(field_type_select);
-
-  // Make unit input
-  unit_input = document.createElement("input");
-  unit_input.setAttribute("type","text");
-  unit_input.setAttribute("name","field-unit")
-  unit_input.setAttribute("class", "inline-block-child");
-  fields.appendChild(unit_input);
-
-  var hr = document.createElement('hr');
-  fields.appendChild(hr);
+    var table = document.getElementById("new-type-table");
+    var rowCount = table.rows.length;
+    var colCount = table.rows[0].cells.length;
+    var newRow = table.insertRow(rowCount);
+    for(var i=0; i<colCount; i++){
+        var newCell = newRow.insertCell(i);
+        /* set new cell to be same as cell in first data (non-header) row */
+        newCell.innerHTML = table.rows[1].cells[i].innerHTML
+    }
+    table.rows[rowCount].cells[0].innerHTML =rowCount
 }
 
-var add_field_button = document.getElementById("addfieldbutton");
-add_field_button.onclick = function() {
-  addRow();
+function deleteRow() {
+    var table = document.getElementById("new-type-table");
+    var rowCount = table.rows.length;
+    if (rowCount > 2){
+        table.deleteRow(rowCount-1)
+    }
 }
 
 /*
@@ -54,32 +25,139 @@ selectView displays the correct view of the "Add or Modify Sensors" page
 -if a user submits a new sensor which posts and reloads page, then the add new sensor view should remain
 */
 function selectView() {
-  var newSensorDiv = document.getElementById("add-new-sensor");
-  var existingSensorDiv = document.getElementById("existing-sensors");
-  var modifyButton = document.getElementById("current-sensor-btn");
-  var newButton = document.getElementById("add-sensor-btn");
+
+    var newSensorDiv = document.getElementById("add-new-sensor");
+    var existingSensorDiv = document.getElementById("existing-sensors");
+    var newTypeDiv = document.getElementById("add-new-type");
+    var viewTypesDiv = document.getElementById("view-existing-types");
+    var editSensorsDiv = document.getElementById("edit-sensors");
+    var editSensorTypesDiv = document.getElementById("edit-sensor-types");
+
+    var modifyButton = document.getElementById("current-sensor-btn");
+    var newSensorButton = document.getElementById("add-sensor-btn");
+    var newTypeButton = document.getElementById("add-sensor-type-btn");
+    var viewTypesButton = document.getElementById("view-sensor-types-btn");
+    var editSensorsButton = document.getElementById("edit-sensors-btn");
+    var editSensorTypesButton = document.getElementById("edit-sensor-types-btn");
+
     if (sessionStorage.getItem('viewing') == 'addingNew'){
         newSensorDiv.style.display = "block";
         existingSensorDiv.style.display = 'none';
+        newTypeDiv.style.display = "none";
+        viewTypesDiv.style.display = "none";
+        editSensorsDiv.style.display = "none";
+        editSensorTypesDiv.style.display = "none";
 
         modifyButton.style.backgroundColor = 'var(--light-accent)';
-        newButton.style.backgroundColor = 'var(--green)';
+        newSensorButton.style.backgroundColor = 'var(--green)';
+        newTypeButton.style.backgroundColor = 'var(--light-accent)';
+        viewTypesButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorsButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorTypesButton.style.backgroundColor = 'var(--light-accent)';
     }
-    else {
+    else if (sessionStorage.getItem('viewing') == 'view-sensors'){
         newSensorDiv.style.display = "none";
         existingSensorDiv.style.display = 'block';
+        newTypeDiv.style.display = "none";
+        viewTypesDiv.style.display = "none";
+        editSensorsDiv.style.display = "none";
+        editSensorTypesDiv.style.display = "none";
 
         modifyButton.style.backgroundColor = 'var(--green)';
-        newButton.style.backgroundColor = 'var(--light-accent)';
+        newSensorButton.style.backgroundColor = 'var(--light-accent)';
+        newTypeButton.style.backgroundColor = 'var(--light-accent)';
+        viewTypesButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorsButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorTypesButton.style.backgroundColor = 'var(--light-accent)';
+    }
+    else if (sessionStorage.getItem('viewing') == 'addingNewType'){
+        newSensorDiv.style.display = "none";
+        existingSensorDiv.style.display = 'none';
+        newTypeDiv.style.display = "block";
+        viewTypesDiv.style.display = "none";
+        editSensorsDiv.style.display = "none";
+        editSensorTypesDiv.style.display = "none";
+
+        modifyButton.style.backgroundColor = 'var(--light-accent)';
+        newSensorButton.style.backgroundColor = 'var(--light-accent)';
+        newTypeButton.style.backgroundColor = 'var(--green)';
+        viewTypesButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorsButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorTypesButton.style.backgroundColor = 'var(--light-accent)';
+    }
+    else if (sessionStorage.getItem('viewing') == 'viewingTypes'){
+        newSensorDiv.style.display = "none";
+        existingSensorDiv.style.display = 'none';
+        newTypeDiv.style.display = "none";
+        viewTypesDiv.style.display = "block";
+        editSensorsDiv.style.display = "none";
+        editSensorTypesDiv.style.display = "none";
+
+        modifyButton.style.backgroundColor = 'var(--light-accent)';
+        newSensorButton.style.backgroundColor = 'var(--light-accent)';
+        newTypeButton.style.backgroundColor = 'var(--light-accent)';
+        viewTypesButton.style.backgroundColor = 'var(--green)';
+        editSensorsButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorTypesButton.style.backgroundColor = 'var(--light-accent)';
+    }
+    else if (sessionStorage.getItem('viewing') == 'editingSensors'){
+        newSensorDiv.style.display = "none";
+        existingSensorDiv.style.display = 'none';
+        newTypeDiv.style.display = "none";
+        viewTypesDiv.style.display = "none";
+        editSensorsDiv.style.display = "block";
+        editSensorTypesDiv.style.display = "none";
+
+        modifyButton.style.backgroundColor = 'var(--light-accent)';
+        newSensorButton.style.backgroundColor = 'var(--light-accent)';
+        newTypeButton.style.backgroundColor = 'var(--light-accent)';
+        viewTypesButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorsButton.style.backgroundColor = 'var(--green)';
+        editSensorTypesButton.style.backgroundColor = 'var(--light-accent)';
+    }
+    else if (sessionStorage.getItem('viewing') == 'editingSensorTypes'){
+        newSensorDiv.style.display = "none";
+        existingSensorDiv.style.display = 'none';
+        newTypeDiv.style.display = "none";
+        viewTypesDiv.style.display = "none";
+        editSensorsDiv.style.display = "none";
+        editSensorTypesDiv.style.display = "block";
+
+        modifyButton.style.backgroundColor = 'var(--light-accent)';
+        newSensorButton.style.backgroundColor = 'var(--light-accent)';
+        newTypeButton.style.backgroundColor = 'var(--light-accent)';
+        viewTypesButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorsButton.style.backgroundColor = 'var(--light-accent)';
+        editSensorTypesButton.style.backgroundColor = 'var(--green)';
     }
 }
 
 function displayCurrentSensors() {
-  sessionStorage.setItem('viewing', 'existing');
-  selectView()
+    sessionStorage.setItem('viewing', 'view-sensors');
+    selectView()
 }
 
 function displayAddNewSensor() {
   sessionStorage.setItem('viewing', 'addingNew');
   selectView()
 }
+
+function displayAddNewSensorType() {
+    sessionStorage.setItem('viewing', 'addingNewType');
+    selectView()
+}
+
+function displaySensorTypes() {
+    sessionStorage.setItem('viewing', 'viewingTypes');
+    selectView()
+}
+
+function displayEditSensors() {
+    sessionStorage.setItem('viewing', 'editingSensors');
+    selectView()
+}
+
+function displayEditSensorTypes() {
+    sessionStorage.setItem('viewing', 'editingSensorTypes');
+    selectView()
+}