- added more options for default date range on sensors

usnistgov · Jun 13, 2022 · 681dd40 · 681dd40
1 parent 27b0931
commit 681dd40
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/NEMO/apps/sensors/templates/customizations/customizations_sensors.html b/NEMO/apps/sensors/templates/customizations/customizations_sensors.html
@@ -22,6 +22,8 @@ <h3 class="customization-section-title">Sensor data settings</h3>
                     <label><input type="radio" id="sensor_default_daterange" name="sensor_default_daterange" {% if not sensor_default_daterange %}checked{% endif %} value=""> Last 24 hrs</label>
                     <label><input type="radio" name="sensor_default_daterange" {% if sensor_default_daterange == 'last_72hrs' %}checked{% endif %} value="last_72hrs"> Last 72 hrs</label>
                     <label><input type="radio" name="sensor_default_daterange" {% if sensor_default_daterange == 'last_week' %}checked{% endif %} value="last_week"> Last week</label>
+                    <label><input type="radio" name="sensor_default_daterange" {% if sensor_default_daterange == 'last_month' %}checked{% endif %} value="last_month"> Last month</label>
+                    <label><input type="radio" name="sensor_default_daterange" {% if sensor_default_daterange == 'last_year' %}checked{% endif %} value="last_year"> Last year</label>
                 </div>
             </div>
         </div>

diff --git a/NEMO/apps/sensors/templates/sensors/sensors.html b/NEMO/apps/sensors/templates/sensors/sensors.html
@@ -37,7 +37,7 @@
             {% if not sensors and not categories %}
                 <div class="dashboard-no-group-items">
                     no items to display.
-                    {% if user.is_superuser %}
+                    {% if user.is_superuser and not selected_category %}
                         <br/><br/>You can add sensors, categories and alerts by navigating to<br>
                         <a href="{% url 'admin:app_list' 'sensors' %}">
                             Administration -> Detailed Administration -> Sensors

diff --git a/NEMO/apps/sensors/views.py b/NEMO/apps/sensors/views.py
@@ -109,7 +109,11 @@ def get_sensor_data(request, sensor) -> (QuerySet, datetime, datetime):
 	now = timezone.now().replace(second=0, microsecond=0).astimezone()
 	sensor_default_daterange = SensorCustomization.get("sensor_default_daterange")
 	if not start:
-		if sensor_default_daterange == "last_week":
+		if sensor_default_daterange == "last_year":
+			start = now - timedelta(days=365)
+		elif sensor_default_daterange == "last_month":
+			start = now - timedelta(days=30)
+		elif sensor_default_daterange == "last_week":
 			start = now - timedelta(weeks=1)
 		elif sensor_default_daterange == "last_72hrs":
 			start = now - timedelta(days=3)