added workshop log to device detail (#238)

Co-authored-by: Nik Sauer <[email protected]>

Author: n11ik

app/api/migrations/0013_alter_airqualityrecord_device.py

@@ -0,0 +1,20 @@
+# Generated by Django 5.2 on 2025-04-30 09:32
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0012_alter_airqualityrecord_workshop'),
+        ('devices', '0020_device_created_at'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='airqualityrecord',
+            name='device',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='air_quality_records', to='devices.device'),
+        ),
+    ]

app/api/models.py

@@ -31,7 +31,7 @@ class AirQualityRecord(models.Model):
     iaq_acc = models.SmallIntegerField(null=True, blank=True)
     iaq_static = models.FloatField(null=True, blank=True)
     pressure = models.FloatField(null=True, blank=True)
-    device = models.ForeignKey(Device, on_delete=models.CASCADE, null=True)
+    device = models.ForeignKey(Device, on_delete=models.CASCADE, null=True, related_name='air_quality_records')
     workshop = models.ForeignKey(Workshop, on_delete=models.CASCADE, null=True, blank=True, related_name='air_quality_records')
     participant = models.ForeignKey(Participant, on_delete=models.CASCADE, null=True, blank=True)
     lat = models.FloatField(null=True, blank=True)

app/devices/views.py

@@ -67,51 +67,68 @@ def get_context_data(self, **kwargs):
                 round(status.battery_voltage, 2) 
                 for status in device_status_qs 
                 if status.battery_soc is not None and status.battery_voltage is not None
-            ]
-
-            # query changes
-            organization_changes = device.history.filter(changes__icontains = '"current_organization"').all().order_by('-timestamp')
-            room_changes = device.history.filter(changes__icontains = '"current_room"').all().order_by('-timestamp')
-            user_changes = device.history.filter(changes__icontains = '"current_user"').all().order_by('-timestamp')
-            
-            organization_change_log = []
-            room_change_log = []
-            user_change_log = []
-
-            # prepare changes
-            for h in organization_changes:
-                prev = h.changes['current_organization'][0]
-                next = h.changes['current_organization'][1]
-                organization_change_log.append({
-                    'timestamp': h.timestamp,
-                    'prev': None if prev == 'None' else Organization.objects.filter(id=prev).first(),
-                    'next': None if next == 'None' else Organization.objects.filter(id=next).first(),
-                })
-            for h in room_changes:
-                prev = h.changes['current_room'][0]
-                next = h.changes['current_room'][1]
-                room_change_log.append({
-                    'timestamp': h.timestamp,
-                    'prev': None if prev == 'None' else Room.objects.filter(id=prev).first(),
-                    'next': None if next == 'None' else Room.objects.filter(id=next).first(),
-                })
-            for h in user_changes:
-                prev = h.changes['current_user'][0]
-                next = h.changes['current_user'][1]
-                user_change_log.append({
-                    'timestamp': h.timestamp,
-                    'prev': None if prev == 'None' else CustomUser.objects.filter(id=prev).first(),
-                    'next': None if next == 'None' else CustomUser.objects.filter(id=next).first(),
-                })
-
-            context['organization_change_log'] = organization_change_log 
-            context['room_change_log'] = room_change_log
-            context['user_change_log'] = user_change_log
-            
+            ]            
             # Serialize data to JSON format
             context['battery_times'] = json.dumps(battery_times, cls=DjangoJSONEncoder)
             context['battery_charges'] = json.dumps(battery_charges, cls=DjangoJSONEncoder)
             context['battery_voltages'] = json.dumps(battery_voltages, cls=DjangoJSONEncoder)
