Merge pull request #295 from kenanwright1988/dropoff_tracking

Dropoff tracking

Author: kenanwright1988

accounts/admin.py

@@ -14,7 +14,7 @@ class CustomUserAdmin(BaseUserAdmin):
             'username', 'first_name', 'last_name',
             'full_name', 'slack_display_name',
             'current_lms_module', 'organisation',
-            'timezone', 'user_type', 'is_external')}),
+            'timezone', 'user_type', 'dropoffs', 'dropped_off_hackathon', 'is_external')}),
         ('Permissions', {'fields': (
             'is_active', 'is_staff', 'is_superuser',
             'profile_is_public', 'email_is_public',

accounts/migrations/0022_auto_20250214_1439.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.13 on 2025-02-14 14:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0021_auto_20250205_1138'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='customuser',
+            name='current_course',
+            field=models.CharField(choices=[('', 'Select Current Course'), ('L3', 'The Level 3 Diploma in Software Development (L3)'), ('5P', 'The 5 project Diploma in Software Development Course (5P)'), ('4P', 'The 4 project Diploma in Software Development Course (4P)'), ('FSBC', 'The 16 Week Full Stack Developer Bootcamp (BC)'), ('DATABC', 'The 16 Week Data-Analytics Bootcamp (DBC)'), ('external', 'Other/External')], default='', max_length=50),
+        ),
+    ]

accounts/migrations/0023_merge_20250217_0913.py

@@ -0,0 +1,14 @@
+# Generated by Django 3.1.13 on 2025-02-17 09:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0022_auto_20250214_1439'),
+        ('accounts', '0022_auto_20250206_1702'),
+    ]
+
+    operations = [
+    ]

accounts/migrations/0024_customuser_dropoffs.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.13 on 2025-02-17 12:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0023_merge_20250217_0913'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customuser',
+            name='dropoffs',
+            field=models.IntegerField(default=0, help_text='Number of times a user has dropped off from a hackathon'),
+        ),
+    ]

accounts/migrations/0025_customuser_dropped_off_hackathon.py

@@ -0,0 +1,20 @@
+# Generated by Django 3.1.13 on 2025-02-19 14:54
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hackathon', '0056_hackathon_badge_url'),
+        ('accounts', '0024_customuser_dropoffs'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='customuser',
+            name='dropped_off_hackathon',
+            field=models.ForeignKey(blank=True, help_text='The hackathon that the user dropped off from', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='dropped_off_users', to='hackathon.hackathon'),
+        ),
+    ]

accounts/models.py

@@ -119,6 +119,20 @@ class CustomUser(AbstractUser):
         choices=TIMEZONE_CHOICES,
     )
 
+    dropoffs = models.IntegerField(
+        default=0,
+        help_text=("Number of times a user has dropped off from a hackathon")
+    )
+
+    dropped_off_hackathon = models.ForeignKey(
+        'hackathon.Hackathon',
+        on_delete=models.SET_NULL,
+        related_name='dropped_off_users',
+        null=True,
+        blank=True,
+        help_text=("The hackathon that the user dropped off from")  
+    )
+
     class Meta:
         verbose_name = 'User'
         verbose_name_plural = 'Users'
@@ -141,6 +155,7 @@ def to_team_member(self):
             'timezone': self.timezone_to_offset(),
             'num_hackathons': teams.count(),
             'participant_label': self.participant_label(),
+            'dropoffs': self.dropoffs,
         }
 
     def timezone_to_offset(self):

hackadmin/templates/includes/remove_participant.html

@@ -1,4 +1,4 @@
-<form class="delete" action="/hackadmin/{{hackathon.id}}/remove_participant/" method="POST">
+<form class="remove_hackathon_participant" action="/hackadmin/{{hackathon.id}}/remove_participant/" method="POST">
     {% csrf_token %}
     <input type="hidden" value="{{remove_from_hackathon}}" name="remove_from_hackathon">
     <input type="hidden" value="{{team.id}}" name="team_id">

hackadmin/views.py

@@ -100,6 +100,11 @@ def remove_participant(request, hackathon_id):
                                      id=request.POST.get('team_id'))
             team.participants.remove(participant)
 
+        if request.POST.get('dropoffs'):
+            participant.dropoffs += 1
+            participant.dropped_off_hackathon = get_object_or_404(Hackathon, id=hackathon_id)
+            participant.save()
+
         messages.success(request, 'Participant successfully removed')
         return redirect(reverse('hackadmin:hackathon_participants',
                                 kwargs={'hackathon_id': hackathon_id}))

hackathon/forms.py

@@ -43,6 +43,16 @@ class HackathonForm(forms.ModelForm):
         ),
         required=True
     )
+    badge_url = forms.URLField(
+        label="Badge URL",
+        required=False,
+        widget=forms.TextInput(
+            attrs={
+                'placeholder': 'Add badge url if available',
+                'type': 'url'
+            }
+        )
+    )
     start_date = forms.DateTimeField(
         label="Start Date",
         input_formats=['%d/%m/%Y %H:%M'],
@@ -110,7 +120,7 @@ class Meta:
         fields = ['display_name', 'description', 'theme', 'start_date',
                   'end_date', 'status', 'organisation', 'score_categories',
                   'team_size', 'tag_line', 'is_public', 'max_participants',
-                  'allow_external_registrations', 'registration_form'
+                  'allow_external_registrations', 'registration_form', 'badge_url'
                   ]
 
     def __init__(self, *args, **kwargs):

hackathon/migrations/0056_hackathon_badge_url.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.1.13 on 2025-02-14 14:39
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('hackathon', '0055_remove_event_isreadonly'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='hackathon',
+            name='badge_url',
+            field=models.URLField(blank=True, default='', help_text='Link to the badge image.'),
+        ),
+    ]