Rename signup form fields and add title

This commit is contained in:
Jan Tuomi
2019-03-13 15:54:23 +02:00
parent 11c92cdd5f
commit 587632d7a3
4 changed files with 37 additions and 5 deletions
@@ -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,
),
]
+6 -2
View File
@@ -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')
+1 -2
View File
@@ -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):
+1 -1
View File
@@ -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):