diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py index c5ef4f90..993a6bed 100644 --- a/pinaxcon/proposals/forms.py +++ b/pinaxcon/proposals/forms.py @@ -148,8 +148,14 @@ class DevDevProposalForm(ProposalForm): class ArtTechProposalForm(ProposalForm): class Meta: + ARTTECH_FIELDS = copy.copy(DEFAULT_FIELDS) + ARTTECH_FIELDS.remove("target_audience") + ARTTECH_FIELDS.append("talk_format") + ARTTECH_FIELDS.append("can_exhibit") + ARTTECH_FIELDS.append("exhibition_requirements") + model = ArtTechProposal - fields = DEFAULT_FIELDS + fields = ARTTECH_FIELDS class BioInformaticsProposalForm(ProposalForm): diff --git a/pinaxcon/proposals/migrations/0006_auto_20171015_1908_squashed_0007_auto_20171015_1918.py b/pinaxcon/proposals/migrations/0006_auto_20171015_1908_squashed_0007_auto_20171015_1918.py new file mode 100644 index 00000000..8391a9ee --- /dev/null +++ b/pinaxcon/proposals/migrations/0006_auto_20171015_1908_squashed_0007_auto_20171015_1918.py @@ -0,0 +1,32 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.5 on 2017-10-15 11:27 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + replaces = [('proposals', '0006_auto_20171015_1908'), ('proposals', '0007_auto_20171015_1918')] + + dependencies = [ + ('proposals', '0005_arttechproposal_bioinformaticsproposal_clsxlcaproposal_devdevproposal_fpgaproposal_funcprogproposal_'), + ] + + operations = [ + migrations.AddField( + model_name='arttechproposal', + name='can_exhibit', + field=models.IntegerField(choices=[(1, 'I am willing and able to exhibit my project on Monday, January 22nd'), (2, "I'm unable to exhibit my project")], default=1), + ), + migrations.AddField( + model_name='arttechproposal', + name='exhibition_requirements', + field=models.TextField(blank=True, default=''), + ), + migrations.AddField( + model_name='arttechproposal', + name='talk_format', + field=models.IntegerField(choices=[(1, 'Tech talk (45 min)'), (2, 'Demonstration (20min)'), (3, 'Lightning Talk (10min)')], default=1), + ), + ] diff --git a/pinaxcon/proposals/models.py b/pinaxcon/proposals/models.py index 5134054f..0c933364 100644 --- a/pinaxcon/proposals/models.py +++ b/pinaxcon/proposals/models.py @@ -157,6 +157,39 @@ class DevDevProposal(Proposal): class ArtTechProposal(Proposal): + TYPE_TECH = 1 + TYPE_DEMO = 2 + TYPE_LIGHTNING = 3 + + TALK_FORMATS = [ + (TYPE_TECH, "Tech talk (45 min)"), + (TYPE_DEMO, "Demonstration (20min)"), + (TYPE_LIGHTNING, "Lightning Talk (10min)"), + ] + + talk_format = models.IntegerField( + choices=TALK_FORMATS, + default=TYPE_TECH, + ) + + EXHIBIT_YES = 1 + EXHIBIT_NO = 2 + + EXHIBIT_STATUS = [ + (EXHIBIT_YES, "I am willing and able to exhibit my project on Monday, January 22nd"), + (EXHIBIT_NO, "I'm unable to exhibit my project") + ] + + can_exhibit = models.IntegerField( + choices=EXHIBIT_STATUS, + default=EXHIBIT_YES, + ) + + exhibition_requirements = models.TextField( + blank=True, + default="", + ) + class Meta: verbose_name = "Art+Tech Miniconf Proposal"