Temperature and Humidity Over Time
+
+
+
Current Conditions
+
Loading...
+
Loading...
+
+
@@ -67,7 +95,6 @@
{% endfor %}
-
@@ -168,6 +195,19 @@
}
}
});
+
+ // Check if the last recorded data is within the last 10 minutes
+ const lastRecordedTime = new Date(data.times[data.times.length - 1]);
+ const now = new Date();
+ const tenMinutesAgo = new Date(now.getTime() - 10 * 60000);
+
+ if (lastRecordedTime > tenMinutesAgo) {
+ document.getElementById('current-temperature').textContent = `Temperature: ${data.temperatures[data.temperatures.length - 1]}°C`;
+ document.getElementById('current-humidity').textContent = `Humidity: ${data.humidities[data.humidities.length - 1]}%`;
+ } else {
+ document.getElementById('current-temperature').textContent = `Temperature: -`;
+ document.getElementById('current-humidity').textContent = `Humidity: -`;
+ }
});
}
diff --git a/iotDashboard/urls.py b/iotDashboard/urls.py
index dc44a96..597f8c0 100644
--- a/iotDashboard/urls.py
+++ b/iotDashboard/urls.py
@@ -27,6 +27,5 @@ urlpatterns = [
path('devices/add/', views.add_device, name='add_device'),
path('devices/edit/
/', views.edit_device, name='edit_device'),
path('devices/delete//', views.delete_device, name='delete_device'),
- path('login/', views.login_view, name='login'),
path('logout/', views.logout_view, name='logout'),
]
diff --git a/iotDashboard/views.py b/iotDashboard/views.py
index c4f8bd8..1264901 100644
--- a/iotDashboard/views.py
+++ b/iotDashboard/views.py
@@ -46,7 +46,7 @@ def chart(request):
def index(request):
if request.user.is_authenticated:
- return HttpResponse(chart())
+ return redirect("/chart/")
return HttpResponse("NOT AUTHENTICATED!!!")
def device_list(request):
devices = Device.objects.all()
@@ -80,7 +80,5 @@ def delete_device(request, pk):
return redirect('device_list')
return render(request, 'device_confirm_delete.html', {'device': device})
-def login_view():
- pass
def logout_view():
- pass
\ No newline at end of file
+ redirect("/admin")
\ No newline at end of file