Merge branch 'develop' into feature/rules

rowers/admin.py

@@ -17,7 +17,8 @@ from .models import (
 # Register your models here so you can use them in the Admin module
 
 
-# Rower details directly under the User 
+
+# Rower details directly under the User
 class RowerInline(admin.StackedInline):
     model = Rower
     can_delete = False
@@ -31,7 +32,7 @@ class RowerInline(admin.StackedInline):
          {'fields':('paidplan','rowerplan','paymenttype','planexpires','teamplanexpires','protrialexpires','plantrialexpires','clubsize','offercoaching')}),
         ('Rower Settings',
          {'fields':
-          ('gdproptin','gdproptindate','weightcategory','sex','adaptiveclass','birthdate','getemailnotifications',
+          ('surveydone','surveydonedate','gdproptin','gdproptindate','weightcategory','sex','adaptiveclass','birthdate','getemailnotifications',
            'getimportantemails','emailbounced','defaultlandingpage',
            'defaulttimezone','showfavoritechartnotes')}),
         ('Rower Zones',
@@ -73,7 +74,7 @@ class UserAdmin(admin.ModelAdmin):
         ('Permissions',
          {'fields':
           ('is_active', 'is_staff', 'is_superuser', 'groups', 'user_permissions',)}),)
-    
+
     search_fields = ["username","first_name","last_name","email"]
 
     def rowerplan(self, obj):
@@ -90,7 +91,7 @@ class FavoriteChartAdmin(admin.ModelAdmin):
 
 class C2WorldClassAgePerformanceAdmin(admin.ModelAdmin):
     list_display = ('sex','weightcategory','age','distance','power','name','season')
-    
+
 class SiteAnnouncementAdmin(admin.ModelAdmin):
     list_display = ('announcement','created','modified','expires','dotweet')
 
@@ -99,7 +100,7 @@ class TeamAdmin(admin.ModelAdmin):
 
 class TeamInviteAdmin(admin.ModelAdmin):
     list_display = ('issuedate','team','user','code')
-    
+
 class TeamRequestAdmin(admin.ModelAdmin):
     list_display = ('issuedate','team','user','code')
 
@@ -136,7 +137,7 @@ class IndoorVirtualRaceResultAdmin(admin.ModelAdmin):
 
 class PaidPlanAdmin(admin.ModelAdmin):
     list_display = ('name','shortname','price','paymenttype','paymentprocessor','external_id')
-    
+
 admin.site.unregister(User)
 admin.site.register(User,UserAdmin)
 admin.site.register(Workout,WorkoutAdmin)

rowers/templates/survey.html

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

rowers/templates/survey2.html

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