sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'develop' into feature/metrics

Browse Source
This commit is contained in:
Sander Roosendaal
2020-01-11 13:57:23 +01:00
parent 23329e668a 1b13b92b21
commit 71d002d8ff
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/admin.py
View File

@@ -32,7 +32,7 @@ class RowerInline(admin.StackedInline):
{'fields':('paidplan','rowerplan','paymenttype','planexpires','teamplanexpires','protrialexpires','plantrialexpires','clubsize','offercoaching')}), {'fields':('paidplan','rowerplan','paymenttype','planexpires','teamplanexpires','protrialexpires','plantrialexpires','clubsize','offercoaching')}),
('Rower Settings', ('Rower Settings',
{'fields': {'fields':
('gdproptin','gdproptindate','weightcategory','sex','adaptiveclass','birthdate','getemailnotifications', ('surveydone','surveydonedate','gdproptin','gdproptindate','weightcategory','sex','adaptiveclass','birthdate','getemailnotifications',
'getimportantemails','emailbounced','defaultlandingpage', 'getimportantemails','emailbounced','defaultlandingpage',
'defaulttimezone','showfavoritechartnotes')}), 'defaulttimezone','showfavoritechartnotes')}),
('Rower Zones', ('Rower Zones',

2
rowers/templates/survey.html
View File

@@ -36,7 +36,7 @@ frm.submit(function(e) {
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
<input type="submit" name="submit" value="SUBMIT"> <input type="submit" name="submit" value="CONTINUE">
</li> </li>
</ul> </ul>

2
rowers/templates/survey2.html
View File

@@ -32,7 +32,7 @@ frm.submit(function(e) {
<table> <table>
{{ form.as_table }} {{ form.as_table }}
</table> </table>
<input type="submit" name="submit" value="SUBMIT"> <input type="submit" name="submit" value="CONTINUE">
</li> </li>
</ul> </ul>

6
survey/models.py
View File

@@ -52,7 +52,7 @@ class Response(models.Model):
capabilities = models.NullBooleanField(default=None,null=True,blank=True, capabilities = models.NullBooleanField(default=None,null=True,blank=True,
verbose_name='Did you get the capabilities and features that you expected out of Rowsandall') verbose_name='Did you get the capabilities and features that you expected out of Rowsandall')
fallshort = models.TextField(max_length=300,blank=True,verbose_name='Where did Rowsandall fall short of your expectations?') fallshort = models.TextField(max_length=500,blank=True,verbose_name='Where did Rowsandall fall short of your expectations?')
considerchoices = ( considerchoices = (
('no','No'), ('no','No'),
@@ -64,7 +64,7 @@ class Response(models.Model):
considered = models.CharField(max_length=150,choices=considerchoices,default=None,null=True,blank=True, considered = models.CharField(max_length=150,choices=considerchoices,default=None,null=True,blank=True,
verbose_name='If you are on a Free plan, did you consider one of the paid plans?') verbose_name='If you are on a Free plan, did you consider one of the paid plans?')
features = models.TextField(max_length=300,blank=True, features = models.TextField(max_length=500,blank=True,
verbose_name="What combination of features would entice you to upgrade to a paid plan") verbose_name="What combination of features would entice you to upgrade to a paid plan")
agreechoices = ( agreechoices = (
@@ -120,6 +120,6 @@ class Response(models.Model):
other = models.BooleanField(default=False,verbose_name='Other') other = models.BooleanField(default=False,verbose_name='Other')
suggestiontext = models.TextField( suggestiontext = models.TextField(
max_length=300,default=None,null=True,blank=True, max_length=500,default=None,null=True,blank=True,
verbose_name='My suggestion is (please write a short description of your suggestion)' verbose_name='My suggestion is (please write a short description of your suggestion)'
) )