Merge pull request #72 from luftdaten-at/23-messkampagnen-erstellen-mit-überblicksseite-über-räume-und-personen

23 messkampagnen erstellen mit überblicksseite über räume und personen

Author: n11ik

app/api/migrations/0004_alter_devicelogs_id_alter_measurementnew_id_and_more.py

@@ -0,0 +1,28 @@
+# Generated by Django 5.1.2 on 2024-12-10 08:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0003_devicelogs_measurementnew_values'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='devicelogs',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='measurementnew',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='values',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

app/api/models.py

@@ -82,7 +82,6 @@ class MeasurementNew(models.Model):
     """
     Measurement taken by a device in a room.
     """
-    id = models.IntegerField(primary_key=True)
     time_received = models.DateTimeField()
     time_measured = models.DateTimeField()
     sensor_model = models.IntegerField()
@@ -97,7 +96,6 @@ class Values(models.Model):
     """
     Values associated with a measurement.
     """
-    id = models.IntegerField(primary_key=True)
     dimension = models.IntegerField()
     value = models.FloatField()
     measurement = models.ForeignKey(MeasurementNew, on_delete=models.CASCADE)
@@ -110,7 +108,6 @@ class DeviceLogs(models.Model):
     """
     Logs for each device.
     """
-    id = models.IntegerField(primary_key=True)
     device = models.ForeignKey(Device, on_delete=models.CASCADE)
     timestamp = models.DateTimeField()
     level = models.IntegerField()

app/campaign/forms.py

@@ -1,22 +1,25 @@
 from django import forms
 from django.utils.translation import gettext_lazy as _
+from django.contrib.admin.widgets import FilteredSelectMultiple
 
-from .models import Campaign
+from .models import Campaign, Organization, Room
+from accounts.models import CustomUser
 
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import Submit
 
 
+from django.conf import settings
+
 class CampaignForm(forms.ModelForm):
     class Meta:
         model = Campaign
-        fields = ['name', 'description', 'start_date', 'end_date', 'public']
+        fields = ['name', 'description', 'start_date', 'end_date']
         labels = {
             'name': _('Name'),
             'description': _('Description'),
             'start_date': _('Start Date'),
             'end_date': _('End Date'),
-            'public': _('Public'),
         }
         help_texts = {
             'name': _('Enter the name of the campaign.'),
@@ -27,11 +30,64 @@ class Meta:
             'start_date': forms.DateTimeInput(attrs={'type': 'datetime-local', 'class': 'form-control'}, format='%Y-%m-%dT%H:%M'),
             'end_date': forms.DateTimeInput(attrs={'type': 'datetime-local', 'class': 'form-control'}, format='%Y-%m-%dT%H:%M'),
         }
-    
+
     def __init__(self, *args, **kwargs):
-        super(CampaignForm, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
+        
+        # Get the user from the passed arguments (initial data)
+        self.user = kwargs.get('initial', {}).get('user', None)
+        
+        # Initialize form helper
         self.helper = FormHelper(self)
         self.helper.add_input(Submit('submit', 'Save'))
+        
         # Ensure the input formats match the widget format
         self.fields['start_date'].input_formats = ('%Y-%m-%dT%H:%M',)
-        self.fields['end_date'].input_formats = ('%Y-%m-%dT%H:%M',)
+        self.fields['end_date'].input_formats = ('%Y-%m-%dT%H:%M',)
+
+    def save(self, commit=True):
+        # Get the instance but don't save to the database yet
+        campaign = super().save(commit=False)
+
+        # Set the `public` field to False
+        campaign.public = False
+        campaign.owner = self.user
+        campaign.users.add(self.user)
+        campaign.organization = self.user.organizations.first()
+
+        # Save to the database if commit is True
+        if commit:
+            campaign.save()
+        
+        return campaign
+
+class CampaignUserForm(forms.ModelForm):
+    users = (forms.ModelMultipleChoiceField(label='',
+             queryset=CustomUser.objects.none(),
+             widget=FilteredSelectMultiple(
+                verbose_name='Users',
+                is_stacked=False,
+             ),
+             required=False))
+
+    class Meta:
+        model = Campaign
+        fields = ['users']
+    
+    class Media:
+        css = {
+            'all': ('/static/admin/css/widgets.css', '/static/css/adminoverrides.css', ),
+        } # custom css
+    
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        
+        # Get the user from the passed arguments (initial data)
+        self.campaign = kwargs.get('initial', {}).get('campaign', None)
+
+        if self.campaign:
+            self.fields['users'].queryset = self.campaign.organization.users.all()
+        
+        # Initialize form helper
+        self.helper = FormHelper(self)
+        self.helper.add_input(Submit('submit', 'Save'))

app/campaign/migrations/0003_alter_campaign_id_alter_organization_id.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.1.2 on 2024-12-10 08:48
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0002_alter_campaign_id_alter_campaign_name_organization_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='campaign',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='id',
+            field=models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
+        ),
+    ]

