Merge pull request #123 from luftdaten-at/102-add-possibility-to-add-devices-to-campaign-participants

102 add possibility to add devices to campaign participants

Author: n11ik

app/accounts/views.py

@@ -38,11 +38,13 @@ def DashboardView(request):
             'user': request.user,
             'member_campaigns': Campaign.objects.filter(users=request.user),
             'owner_campaigns': Campaign.objects.filter(owner=request.user),
-            'campaigns': Campaign.objects.all() if request.user.is_superuser else context['member_campaigns'],
             'member_organizations': Organization.objects.filter(users=request.user),
             'owner_organizations': Organization.objects.filter(owner=request.user),
-            'organizations': context['member_organizations'] if not request.user.is_superuser else Organization.objects.all()
         }
+
+        context['campaigns'] = Campaign.objects.all() if request.user.is_superuser else context['member_campaigns']
+        context['organizations'] = context['member_organizations'] if not request.user.is_superuser else Organization.objects.all()
+
         return render(request, "account/dashboard.html", context)
     else:
         # Process the login form for unauthenticated users

app/campaign/views.py

@@ -7,6 +7,7 @@
 from django.views.generic.edit import CreateView, UpdateView, DeleteView
 from django.views.generic.list import ListView
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.shortcuts import get_object_or_404
 from django.urls import reverse_lazy
 
 
@@ -176,7 +177,7 @@ def get_object(self, queryset = None):
             return room
         if not room.campaign.users.filter(id=user.id).exists():
             raise PermissionDenied('You are not allowed to update this Campaign')
-        return room 
+        return room
 
     def get_context_data(self, **kwargs):
         # Get the default context data
@@ -284,22 +285,22 @@ def get_current_mean(dimension):
 
 class ParticipantDetailView(LoginRequiredMixin, DetailView):
     model = CustomUser
-    template_name = 'campaigns/participant/detail.html'
+    template_name = 'campaigns/participants/detail.html'
     context_object_name = 'participant'
     pk_url_kwarg = 'user'
 
-    def test_func(self):
-        # Define permission logic. For example, only superusers or campaign organizers can view.
-        user = self.request.user
-        return user.is_authenticated and user.is_superuser  # Adjust as needed
 
-    def get_queryset(self):
-        """
-        Optionally, restrict the queryset to users associated with the campaign.
-        This ensures that users not part of the campaign cannot access details.
-        """
-        campaign_pk = self.kwargs.get('pk')  # Campaign's pk from URL
-        return CustomUser.objects.filter(campaigns__pk=campaign_pk)  # Adjust the relationship as per your models
+    def dispatch(self, request, *args, **kwargs):
+        self.campaign = get_object_or_404(Campaign, pk=kwargs['pk'])
+
+        if self.request.user.is_superuser:
+            return super().dispatch(request, *args, **kwargs)
+        # only users in campaign
+        if not self.campaign.users.filter(id = self.request.user.id).exists():
+            raise PermissionDenied("You are not allowed to create a Room")
+
+        return super().dispatch(request, *args, **kwargs)
+
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -336,8 +337,8 @@ def get_current_mean(dimension):
         temperature_color = Dimension.get_color(Dimension.TEMPERATURE, current_temperature) if current_temperature else None
 
         # VOC Index
-        current_uvi = get_current_mean(Dimension.UVI)
-        uvi_color = Dimension.get_color(Dimension.UVI, current_uvi) if current_uvi else None
+        current_uvi = get_current_mean(Dimension.UVS)
+        uvi_color = Dimension.get_color(Dimension.UVS, current_uvi) if current_uvi else None
 
         # data 24h
         now = datetime.utcnow()
@@ -357,7 +358,7 @@ def get_current_mean(dimension):
                     for m in measurements
                         for val in m.values.all()
                             if val.dimension == target_dim
-                ] for target_dim in (Dimension.TEMPERATURE, Dimension.PM2_5, Dimension.CO2, Dimension.TVOC)
+                ] for target_dim in (Dimension.TEMPERATURE, Dimension.UVS)
             ]
             for i, x in enumerate(data):
                 data_24h[i + 1].append(statistics.mean(x) if x else 0)
@@ -372,6 +373,8 @@ def get_current_mean(dimension):
         context['uvi_color'] = uvi_color
         context['data_24h'] = data_24h
 
+        context['campaign'] = self.campaign
+
         return context
 
 
@@ -450,7 +453,7 @@ class ParticipantsAddDevicesView(LoginRequiredMixin, UpdateView):
     template_name = 'campaigns/participants/add_device.html'
 
     def get_success_url(self):
