Updates

iotDashboard/views.py

@@ -1,14 +1,13 @@
 import json
 
-from django.core.serializers.json import DjangoJSONEncoder
-from django.http import JsonResponse, HttpResponse
-from django.db import connections
-from django.shortcuts import render, redirect, get_object_or_404
-from django.views.decorators.http import require_GET
-
-from .models import Device, Sensor, SensorType
-from .forms import DeviceForm, SensorWithTypeForm
 import redis
+from django.core.serializers.json import DjangoJSONEncoder
+from django.db import connections
+from django.http import JsonResponse, HttpResponse
+from django.shortcuts import render, redirect, get_object_or_404
+
+from .forms import DeviceForm, SensorWithTypeForm
+from .models import Device, Sensor
 
 redis_client = redis.StrictRedis(host='10.10.0.1', port=6379, db=0)
 
@@ -27,18 +26,78 @@ def chart(request):
     # Pass devices data to the context
     gpt = fetch_gpt_data()
     gpt = json.loads(gpt)
-    context = {'devices_json': devices_json, 'gpt': gpt["summary"]}
+    context = {'devices_json': devices_json, 'gpt': gpt}
 
     return render(request, 'chart.html', context)
 
+
 # Fetch sensor data (AJAX)
+# def fetch_device_data(request):
+#     device_name = request.GET.get('device', 'Livingroom')
+#     start_date = request.GET.get('start_date')
+#     end_date = request.GET.get('end_date')
+#
+#     # Log the parameters to ensure they are correct
+#     print("Device Name:", device_name)
+#     print("Start Date:", start_date)
+#     print("End Date:", end_date)
+#
+#     # Get the specific device by name
+#     device = get_object_or_404(Device, name=device_name)
+#
+#     # Initialize the results dictionary to store sensor data
+#     results = {}
+#
+#     # Prepare SQL query and parameters for the specific sensor type
+#     query = """
+#         SELECT time, metric, value
+#         FROM sensor_readings
+#         WHERE device_name = %s
+#     """
+#     params = [device.name]
+#
+#     # Add time filtering to the query
+#     if start_date:
+#         query += " AND time >= %s::timestamptz"
+#         params.append(start_date)
+#
+#     if end_date:
+#         query += " AND time <= %s::timestamptz"
+#         params.append(end_date)
+#
+#     # Log the final query and params
+#     print("Final Query:", query)
+#     print("Params Before Execution:", params)
+#
+#     # Fetch data from the database
+#     with connections["data"].cursor() as cursor:
+#         cursor.execute(query, params)
+#         rows = cursor.fetchall()
+#
+#     # Process the results and group them by sensor type (metric)
+#     for row in rows:
+#         time, metric, value = row
+#         formatted_time = time.strftime('%Y-%m-%d %H:%M:%S')
+#
+#         if metric not in results:
+#             results[metric] = {
+#                 'times': [],
+#                 'values': []
+#             }
+#         results[metric]['times'].append(formatted_time)
+#         results[metric]['values'].append(value)
+#
+#     return JsonResponse(results)
+
 def fetch_device_data(request):
     device_name = request.GET.get('device', 'Livingroom')
+    sensor_name = request.GET.get('sensor')  # Optional parameter for a specific sensor
     start_date = request.GET.get('start_date')
     end_date = request.GET.get('end_date')
 
     # Log the parameters to ensure they are correct
     print("Device Name:", device_name)
+    print("Sensor Name:", sensor_name)  # Log sensor name
     print("Start Date:", start_date)
     print("End Date:", end_date)
 
@@ -48,7 +107,7 @@ def fetch_device_data(request):
     # Initialize the results dictionary to store sensor data
     results = {}
 
-    # Prepare SQL query and parameters for the specific sensor type
+    # Prepare SQL query and parameters for the device
     query = """
         SELECT time, metric, value
         FROM sensor_readings
@@ -56,6 +115,11 @@ def fetch_device_data(request):
     """
     params = [device.name]
 
+    # If a specific sensor is specified, filter by that sensor
+    if sensor_name:
+        query += " AND metric = %s"
+        params.append(sensor_name)
+
     # Add time filtering to the query
     if start_date:
         query += " AND time >= %s::timestamptz"
@@ -89,6 +153,7 @@ def fetch_device_data(request):
 
     return JsonResponse(results)
 
+
 def index(request):
     if request.user.is_authenticated:
         return redirect("/chart/")
@@ -130,6 +195,7 @@ def delete_device(request, pk):
         return redirect('device_list')
     return render(request, 'device_confirm_delete.html', {'device': device})
 
+
 def add_sensor_with_type(request):
     if request.method == 'POST':
         form = SensorWithTypeForm(request.POST)
@@ -142,10 +208,53 @@ def add_sensor_with_type(request):
     context = {'form': form}
     return render(request, 'sensor_form.html', context)
 
+
 def logout_view(request):
     return redirect("/admin")
 
+
 def devices_api(request):
     devices = list(Device.objects.all().values('name', 'sensors__type__name'))
     return JsonResponse(devices, safe=False)
 
+
+def sensor_list(request, device_id):
+    device = get_object_or_404(Device, id=device_id)
+    sensors = device.sensors.all()  # Get sensors for this specific device
+    return render(request, 'sensor_list.html', {'device': device, 'sensors': sensors})
+
+
+def edit_sensor(request, pk):
+    sensor = get_object_or_404(Sensor, pk=pk)
+    if request.method == 'POST':
+        form = SensorWithTypeForm(request.POST, instance=sensor)
+        if form.is_valid():
+            form.save()
+            return redirect('sensor_list', device_id=sensor.device.pk)
+    else:
+        form = SensorWithTypeForm(instance=sensor)
+    return render(request, 'sensor_form.html', {'form': form})
+
+
+def delete_sensor(request, pk):
+    sensor = get_object_or_404(Sensor, pk=pk)
+    if request.method == 'POST':
+        device_id = sensor.device.pk
+        sensor.delete()
+        return redirect('sensor_list', device_id=device_id)
+    return render(request, 'sensor_confirm_delete.html', {'sensor': sensor})
+
+
+def add_sensor(request, device_id):
+    device = get_object_or_404(Device, pk=device_id)
+    if request.method == 'POST':
+        form = SensorWithTypeForm(request.POST)
+        if form.is_valid():
+            sensor = form.save(commit=False)
+            sensor.device = device  # Associate the sensor with the device
+            sensor.save()
+            return redirect('device_list')  # Redirect to device list or appropriate view
+    else:
+        form = SensorWithTypeForm()
+
+    return render(request, 'sensor_form.html', {'form': form, 'device': device})