app/campaign/migrations/0004_alter_campaign_organization.py

@@ -0,0 +1,19 @@
+# Generated by Django 5.1.2 on 2024-12-10 08:54
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0003_alter_campaign_id_alter_organization_id'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='campaign',
+            name='organization',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='campaigns', to='campaign.organization'),
+        ),
+    ]

app/campaign/migrations/0005_alter_userorganization_unique_together_and_more.py

@@ -0,0 +1,43 @@
+# Generated by Django 5.1.2 on 2024-12-10 09:22
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0004_alter_campaign_organization'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterUniqueTogether(
+            name='userorganization',
+            unique_together=None,
+        ),
+        migrations.RemoveField(
+            model_name='userorganization',
+            name='organization',
+        ),
+        migrations.RemoveField(
+            model_name='userorganization',
+            name='user',
+        ),
+        migrations.AddField(
+            model_name='campaign',
+            name='users',
+            field=models.ManyToManyField(related_name='campaign', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='organization',
+            name='users',
+            field=models.ManyToManyField(related_name='organization', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.DeleteModel(
+            name='UserCampaign',
+        ),
+        migrations.DeleteModel(
+            name='UserOrganization',
+        ),
+    ]

app/campaign/migrations/0006_alter_campaign_users_alter_organization_users.py

@@ -0,0 +1,25 @@
+# Generated by Django 5.1.2 on 2024-12-10 09:24
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('campaign', '0005_alter_userorganization_unique_together_and_more'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='campaign',
+            name='users',
+            field=models.ManyToManyField(related_name='campaigns', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='organization',
+            name='users',
+            field=models.ManyToManyField(related_name='organizations', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

app/campaign/models.py

@@ -7,13 +7,14 @@ class Campaign(models.Model):
     """
     Represents a campaign.
     """
-    id = models.IntegerField(primary_key=True)
     name = models.CharField(max_length=255)
     description = models.TextField(null=True, blank=True)
     start_date = models.DateTimeField()
     end_date = models.DateTimeField()
     public = models.BooleanField(default=True)
     id_token = models.CharField(max_length=8, null=True)
+    users = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='campaigns')
+    
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
@@ -24,7 +25,8 @@ class Campaign(models.Model):
     organization = models.ForeignKey(
         'Organization',
         on_delete=models.CASCADE,
-        related_name='campaigns'
+        related_name='campaigns',
+        null = True
     )
 
     def __str__(self):
@@ -49,9 +51,10 @@ class Organization(models.Model):
     """
     Represents an organization that owns campaigns and users can be part of.
     """
-    id = models.IntegerField(primary_key=True)
     name = models.CharField(max_length=255)
     description = models.TextField(null=True, blank=True)
+    users = models.ManyToManyField(settings.AUTH_USER_MODEL, related_name='organizations')
+
     owner = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.CASCADE,
@@ -60,31 +63,3 @@ class Organization(models.Model):
 
     def __str__(self):
         return self.name
-
-
-class UserOrganization(models.Model):
-    """
-    Represents the many-to-many relationship between users and organizations.
-    """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
-    organization = models.ForeignKey(Organization, on_delete=models.CASCADE)
-
-    class Meta:
-        unique_together = ('user', 'organization')
-
-    def __str__(self):
-        return f'{self.user} in {self.organization}'
-
-
-class UserCampaign(models.Model):
-    """
-    Represents the many-to-many relationship between users and campaigns.
-    """
-    user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
-    campaign = models.ForeignKey('Campaign', on_delete=models.CASCADE)
-
-    class Meta:
-        unique_together = ('user', 'campaign')
-
-    def __str__(self):
-        return f'{self.user} in {self.campaign}'