diff --git a/members/views/members.py b/members/views/members.py
index 4ae9a6b..376351a 100644
--- a/members/views/members.py
+++ b/members/views/members.py
@@ -7,10 +7,13 @@ from django.http import HttpResponse, HttpResponseRedirect, JsonResponse, HttpRe
from django.core.mail import send_mail
from django.conf import settings
from django.utils.translation import ugettext as _
+from django.utils import timezone
from django.forms.models import model_to_dict
from dal import autocomplete
+from django.utils import timezone
import logging
+import datetime
import html
from rest_framework.views import APIView
@@ -44,9 +47,20 @@ def member_list(request, *args, **kwargs):
table.paginate(page=request.GET.get('page', 1), per_page=25)
table_html = convert_table_to_html(table, request)
+
+ queryset = Member.get_members_with_latest_payment(members)
+ # Member fee is valid from 1.9.-31.8.
+ f_day = 1
+ f_month = 9
+ now = timezone.now()
+ if (now.month >= f_month):
+ filter_date = datetime.date(now.year, f_month, f_day)
+ else:
+ filter_date = datetime.date(now.year - 1, f_month, f_day)
context = {
'table': table_html,
'member_count': len(members),
+ 'paid_count': len(queryset.filter(last_paid__gte=filter_date)),
'notification': request.GET.get('notification', None),
}
return render(request, 'member_list.html', context)
diff --git a/ohlhafv/models.py b/ohlhafv/models.py
index 1b06a19..3691ff7 100644
--- a/ohlhafv/models.py
+++ b/ohlhafv/models.py
@@ -9,7 +9,6 @@ from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.models import User
from auditlog.registry import auditlog
from phonenumber_field.modelfields import PhoneNumberField
-from django.contrib.postgres.fields import JSONField
import logging
diff --git a/requirements.txt b/requirements.txt
index b2152fa..02d5cf6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,7 +17,7 @@ djangorestframework==3.8.2
coverage==4.3.4
django-nose==1.4.5
nose-exclude==0.5.0
-psycopg2==2.7.1
+psycopg2==2.7.3.1
django-bootstrap3==8.2.3
django-tables2==1.6.1
pycodestyle==2.3.1
@@ -29,8 +29,12 @@ django-autocomplete-light==3.2.10
six==1.10.0
django-suit==0.2.26
telepot==12.3
-django-password-reset==1.0.1
+django-password-reset==1.0
+<<<<<<< Updated upstream
+pyexcel==0.5.8
+=======
pyexcel==0.5.7
+>>>>>>> Stashed changes
pyexcel-xlsx==0.5.5
django-import-export==0.7.0
openpyxl==2.4.11
diff --git a/templates/error.html b/templates/error.html
index 745eb56..3d09501 100644
--- a/templates/error.html
+++ b/templates/error.html
@@ -1,4 +1,4 @@
-{% extends "members_base.html" %}
+{% extends "members:base.html" %}
{% load static %}
{% load i18n %}
diff --git a/webapp/admin.py b/webapp/admin.py
index 3443c61..2059a1d 100644
--- a/webapp/admin.py
+++ b/webapp/admin.py
@@ -1,8 +1,8 @@
"""File containing webapp app admin registers."""
from django.contrib import admin
-from webapp.models import Official, Role
-from webapp.models import Feed, Tag, BaseFeed, Event, Registration
+from webapp.models import Official, Role, Committee
+from webapp.models import Feed, Tag, BaseFeed, Event, Signup, SignupForm, TemplateQuestion
from modeltranslation.admin import TranslationAdmin
from django.contrib.auth.models import Permission
# this is needed so that the models get registered for translation
@@ -13,6 +13,9 @@ admin.site.register(Permission)
admin.site.register(Feed, TranslationAdmin)
admin.site.register(Tag, TranslationAdmin)
admin.site.register(Event, TranslationAdmin)
-admin.site.register(Registration, TranslationAdmin)
+admin.site.register(SignupForm, TranslationAdmin)
+admin.site.register(Signup, TranslationAdmin)
+admin.site.register(TemplateQuestion, TranslationAdmin)
admin.site.register(Official)
admin.site.register(Role)
+admin.site.register(Committee)
diff --git a/webapp/migrations/0036_auto_20180301_2011.py b/webapp/migrations/0036_auto_20180301_2011.py
new file mode 100644
index 0000000..073a964
--- /dev/null
+++ b/webapp/migrations/0036_auto_20180301_2011.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-03-01 18:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0035_auto_20171019_1413'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Committee',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255)),
+ ],
+ ),
+ migrations.AddField(
+ model_name='role',
+ name='committee',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+ ),
+ ]
diff --git a/webapp/migrations/0037_auto_20180301_2111.py b/webapp/migrations/0037_auto_20180301_2111.py
new file mode 100644
index 0000000..b5cab47
--- /dev/null
+++ b/webapp/migrations/0037_auto_20180301_2111.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-03-01 19:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0036_auto_20180301_2011'),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name='committee',
+ options={'verbose_name': 'Committee', 'verbose_name_plural': 'Committees'},
+ ),
+ ]
diff --git a/webapp/migrations/0038_auto_20180516_2108.py b/webapp/migrations/0038_auto_20180516_2108.py
new file mode 100644
index 0000000..b58445c
--- /dev/null
+++ b/webapp/migrations/0038_auto_20180516_2108.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:08
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0037_auto_20180301_2111'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='baserole',
+ name='category',
+ ),
+ migrations.RemoveField(
+ model_name='role',
+ name='committee',
+ ),
+ migrations.AddField(
+ model_name='official',
+ name='committee',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+ ),
+ migrations.AlterField(
+ model_name='role',
+ name='official',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='roles', to='webapp.Official'),
+ ),
+ ]
diff --git a/webapp/migrations/0039_auto_20180516_2113.py b/webapp/migrations/0039_auto_20180516_2113.py
new file mode 100644
index 0000000..3fd2671
--- /dev/null
+++ b/webapp/migrations/0039_auto_20180516_2113.py
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0038_auto_20180516_2108'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='official',
+ name='committee',
+ ),
+ migrations.RemoveField(
+ model_name='role',
+ name='official',
+ ),
+ migrations.AddField(
+ model_name='official',
+ name='role',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Role'),
+ ),
+ migrations.AddField(
+ model_name='role',
+ name='committee',
+ field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='roles', to='webapp.Committee'),
+ ),
+ migrations.AlterField(
+ model_name='committee',
+ name='name',
+ field=models.CharField(max_length=255, verbose_name='Name'),
+ ),
+ ]
diff --git a/webapp/migrations/0040_auto_20180516_2124.py b/webapp/migrations/0040_auto_20180516_2124.py
new file mode 100644
index 0000000..7370f7b
--- /dev/null
+++ b/webapp/migrations/0040_auto_20180516_2124.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 18:24
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0039_auto_20180516_2113'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='official',
+ name='role',
+ ),
+ migrations.AddField(
+ model_name='official',
+ name='role',
+ field=models.ManyToManyField(null=True, related_name='roles', to='webapp.Role'),
+ ),
+ ]
diff --git a/webapp/migrations/0041_auto_20180516_2204.py b/webapp/migrations/0041_auto_20180516_2204.py
new file mode 100644
index 0000000..8c5ac91
--- /dev/null
+++ b/webapp/migrations/0041_auto_20180516_2204.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 19:04
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0040_auto_20180516_2124'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='official',
+ name='role',
+ field=models.ManyToManyField(related_name='official', to='webapp.Role'),
+ ),
+ ]
diff --git a/webapp/migrations/0042_merge_20180516_2249.py b/webapp/migrations/0042_merge_20180516_2249.py
new file mode 100644
index 0000000..289c272
--- /dev/null
+++ b/webapp/migrations/0042_merge_20180516_2249.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-05-16 19:49
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0041_auto_20180516_2204'),
+ ('webapp', '0041_delete_ohlhafvchallenge'),
+ ]
+
+ operations = [
+ ]
diff --git a/webapp/migrations/0043_auto_20180605_1953.py b/webapp/migrations/0043_auto_20180605_1953.py
new file mode 100644
index 0000000..d449b36
--- /dev/null
+++ b/webapp/migrations/0043_auto_20180605_1953.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-06-05 16:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0042_merge_20180516_2249'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='event',
+ name='basefeed_ptr',
+ ),
+ migrations.RemoveField(
+ model_name='event',
+ name='registration',
+ ),
+ migrations.DeleteModel(
+ name='Event',
+ ),
+ migrations.DeleteModel(
+ name='Registration',
+ ),
+ ]
diff --git a/webapp/migrations/0044_auto_20180705_1851.py b/webapp/migrations/0044_auto_20180705_1851.py
new file mode 100644
index 0000000..7b43419
--- /dev/null
+++ b/webapp/migrations/0044_auto_20180705_1851.py
@@ -0,0 +1,77 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-05 15:51
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0043_auto_20180605_1953'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Event',
+ fields=[
+ ('basefeed_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='webapp.BaseFeed')),
+ ('start_time', models.DateTimeField(default=django.utils.timezone.now)),
+ ('end_time', models.DateTimeField(default=django.utils.timezone.now)),
+ ],
+ options={
+ 'verbose_name': 'Event',
+ 'verbose_name_plural': 'Events',
+ },
+ bases=('webapp.basefeed',),
+ ),
+ migrations.CreateModel(
+ name='Signup',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('time', models.DateTimeField(default=django.utils.timezone.now)),
+ ('answer', models.CharField(max_length=255)),
+ ],
+ options={
+ 'verbose_name': 'Sign-up',
+ 'verbose_name_plural': 'Sign-ups',
+ },
+ ),
+ migrations.CreateModel(
+ name='SignupForm',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('start', models.DateTimeField(default=django.utils.timezone.now)),
+ ('end', models.DateTimeField(default=django.utils.timezone.now)),
+ ('question', models.CharField(max_length=255)),
+ ],
+ options={
+ 'verbose_name': 'Signup form',
+ 'verbose_name_plural': 'Signup forms',
+ },
+ ),
+ migrations.CreateModel(
+ name='TemplateQuestion',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255)),
+ ('question', models.CharField(max_length=255)),
+ ],
+ options={
+ 'verbose_name': 'Template question',
+ 'verbose_name_plural': 'Template questions',
+ },
+ ),
+ migrations.AddField(
+ model_name='signup',
+ name='signupForm',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='webapp.SignupForm'),
+ ),
+ migrations.AddField(
+ model_name='event',
+ name='signupForm',
+ field=models.ManyToManyField(blank=True, to='webapp.SignupForm'),
+ ),
+ ]
diff --git a/webapp/migrations/0045_auto_20180710_1901.py b/webapp/migrations/0045_auto_20180710_1901.py
new file mode 100644
index 0000000..eeced4e
--- /dev/null
+++ b/webapp/migrations/0045_auto_20180710_1901.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 16:01
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0044_auto_20180705_1851'),
+ ]
+
+ operations = [
+ migrations.RenameField(
+ model_name='signupform',
+ old_name='question',
+ new_name='questions',
+ ),
+ ]
diff --git a/webapp/migrations/0046_auto_20180710_2041.py b/webapp/migrations/0046_auto_20180710_2041.py
new file mode 100644
index 0000000..161e88d
--- /dev/null
+++ b/webapp/migrations/0046_auto_20180710_2041.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 17:41
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0045_auto_20180710_1901'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='event',
+ name='signupForm',
+ ),
+ migrations.AddField(
+ model_name='event',
+ name='signupForm',
+ field=models.ForeignKey(blank=True, default=0, on_delete=django.db.models.deletion.CASCADE, to='webapp.SignupForm'),
+ preserve_default=False,
+ ),
+ ]
diff --git a/webapp/migrations/0047_auto_20180710_2110.py b/webapp/migrations/0047_auto_20180710_2110.py
new file mode 100644
index 0000000..3f0732e
--- /dev/null
+++ b/webapp/migrations/0047_auto_20180710_2110.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2018-07-10 18:10
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('webapp', '0046_auto_20180710_2041'),
+ ]
+
+ operations = [
+ migrations.RemoveField(
+ model_name='event',
+ name='signupForm',
+ ),
+ migrations.AddField(
+ model_name='event',
+ name='signupForm',
+ field=models.ManyToManyField(blank=True, to='webapp.SignupForm'),
+ ),
+ ]
diff --git a/webapp/models.py b/webapp/models.py
index 7549942..d455b0a 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -2,16 +2,16 @@
from django.db import models
from django.utils import timezone
-from datetime import timedelta
+# from datetime import timedelta
from django.contrib.auth.models import User
from webapp.utils import month_from_now
from django.utils.translation import ugettext_lazy as _
-from django.contrib.auth.models import User
+# from django.contrib.auth.models import User
from auditlog.registry import auditlog
from phonenumber_field.modelfields import PhoneNumberField
-from django.contrib.postgres.fields import JSONField
+# from django.contrib.postgres.fields import JSONField
-import logging
+# import logging
VERBOSE_NAME = _('Webapp')
@@ -61,8 +61,8 @@ class Event(BaseFeed):
start_time = models.DateTimeField(default=timezone.now)
end_time = models.DateTimeField(default=timezone.now)
- registration = models.ForeignKey(
- 'Registration', on_delete=models.CASCADE, null=True)
+ signupForm = models.ManyToManyField(
+ 'SignupForm', blank=True)
def __str__(self):
return _('Event: {}').format(self.title)
@@ -72,44 +72,69 @@ class Event(BaseFeed):
verbose_name_plural = _('Events')
-class Registration(models.Model):
- """Model for event registration."""
-
+class TemplateQuestion(models.Model):
+ """Stores template questions for signup forms as JSONB"""
+ # question = JSONField()
name = models.CharField(max_length=255)
- email = models.EmailField()
- options = JSONField()
+ question = models.CharField(max_length=255)
def __str__(self):
- return _('Registration: {}').format(self.name)
+ return _('Template questions: {}').format(self.name)
class Meta:
- verbose_name = _('Registration')
- verbose_name_plural = _('Registrations')
+ verbose_name = _('Template question')
+ verbose_name_plural = _('Template questions')
+
+
+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)
+ # question = JSONField()
+ questions = models.CharField(max_length=255)
+
+ class Meta:
+ verbose_name = _('Signup form')
+ verbose_name_plural = _('Signup forms')
+
+
+class Signup(models.Model):
+ signupForm = models.ForeignKey('SignupForm', on_delete=models.CASCADE)
+ time = models.DateTimeField(default=timezone.now)
+ answer = models.CharField(max_length=255)
+
+ def __str__(self):
+ return _('Sign-ups: {}').format(self.signupForm)
+
+ class Meta:
+ verbose_name = _('Sign-up')
+ verbose_name_plural = _('Sign-ups')
class BaseRole(models.Model):
"""Base model for occupations/roles."""
- CATEGORIES = (
- ('corporate', _('Corporate affairs')),
- ('freshman', _('Freshmen')),
- ('international', _('International')),
- ('external', _('External affairs')),
- ('media', _('Media')),
- ('tech', _('Technology')),
- ('wellbeing', _('Wellbeing')),
- ('elepaja', _('Elepaja')),
- ('ceremonies', _('Ceremonies')),
- ('culture', _('Culture')),
- ('studies', _('Studies')),
- ('sosso', _('Sössö magazine')),
- ('alumni', _('Alumni relations')),
- ('others', _('Others')),
- )
+ # CATEGORIES = (
+ # ('corporate', _('Corporate affairs')),
+ # ('freshman', _('Freshmen')),
+ # ('international', _('International')),
+ # ('external', _('External affairs')),
+ # ('media', _('Media')),
+ # ('tech', _('Technology')),
+ # ('wellbeing', _('Wellbeing')),
+ # ('elepaja', _('Elepaja')),
+ # ('ceremonies', _('Ceremonies')),
+ # ('culture', _('Culture')),
+ # ('studies', _('Studies')),
+ # ('sosso', _('Sössö magazine')),
+ # ('alumni', _('Alumni relations')),
+ # ('others', _('Others')),
+ # )
name = models.CharField(_('Name'), max_length=255)
is_board = models.BooleanField(_('Board member'))
- category = models.CharField(_('Category'), choices=CATEGORIES, default='others', max_length=255)
+ # category = models.CharField(_('Category'), choices=CATEGORIES, default='others', max_length=255)
def __str__(self):
n = self.name.capitalize()
@@ -122,6 +147,28 @@ class PresetRole(BaseRole):
description = models.TextField(_('Description'))
+class Committee(models.Model):
+ """
+ Committee model
+ Has many Roles found under variable roles
+ """
+
+ class Meta:
+ """Meta class for Committee class."""
+
+ verbose_name = _('Committee')
+ verbose_name_plural = _('Committees')
+
+ def __str__(self):
+ return _('Committee: {}').format(self.name)
+
+ name = models.CharField(_("Name"), max_length=255)
+
+ @property
+ def current_roles(self):
+ return self.roles.all().filter(end_date__gte=timezone.now()).filter(start_date__lte=timezone.now())
+
+
class Role(PresetRole):
"""
Model for Role.
@@ -138,7 +185,7 @@ class Role(PresetRole):
start_date = models.DateField(_('Start date'))
end_date = models.DateField(_('End date'))
- official = models.ForeignKey('Official', related_name='roles', on_delete=models.CASCADE)
+ committee = models.ForeignKey('Committee', related_name='roles', on_delete=models.SET_NULL, null=True)
class Official(User):
@@ -151,11 +198,16 @@ class Official(User):
verbose_name_plural = _('Officials')
phone_number = PhoneNumberField(_('Phone number'))
+ role = models.ManyToManyField('Role', related_name='official')
+
+ def __str__(self):
+ return '{} {}'.format(self.first_name, self.last_name)
auditlog.register(Tag)
auditlog.register(Feed)
auditlog.register(Event)
+auditlog.register(Signup)
auditlog.register(PresetRole)
auditlog.register(Role)
auditlog.register(Official)
diff --git a/webapp/serializers.py b/webapp/serializers.py
new file mode 100644
index 0000000..1e9745f
--- /dev/null
+++ b/webapp/serializers.py
@@ -0,0 +1,42 @@
+from rest_framework import serializers
+from webapp.models import *
+
+
+class SignupFormSerializer(serializers.HyperlinkedModelSerializer):
+
+ class Meta:
+ model = SignupForm
+ fields = ('id', 'start', 'end', 'questions')
+
+
+class EventSerializer(serializers.HyperlinkedModelSerializer):
+ signupForm = SignupFormSerializer(many=True, read_only=True, required=False)
+ signup_id = serializers.PrimaryKeyRelatedField(
+ many=True,
+ source="signupForm",
+ queryset=SignupForm.objects.all())
+
+ class Meta:
+ model = Event
+ fields = ('id', 'tags', 'visible', 'title', 'description',
+ 'content', 'start_time', 'end_time', 'signup_id', 'signupForm')
+ depth = 1
+
+ def create(self, validated_data):
+ signupForms = validated_data.pop('signupForm')
+ event = Event.objects.create(**validated_data)
+ for signupForm in signupForms:
+ event.signupForm.add(signupForm)
+ event.save()
+ return event
+
+
+class SignupSerializer(serializers.ModelSerializer):
+ class Meta:
+ model = Signup
+ fields = ('id', 'signupForm', 'answer')
+ extra_kwargs = {
+ 'url': {
+ 'view_name': 'signup-detail',
+ }
+ }
diff --git a/webapp/static/css/contact.css b/webapp/static/css/contact.css
new file mode 100644
index 0000000..d935e46
--- /dev/null
+++ b/webapp/static/css/contact.css
@@ -0,0 +1,6 @@
+
+.role-container {
+ background-color: aqua;
+ width: 200px;
+ text-align: center;
+}
\ No newline at end of file
diff --git a/webapp/templates/contact.html b/webapp/templates/contact.html
index d52661a..f0d6707 100644
--- a/webapp/templates/contact.html
+++ b/webapp/templates/contact.html
@@ -4,34 +4,37 @@
{% load i18n %}
+
-