From 41f6d067dd1422caf9154e4d6bd650ac8598b8cd Mon Sep 17 00:00:00 2001 From: Joel Addison Date: Mon, 24 Jun 2019 21:59:47 +1000 Subject: [PATCH] Add assistance details field to speaker Add multiline text field to gather details on travel and accommodation assistance to help with speaker acceptance planning. --- .../symposion/proposals/_proposal_fields.html | 16 +++++---- vendor/symposion/speakers/forms.py | 1 + .../migrations/0008_auto_20190624_2328.py | 35 +++++++++++++++++++ vendor/symposion/speakers/models.py | 19 +++++++--- 4 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 vendor/symposion/speakers/migrations/0008_auto_20190624_2328.py diff --git a/pinaxcon/templates/symposion/proposals/_proposal_fields.html b/pinaxcon/templates/symposion/proposals/_proposal_fields.html index 7ed70e26..eea7b68c 100644 --- a/pinaxcon/templates/symposion/proposals/_proposal_fields.html +++ b/pinaxcon/templates/symposion/proposals/_proposal_fields.html @@ -62,7 +62,7 @@ {% else %}
No Special Talk Requirements Requested
{% endif %} - +   @@ -104,7 +104,7 @@
-
{{ proposal.abstract_html|safe }} 
+
{{ proposal.abstract_html|safe }} 

@@ -112,7 +112,7 @@
-
{{ proposal.private_abstract_html|safe }} 
+
{{ proposal.private_abstract_html|safe }} 

@@ -190,16 +190,16 @@
-
{{ speaker.biography_html|safe }} 
+
{{ speaker.biography_html|safe }} 
-
{{ speaker.experience_html|safe }} 
+
{{ speaker.experience_html|safe }} 
{% if speaker.accessibility_html %}
-
{{ speaker.accessibility_html|safe }} 
+
{{ speaker.accessibility_html|safe }} 
{% endif %}
@@ -216,7 +216,6 @@ -
@@ -225,6 +224,7 @@ + @@ -234,10 +234,12 @@ + {% else %} + {% endif %} {% endfor %} diff --git a/vendor/symposion/speakers/forms.py b/vendor/symposion/speakers/forms.py index 371f0c48..00d8a7d1 100644 --- a/vendor/symposion/speakers/forms.py +++ b/vendor/symposion/speakers/forms.py @@ -20,6 +20,7 @@ class SpeakerForm(forms.ModelForm): "accessibility", "travel_assistance", "accommodation_assistance", + "assistance", "agreement", ] diff --git a/vendor/symposion/speakers/migrations/0008_auto_20190624_2328.py b/vendor/symposion/speakers/migrations/0008_auto_20190624_2328.py new file mode 100644 index 00000000..8ef9e492 --- /dev/null +++ b/vendor/symposion/speakers/migrations/0008_auto_20190624_2328.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.11.21 on 2019-06-24 11:28 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('symposion_speakers', '0007_auto_20180712_1006'), + ] + + operations = [ + migrations.AddField( + model_name='speaker', + name='assistance', + field=models.TextField(blank=True, help_text='We have budget set aside to provide financial assistance to linux.conf.au speakers and attendees who might otherwise find it difficult to attend. Please provide details on why you require travel and/or accommodation assistance in order to present your proposed sessions. For travel assistance, please also tell us where you will be coming from (country, state, etc) to assist with planning.', verbose_name='Travel/Accommodation assistance details'), + ), + migrations.AddField( + model_name='speaker', + name='assistance_html', + field=models.TextField(blank=True), + ), + migrations.AlterField( + model_name='speaker', + name='accommodation_assistance', + field=models.BooleanField(default=False, help_text='Check this box if you require us to provide you with accommodation in order to present your proposed sessions.', verbose_name='Accommodation assistance required'), + ), + migrations.AlterField( + model_name='speaker', + name='travel_assistance', + field=models.BooleanField(default=False, help_text='Check this box if you require assistance to travel to linux.conf.au in order to present your proposed sessions.', verbose_name='Travel assistance required'), + ), + ] diff --git a/vendor/symposion/speakers/models.py b/vendor/symposion/speakers/models.py index ef11b889..6626ff2f 100644 --- a/vendor/symposion/speakers/models.py +++ b/vendor/symposion/speakers/models.py @@ -66,17 +66,27 @@ class Speaker(models.Model): travel_assistance = models.BooleanField( blank=True, default=False, - help_text=_("Check this box if you require assistance to travel to Christchurch to " - "present your proposed sessions."), + help_text=_("Check this box if you require assistance to travel to linux.conf.au " + "in order to present your proposed sessions."), verbose_name=_("Travel assistance required"), ) accommodation_assistance = models.BooleanField( blank=True, default=False, - help_text=_("Check this box if you require us to provide you with student-style " - "accommodation in order to present your proposed sessions."), + help_text=_("Check this box if you require us to provide you with accommodation " + "in order to present your proposed sessions."), verbose_name=_("Accommodation assistance required"), ) + assistance = models.TextField( + blank=True, + help_text=_("We have budget set aside to provide financial assistance to " + "linux.conf.au speakers and attendees who might otherwise find it difficult to attend. " + "Please provide details on why you require travel and/or accommodation assistance " + "in order to present your proposed sessions. " + "For travel assistance, please also tell us where you will be coming from " + "(country, state, etc) to assist with planning."), + verbose_name=_("Travel/Accommodation assistance details")) + assistance_html = models.TextField(blank=True) agreement = models.BooleanField( default=False, help_text=_("I agree to the " @@ -107,6 +117,7 @@ class Speaker(models.Model): self.biography_html = parse(self.biography) self.experience_html = parse(self.experience) self.accessibility_html = parse(self.accessibility) + self.assistance_html = parse(self.assistance) return super(Speaker, self).save(*args, **kwargs) def __str__(self):
Name Travel AccomodationDetails
{{ speaker.name }} {{ speaker.travel_assistance }} {{ speaker.accommodation_assistance }}
{{ speaker.assistance_html|safe }}
Unconfirmed co-presenter Unknown UnknownUnknown