+        
+        # query changes
+        organization_changes = device.history.filter(changes__icontains = '"current_organization"').all().order_by('-timestamp')
+        room_changes = device.history.filter(changes__icontains = '"current_room"').all().order_by('-timestamp')
+        user_changes = device.history.filter(changes__icontains = '"current_user"').all().order_by('-timestamp')
+        
+        organization_change_log = []
+        room_change_log = []
+        user_change_log = []
+        workshop_change_log = []
+
+        # prepare changes
+        for h in organization_changes:
+            prev = h.changes['current_organization'][0]
+            next = h.changes['current_organization'][1]
+            organization_change_log.append({
+                'timestamp': h.timestamp,
+                'prev': None if prev == 'None' else Organization.objects.filter(id=prev).first(),
+                'next': None if next == 'None' else Organization.objects.filter(id=next).first(),
+            })
+        for h in room_changes:
+            prev = h.changes['current_room'][0]
+            next = h.changes['current_room'][1]
+            room_change_log.append({
+                'timestamp': h.timestamp,
+                'prev': None if prev == 'None' else Room.objects.filter(id=prev).first(),
+                'next': None if next == 'None' else Room.objects.filter(id=next).first(),
+            })
+        for h in user_changes:
+            prev = h.changes['current_user'][0]
+            next = h.changes['current_user'][1]
+            user_change_log.append({
+                'timestamp': h.timestamp,
+                'prev': None if prev == 'None' else CustomUser.objects.filter(id=prev).first(),
+                'next': None if next == 'None' else CustomUser.objects.filter(id=next).first(),
+            })
+        
+        # time, workshop
+        workshop_changes = []
+        for record in reversed(sorted((record.time, record.workshop.name) for record in device.air_quality_records.all())):
+            if not workshop_changes or workshop_changes[-1][1] != record[1]:
+                workshop_changes.append(record)
+
+        for i in range(0, len(workshop_changes)):
+            workshop_change_log.append({
+                'timestamp': workshop_changes[i][0],
+                'prev': None if i == len(workshop_changes) - 1 else workshop_changes[i + 1][1],
+                'next': workshop_changes[i][1]
+            })
+
+        current_workshop = workshop_change_log[0]['next'] if workshop_change_log else None
+
+        context['organization_change_log'] = organization_change_log 
+        context['room_change_log'] = room_change_log
+        context['user_change_log'] = user_change_log
+        context['workshop_change_log'] = workshop_change_log
+        context['current_workshop'] = current_workshop
 
         # Fetch all DeviceLogs entries related to this Device, ordered by timestamp descendingly
         device_logs_qs = DeviceLogs.objects.filter(device=device).order_by('-timestamp')
@@ -180,7 +197,7 @@ class DeviceEditView(UpdateView):
     model = Device
     form_class = DeviceForm
     template_name = 'devices/form.html'
-    success_url = reverse_lazy('device-list')  # URL to redirect to after a successful update
+    success_url = reverse_lazy('devices-list')  # URL to redirect to after a successful update
 
     def get_queryset(self):
         """
@@ -221,7 +238,7 @@ def get_queryset(self):
 class DeviceDeleteView(LoginRequiredMixin, DeleteView):
     model = Device
     template_name = 'devices/confirm_delete.html'  # Confirmation page template
-    success_url = reverse_lazy('device-list')  # Redirect here after deletion
+    success_url = reverse_lazy('devices-list')  # Redirect here after deletion
 
     def get_object(self, queryset = None):
         device = super().get_object(queryset)

app/templates/devices/detail.html

@@ -106,7 +106,17 @@ <h2>{% trans "Device:" %} {{ device.device_name }}</h2>
                         {% endfor %} 
                     </ul>
                 </li>
-                
+                <li class="list-group-item">
+                    <strong>{% trans "Workshop" %}:</strong> {{ current_workshop|default:_("N/A") }}
+                    <!-- change log -->
+                    <ul class="list-group">
+                        {% for entry in workshop_change_log %}
+                            <li class="list-group-item">{{ entry.timestamp|naturaltime }}, {% trans "Workshop changed from" %} {{ entry.prev }} {% trans "to" %}  {{ entry.next }}</li>
+                        {% empty %}
+                            <li class="list-group-item">{% trans "No logs available." %}</li>
+                        {% endfor %} 
+                    </ul>
+                </li> 
             </ul>
 
             <!-- Notes Section -->