diff --git a/events/migrations/0032_add_registration_end.py b/events/migrations/0032_add_registration_end.py new file mode 100644 index 000000000..7b6219d92 --- /dev/null +++ b/events/migrations/0032_add_registration_end.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.24 on 2024-09-10 10:52 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0031_add_program_file_question_foreign_key"), + ] + + operations = [ + migrations.AddField( + model_name="event", + name="registration_end_date", + field=models.DateTimeField(null=True), + ), + ] diff --git a/events/migrations/0033_change_registration_end.py b/events/migrations/0033_change_registration_end.py new file mode 100644 index 000000000..9175351a9 --- /dev/null +++ b/events/migrations/0033_change_registration_end.py @@ -0,0 +1,18 @@ +# Generated by Django 2.2.24 on 2024-09-10 10:55 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0032_add_registration_end"), + ] + + operations = [ + migrations.AlterField( + model_name="event", + name="registration_end_date", + field=models.DateTimeField(blank=True, null=True), + ), + ] diff --git a/events/migrations/0034_remove_requires_invitation.py b/events/migrations/0034_remove_requires_invitation.py new file mode 100644 index 000000000..d7776af46 --- /dev/null +++ b/events/migrations/0034_remove_requires_invitation.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.24 on 2024-09-10 11:34 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ("events", "0033_change_registration_end"), + ] + + operations = [ + migrations.RemoveField( + model_name="event", + name="requires_invitation", + ), + ] diff --git a/events/models.py b/events/models.py index 1c15cf2ca..2740b2466 100644 --- a/events/models.py +++ b/events/models.py @@ -16,6 +16,7 @@ class Event(models.Model): description = models.TextField(blank=True, null=True) date_start = models.DateTimeField() date_end = models.DateTimeField() + registration_end_date = models.DateTimeField(blank=True, null=True) location = models.CharField(max_length=75, blank=True, null=True) food = models.CharField(max_length=75, blank=True, null=True) signup_cr = models.BooleanField( @@ -57,11 +58,6 @@ class Event(models.Model): published = models.BooleanField( blank=False, null=False, verbose_name="The event is published on the website" ) - requires_invitation = models.BooleanField( - blank=False, - null=False, - verbose_name="Participants need an invitation to sign up", - ) contact_person = models.ForeignKey( User, blank=True, null=True, on_delete=models.CASCADE ) diff --git a/events/serializers.py b/events/serializers.py index 778846d96..f8f044c29 100644 --- a/events/serializers.py +++ b/events/serializers.py @@ -18,7 +18,11 @@ def event(event, request): "event_start": int(event.date_start.strftime("%s")), "event_end": int(event.date_end.strftime("%s")), "event_start_string": event.date_start.strftime("%Y-%m-%d %H:%M"), - "registration_end": int(event.date_start.strftime("%s")), + "registration_end": ( + int(event.registration_end_date.strftime("%s")) + if event.registration_end_date + else None + ), "image_url": ( request.build_absolute_uri(event.picture.url) if event.picture else None ), @@ -31,7 +35,8 @@ def event(event, request): "signup_link": signup_url, "can_create_teams": event.teams_create_s, "can_join_teams": event.teams_participate_s, - "open_for_signup": event.open_for_signup and event.signup_s, + "open_for_signup_student": event.open_for_signup and event.signup_s, + "open_for_signup_company": event.open_for_signup and event.signup_cr, } return data diff --git a/events/tests.py b/events/tests.py index 3c692c82a..5ae27c241 100644 --- a/events/tests.py +++ b/events/tests.py @@ -20,7 +20,6 @@ def setUp(self): teams_participate_cr=False, teams_participate_s=True, published=False, - requires_invitation=False, ) def test_animals_can_speak(self):