From 587632d7a35012930c405d77f51834674c96040e Mon Sep 17 00:00:00 2001
From: Jan Tuomi <jan.tuomi@eficode.com>
Date: Wed, 13 Mar 2019 15:54:23 +0200
Subject: [PATCH] Rename signup form fields and add title

---
 webapp/migrations/0053_auto_20190313_1505.py | 29 ++++++++++++++++++++
 webapp/models.py                             |  8 ++++--
 webapp/serializers.py                        |  3 +-
 webapp/views.py                              |  2 +-
 4 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 webapp/migrations/0053_auto_20190313_1505.py

diff --git a/webapp/migrations/0053_auto_20190313_1505.py b/webapp/migrations/0053_auto_20190313_1505.py
new file mode 100644
index 0000000..ae54874
--- /dev/null
+++ b/webapp/migrations/0053_auto_20190313_1505.py
@@ -0,0 +1,29 @@
+# Generated by Django 2.1.5 on 2019-03-13 13:05
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0052_feed_autohide_enabled'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='signupform',
+            old_name='end',
+            new_name='end_time',
+        ),
+        migrations.RenameField(
+            model_name='signupform',
+            old_name='start',
+            new_name='start_time',
+        ),
+        migrations.AddField(
+            model_name='signupform',
+            name='title',
+            field=models.CharField(default='Default signup title', max_length=255),
+            preserve_default=False,
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index 8d41718..bed8346 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -91,12 +91,16 @@ class TemplateQuestion(models.Model):
 class SignupForm(models.Model):
     """Model for event signup form. Stores questions in JSONB."""
 
-    start = models.DateTimeField(default=timezone.now)
-    end = models.DateTimeField(default=timezone.now)
+    title = models.CharField(max_length=255)
+    start_time = models.DateTimeField(default=timezone.now)
+    end_time = models.DateTimeField(default=timezone.now)
     # question = JSONField()
     questions = models.CharField(max_length=255)
     visible = models.BooleanField(default=True)
 
+    def __str__(self):
+        return _('Sign-up form #{}').format(self.id)
+
     class Meta:
         verbose_name = _('Signup form')
         verbose_name_plural = _('Signup forms')
diff --git a/webapp/serializers.py b/webapp/serializers.py
index ea89c52..b542d55 100644
--- a/webapp/serializers.py
+++ b/webapp/serializers.py
@@ -3,10 +3,9 @@ from webapp.models import *
 
 
 class SignupFormSerializer(serializers.HyperlinkedModelSerializer):
-
     class Meta:
         model = SignupForm
-        fields = ('id', 'start', 'end', 'questions')
+        fields = ('id', 'title', 'start_time', 'end_time', 'questions')
 
 
 class EventSerializer(serializers.HyperlinkedModelSerializer):
diff --git a/webapp/views.py b/webapp/views.py
index e70ac9d..048bd87 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -63,7 +63,7 @@ class SignupFormViewSet(viewsets.ModelViewSet):
     search_fields = '__all__'
 
     def get_queryset(self):
-        return SignupForm.objects.filter(visible=True, end__gt=timezone.now()).order_by('start')
+        return SignupForm.objects.filter(visible=True, end_time__gt=timezone.now()).order_by('start_time')
 
 
 class SignupViewSet(viewsets.ModelViewSet):