-        return reverse_lazy('campaigns-detail', kwargs={'pk': self.campaign.pk})
+        return reverse_lazy('participants-detail', kwargs={'pk': self.campaign.pk, 'user': self.object.pk})
 
     def dispatch(self, request, *args, **kwargs):
         self.campaign = Campaign.objects.get(pk=kwargs['campaign_pk'])

app/main/enums.py

@@ -123,6 +123,12 @@ class Dimension():
     SGP40_RAW_GAS = 17
     SGP40_ADJUSTED_GAS = 18
     ADJUSTED_TEMP_CUBE = 19
+    UVS = 20
+    LIGHT = 21
+    ACCELERATION = 22
+    GYRO = 23
+    ALTITUDE = 24
+
 
     thresholds = {
         TEMPERATURE: ([18, 24], [Color.BLUE, Color.GREEN, Color.RED]),
@@ -153,6 +159,8 @@ class Dimension():
         SGP40_RAW_GAS: "Ω",
         SGP40_ADJUSTED_GAS: "Ω",
         ADJUSTED_TEMP_CUBE: "°C",
+        ACCELERATION: "m/s²",
+        GYRO: "radians/s"
     }
 
     _names = {
@@ -175,6 +183,10 @@ class Dimension():
         SGP40_RAW_GAS: "SGP40 Raw Gas",
         SGP40_ADJUSTED_GAS: "SGP40 Adjusted Gas",
         ADJUSTED_TEMP_CUBE: "Adjusted Temperature Air Cube",
+        UVS: "UVS",
+        LIGHT: "Light",
+        ACCELERATION: "acceleration",
+        GYRO: "gyro"
     }
 
     _required_sensors = {
@@ -222,15 +234,15 @@ def get_name(cls, dimension_id: int) -> str:
     def get_sensor_community_name(cls, dimension_id: int) -> str:
         """Returns the sensor-community-specific name for the dimension ID or 'Unknown' if none."""
         return cls._sensor_community_names.get(dimension_id, "Unknown")
-    
+
     @classmethod
     def get_color(cls, dimension_id: int, val: float):
         th, colors = cls.thresholds.get(dimension_id)
         th = [-float('inf')] + th + [float('inf')]
         for i in range(len(th)):
             if th[i] <= val < th[i + 1]:
                 return colors[i]
- 
+
 
 class LdProduct():
     AIR_AROUND = 1

app/templates/campaigns/detail.html

@@ -91,11 +91,10 @@ <h3 class="mb-0">{% trans "Participants" %}</h3>
               <tbody>
             {% for user in campaign.users.all %}
                 <tr>
-                    <td><a href="">{{ user.username }}</a></td>
+                    <td><a href="{% url 'participants-detail' campaign.pk user.pk %}">{{ user.username }}</a></td>
                     <td>{{ user.email }}</td>
                     <td>
                       <div class="text-end d-flex flex-column flex-md-row gap-2 justify-content-end">
-                        <a href="{% url 'user-add-device' campaign.pk user.pk %}" class="btn btn-outline-primary btn-sm">{% trans "Add Device" %}</a>
                         <a href="{% url 'participants-detail' campaign.pk user.pk %}" class="btn btn-primary btn-sm">
                             <i class="bi bi-eye"></i>
                             <span class="d-none d-sm-inline">{% trans "Details" %}</span>

app/templates/campaigns/participants/detail.html

@@ -46,7 +46,7 @@ <h3 class="mb-0">{% trans "24-hour overview" %}</h3>
     <div class="card mb-4">
         <div class="card-header d-flex justify-content-between align-items-center">
           <h3 class="mb-0">{% trans "Devices" %}</h3>
-          <a href="{% url 'participant-add-device' participant.pk %}" class="btn btn-outline-primary btn-sm">{% trans "Add Device" %}</a>
+          <a href="{% url 'user-add-device' campaign.pk user.pk %}" class="btn btn-outline-primary btn-sm">{% trans "Add Device" %}</a>
         </div>
         <div class="card-body">
           <!-- Responsive Table-Wrapper; nur nötig, wenn es sehr viele Spalten gibt -->
@@ -81,12 +81,12 @@ <h3 class="mb-0">{% trans "Devices" %}</h3>
         </div>
       </div>
 
-    <a href="{% url 'campaigns-detail' participant.campaign.pk %}" class="btn btn-outline-secondary">{% trans "Back to Campaign" %}</a>
+    <a href="{% url 'campaigns-detail' campaign.pk %}" class="btn btn-outline-secondary">{% trans "Back to Campaign" %}</a>
 </div>
 
 <script>
     var dataTemperature = {{ data_24h.1 }};
-    var dataUVI         = {{ data_24h.3 }};
+    var dataUVI         = {{ data_24h.2 }};
     var labels          = {{ data_24h.0|safe }}; 
 
     // Erstelle das Chart