Merge branch 'release/v10.87'

rowers/alerts.py

@@ -196,3 +196,11 @@ def alert_get_stats(alert,nperiod=0):
     }
 
 # run alert report
+
+# check alert permission
+def checkalertowner(alert,user):
+    if alert.manager == user:
+        return True
+    if alert.rower.user == user:
+        return True
+    return False

rowers/dataprep.py

@@ -1081,7 +1081,8 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                           makeprivate=False,
                           oarlength=2.89, inboard=0.88,
                           forceunit='lbs',
-                          consistencychecks=False):
+                          consistencychecks=False,
+                          impeller=False):
 
     message = None
     powerperc = 100 * np.array([r.pw_ut2,
@@ -1289,7 +1290,8 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 startdatetime=workoutstartdatetime,
                 inboard=inboard, oarlength=oarlength,
                 timezone=timezone_str,
-                privacy=privacy)
+                privacy=privacy,
+                impeller=impeller)
     try:
         w.save()
     except ValidationError:
@@ -1421,24 +1423,30 @@ def handle_nonpainsled(f2, fileformat, summary=''):
     oarlength = 2.89
     inboard = 0.88
     hasrecognized = False
+    impeller = False
 
     row,hasrecognized,summary,fileformat = parsenonpainsled(fileformat,f2,summary)
 
     # Handle c2log
     if (fileformat == 'c2log' or fileformat == 'rowprolog'):
-        return (0,'',0,0,'')
+        return (0,'',0,0,'',impeller)
 
     if not hasrecognized:
-        return (0,'',0,0,'')
+        return (0,'',0,0,'',impeller)
 
     f_to_be_deleted = f2
     # should delete file
     f2 = f2[:-4] + 'o.csv'
-    try:
-        row2 = rrdata(df = row.df)
-        row2.write_csv(f2, gzip=True)
-    except:
-        return (0,'',0,0,'')
+    row2 = rrdata(df = row.df)
+    if 'speedcoach2' in fileformat:
+        # impeller consistency
+        impellerdata, consistent, ratio = row.impellerconsistent(threshold=0.3)
+        if impellerdata and consistent:
+            impeller = True
+        if impellerdata and not consistent:
+            row2.use_gpsdata()
+    row2.write_csv(f2, gzip=True)
+
 
     # os.remove(f2)
     try:
@@ -1449,7 +1457,7 @@ def handle_nonpainsled(f2, fileformat, summary=''):
         except:
             pass
 
-    return (f2, summary, oarlength, inboard, fileformat)
+    return (f2, summary, oarlength, inboard, fileformat, impeller)
 
 # Create new workout from file and store it in the database
 # This routine should be used everywhere in views.py and mailprocessing.py
@@ -1464,6 +1472,7 @@ def new_workout_from_file(r, f2,
                           makeprivate=False,
                           notes=''):
     message = None
+    impeller = False
     try:
         fileformat = get_file_type(f2)
     except (IOError,UnicodeDecodeError):
@@ -1476,6 +1485,7 @@ def new_workout_from_file(r, f2,
     inboard = 0.88
     if len(fileformat) == 3 and fileformat[0] == 'zip':
         f_to_be_deleted = f2
+        impeller = False
         workoutsbox = Mailbox.objects.filter(name='workouts')[0]
         msg = Message(mailbox=workoutsbox,
                       from_header=r.user.email,
@@ -1543,7 +1553,7 @@ def new_workout_from_file(r, f2,
 
     # handle non-Painsled by converting it to painsled compatible CSV
     if (fileformat != 'csv'):
-        f2, summary, oarlength, inboard, fileformat = handle_nonpainsled(
+        f2, summary, oarlength, inboard, fileformat, impeller = handle_nonpainsled(
             f2,
             fileformat,
             summary=summary
@@ -1571,7 +1581,8 @@ def new_workout_from_file(r, f2,
         summary=summary,
         inboard=inboard, oarlength=oarlength,
         title=title,
-        forceunit='N'
+        forceunit='N',
+        impeller=impeller,
     )
 
     return (id, message, f2)

rowers/forms.py

@@ -31,6 +31,12 @@ formaxlabels = axlabels.copy()
 formaxlabels.pop('None')
 parchoices = list(sorted(formaxlabels.items(), key = lambda x:x[1]))
 
+class SurveyForm(forms.Form):
+    surveydone = forms.ChoiceField(
+        required=True,
+        choices=(('YES','YES'),('NO','NO')),
+        label='Will you take a 2 minute survey to help improve rowsandall?',
+        widget = forms.RadioSelect)
 
 class FlexibleDecimalField(forms.DecimalField):
 

rowers/mailprocessing.py

@@ -86,6 +86,7 @@ def rdata(file, rower=rrower()):
 def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
     """ This one is used in processemail """
     workouttype = 'rower'
+    impeller = False
 
     try:
         datafilename = datafile.name
@@ -139,7 +140,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
     if fileformat == 'att':
         return 0
     if fileformat != 'csv':
-        filename_mediadir, summary, oarlength, inboard,fileformat = dataprep.handle_nonpainsled(
+        filename_mediadir, summary, oarlength, inboard,fileformat,impeller = dataprep.handle_nonpainsled(
             'media/' + datafilename, fileformat, summary)
         if not filename_mediadir:
             return 0
@@ -181,7 +182,7 @@ def make_new_workout_from_email(rower, datafile, name, cntr=0,testing=False):
         oarlength=oarlength,
         title=name,
         workoutsource=fileformat,
-        notes=''
+        notes='',impeller=impeller,
     )
 
 

rowers/middleware.py

@@ -98,8 +98,28 @@ allowed_paths = [
     '/rowers/me/gdpr-optin-confirm'
     '/rowers/exportallworkouts/',
     '/rowers/exportallworkouts',
+    '/rowers/survey/'
 ]
 
+class SurveyMiddleWare(object):
+    def __init__(self, get_response):
+        self.get_response = get_response
+
+    def __call__(self, request):
+        if request.user.is_authenticated and request.path not in allowed_paths:
+            r = getrower(request.user)
+            nexturl = request.path
+            if 'survey' in nexturl:
+                nexturl = '/rowers/list-workouts'
+            if not r.surveydone:
+                return redirect(
+                    '/rowers/survey/?next=%s' % nexturl
+                )
+
+        response = self.get_response(request)
+
+        return response
+
 class GDPRMiddleWare(object):
     def __init__(self, get_response):
         self.get_response = get_response

rowers/models.py

@@ -730,6 +730,8 @@ class Rower(models.Model):
     # Privacy Data
     gdproptin = models.BooleanField(default=False)
     gdproptindate = models.DateTimeField(blank=True,null=True)
+    surveydone = models.BooleanField(default=False)
+    surveydonedate = models.DateTimeField(blank=True,null=True)
 
 
     # Heart Rate Zone data
@@ -2734,6 +2736,7 @@ class Workout(models.Model):
                                choices=privacychoices)
     rankingpiece = models.BooleanField(default=False,verbose_name='Ranking Piece')
     duplicate = models.BooleanField(default=False,verbose_name='Duplicate Workout')
+    impeller = models.BooleanField(default=False,verbose_name='Impeller')
 
     def save(self, *args, **kwargs):
         user = self.user

rowers/templates/menu_workout.html

@@ -287,10 +287,25 @@
           <i class="fas fa-calculator-alt fa-fw"></i>&nbsp;OTW Power
         </a>
       </li>
+      {% if 'speedcoach2' in workout.workoutsource %}
+      <li id="advanced-usegps">
+        <a href="/rowers/workout/{{ workout.id|encode }}/otwusegps/">
+          <i class="fas fa-satellite"></i>
+          {% if workout.impeller %}&nbsp;{% else %}&bull;&nbsp;{% endif %}Use GPS data
+        </a>
+      </li>
+      <li id="advanced-useimpeller">
+        <a href="/rowers/workout/{{ workout.id|encode }}/otwuseimpeller/">
+          <i class="fas fa-wind-turbine fa-rotate-180"></i>
+          {% if workout.impeller %}&bull;&nbsp;{% else %}&nbsp;{% endif %}Use Impeller data
+        </a>
+      </li>
+      {% endif %}
       {% endif %}
       <li id="advanced-instroke">
         <a href="/rowers/workout/{{ workout.id|encode }}/instroke/">
-          <i class="fas fa-search-plus fa-fw"></i>&nbsp;In-Stroke Metrics
+          <i class="fas fa-search-plus fa-fw"></i>
+          In-Stroke Metrics
         </a>
       </li>
       <li id="advanced-recalcsummary">

rowers/templates/survey.html

@@ -0,0 +1,47 @@
+{% extends "newbase.html" %}
+{% load staticfiles %}
+{% load rowerfilters %}
+
+{% block title %}File loading{% endblock %}
+
+{% block meta %}
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+<script type='text/javascript'
+        src='https://ajax.aspnetcdn.com/ajax/jquery.validate/1.14.0/jquery.validate.min.js'>
+</script>
+<script>
+$(document).ready(function(){
+var frm = $("#surveyform")
+
+frm.submit(function(e) {
+  // e.preventDefault()
+  const formData = new FormData(e.target);
+  console.log(formData.get('surveydone'));
+  if (formData.get('surveydone')=='YES') {
+    var a = window.open('https://wp.me/P8g86e-Bs', "survey");
+    a.focus();
+  }
+});
+});
+</script>
+{% endblock %}
+
+{% block main %}
+<ul class="main-content">
+  <li class="grid_4">
+    <form enctype="multipart/form-data" method="post" id="surveyform">
+      {% csrf_token %}
+      <table>
+        {{ form.as_table }}
+      </table>
+      <input type="submit" name="submit" value="SUBMIT">
+  </li>
+
+</ul>
+{% endblock %}
+
+{% block sidebar %}
+{% include 'menu_profile.html' %}
+{% endblock %}

rowers/templates/survey2.html

@@ -0,0 +1,48 @@
+{% extends "newbase.html" %}
+{% load staticfiles %}
+{% load rowerfilters %}
+
+{% block title %}Rowsandall {% endblock %}
+
+
+{% block meta %}
+<script type='text/javascript'
+        src='https://ajax.googleapis.com/ajax/libs/jquery/2.1.4/jquery.min.js'>
+</script>
+<script>
+$(document).ready(function(){
+var frm = $("#surveyform")
+
+frm.submit(function(e) {
+  e.preventDefault()
+  const formData = new FormData(e.target);
+  console.log(formData);
+});
+});
+</script>
+{% endblock %}
+
+
+{% block main %}
+
+<ul class="main-content">
+  <li>
+    <form enctype="multipart/form-data" method="post" id="surveyform">
+      {% csrf_token %}
+      <table>
+        {{ form.as_table }}
+      </table>
+      <input type="submit" name="submit" value="SUBMIT">
+  </li>
+
+</ul>
+
+{% endblock %}
+
+
+
+
+
+{% block sidebar %}
+{% include 'menu_profile.html' %}
+{% endblock %}

rowers/tests/test_aavirtualevents.py

@@ -20,7 +20,7 @@ class VirtualEventViewTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
         self.c = Client()
@@ -36,7 +36,7 @@ class VirtualEventViewTest(TestCase):
 
         self.rpiet = Rower.objects.create(user=self.upiet,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.piet_workouts = WorkoutFactory.create_batch(5, user=self.rpiet)
@@ -49,7 +49,7 @@ class VirtualEventViewTest(TestCase):
 
         self.rklaas = Rower.objects.create(user=self.uklaas,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.klaas_workouts = WorkoutFactory.create_batch(5, user=self.rklaas)
@@ -62,7 +62,7 @@ class VirtualEventViewTest(TestCase):
 
         self.rhenk = Rower.objects.create(user=self.uhenk,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.henk_workouts = WorkoutFactory.create_batch(5, user=self.rhenk)
@@ -851,4 +851,3 @@ class VirtualEventViewTest(TestCase):
     # standalone
     # calculate course adherence
     # other background jobs
-                

rowers/tests/test_analysis.py

@@ -17,7 +17,7 @@ class WorkoutCompareTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -81,7 +81,7 @@ class BoxPlotTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -179,7 +179,7 @@ class ListWorkoutTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -230,7 +230,7 @@ class PlannedSessionTests(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -281,7 +281,7 @@ class ForcecurveTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -317,7 +317,7 @@ class CumStatsTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -354,7 +354,7 @@ class CumFlexTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -459,7 +459,7 @@ class MultiFlexTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -561,7 +561,7 @@ class HistoTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -650,7 +650,7 @@ class WorkoutCompareTestNew(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -739,7 +739,7 @@ class WorkoutBoxPlotTestNew(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -827,7 +827,7 @@ class WorkoutHistoTestNew(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -915,7 +915,7 @@ class WorkoutFlexallTestNew(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -1003,7 +1003,7 @@ class WorkoutStatsTestNew(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -1134,4 +1134,3 @@ class WorkoutStatsTestNew(TestCase):
         response = self.c.post('/rowers/user-analysis-select/',form_data)
 
         self.assertEqual(response.status_code,200)
-

rowers/tests/test_aworkouts.py

@@ -36,7 +36,7 @@ class WorkoutViewTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -611,4 +611,3 @@ class WorkoutViewTest(TestCase):
         self.assertRedirects(response,
                              expected_url=expected_url,
                              status_code=302,target_status_code=200)
-                             

rowers/tests/test_basicrower.py

@@ -18,7 +18,7 @@ class SimpleViewTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
@@ -59,4 +59,3 @@ class SimpleViewTest(TestCase):
         self.assertRedirects(response,
                              expected_url='/rowers/list-workouts/',
                              status_code=302,target_status_code=200)
-        

rowers/tests/test_courses.py

@@ -11,7 +11,7 @@ class CoursesTest(TestCase):
         self.u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
         )
@@ -78,4 +78,3 @@ class CoursesTest(TestCase):
             response.get('Content-Disposition'),
             'attachment; filename="course_1.kml"'
             )
-                               

rowers/tests/test_cpchart.py

@@ -21,7 +21,7 @@ class OTWCPChartTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,sex='male',
+                                      gdproptin=True,surveydone=True,sex='male',
                                       weightcategory='hwt',
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
@@ -113,7 +113,7 @@ class CPChartTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,sex='male',
+                                      gdproptin=True,surveydone=True,sex='male',
                                       weightcategory='hwt',
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
@@ -322,5 +322,3 @@ class CPChartTest(TestCase):
 
         response = self.c.get(url)
         self.assertEqual(response.status_code, 200)
-
-        

rowers/tests/test_emails.py

@@ -12,14 +12,14 @@ class EmailUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -73,14 +73,14 @@ class ZipEmailUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -135,14 +135,14 @@ class EmailUniCodeUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -196,14 +196,14 @@ class EmailBikeErgUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -257,14 +257,14 @@ class EmailBikeUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -321,14 +321,14 @@ class EmailTests(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -404,7 +404,7 @@ class EmailAdminUpload(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now(),
                                  birthdate = faker.profile()['birthdate']
         )
@@ -412,7 +412,7 @@ class EmailAdminUpload(TestCase):
         self.theadmin = UserFactory(is_staff=True)
         self.rtheadmin = Rower.objects.create(user=self.theadmin,
                                               birthdate = faker.profile()['birthdate'],
-                                              gdproptin=True,
+                                              gdproptin=True,surveydone=True,
                                               gdproptindate=timezone.now(),
                                               rowerplan='coach')
 
@@ -473,4 +473,3 @@ race 1
         result = results[0]
 
         self.assertTrue(result.coursecompleted)
-        

rowers/tests/test_empower.py

@@ -14,7 +14,7 @@ class EmpowerTest(TestCase):
                                      'sander@ds.ds',
                                      'koeinsloot',
                                      )
-        r = Rower.objects.create(user=u,rowerplan='coach',gdproptin=True,
+        r = Rower.objects.create(user=u,rowerplan='coach',gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now())
         self.c = Client()
 

rowers/tests/test_flexchart.py

@@ -12,7 +12,7 @@ class WorkoutViewTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       showfavoritechartnotes=True)

rowers/tests/test_imports.py

@@ -22,7 +22,7 @@ class C2Objects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -157,7 +157,7 @@ class C2ObjectsTokenExpired(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -236,7 +236,7 @@ class StravaObjects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -342,7 +342,7 @@ class STObjects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -490,7 +490,7 @@ class RunKeeperObjects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -583,7 +583,7 @@ class UAObjects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -686,7 +686,7 @@ class TPObjects(DjangoTestCase):
         self.u.first_name = 'John'
         self.u.last_name = 'Sander'
         self.u.save()
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 
@@ -769,7 +769,7 @@ class AutoExportTests(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
 

rowers/tests/test_interactivecharts.py

@@ -14,7 +14,7 @@ class InteractiveChartTest(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
         self.nu = datetime.datetime.now()
@@ -137,5 +137,3 @@ class InteractiveChartTest(TestCase):
         res = iplots.interactive_flex_chart2(self.wote.id,promember=1,
                                              xparam='distance',
                                              yparam1='pace',yparam2='spm')
-
-        

rowers/tests/test_misc.py

@@ -17,7 +17,7 @@ class WorkoutTests(TestCase):
         self.u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
         nu = datetime.datetime.now()
@@ -37,7 +37,7 @@ class C2Tests(TestCase):
         self.u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
         self.nu = datetime.datetime.now()
@@ -77,6 +77,3 @@ class subroutinetests(TestCase):
         jsond = json.dumps(data)
         data = c2stuff.createc2workoutdata_as_splits(w)
         jsond = json.dumps(data)
-
-
-

rowers/tests/test_newusers.py

@@ -44,7 +44,7 @@ class NewUserRegistrationTest(TestCase):
         response = self.c.post('/rowers/register/', form_data, follow=True)
 
         self.assertRedirects(response,
-                             expected_url='/rowers/me/gdpr-optin/?next=/rowers/list-workouts/',
+                             expected_url='/rowers/survey/?next=/rowers/list-workouts/',
                              status_code=302,target_status_code=200)
 
 
@@ -84,6 +84,3 @@ class NewUserRegistrationTest(TestCase):
         self.assertRedirects(response,
                             expected_url='/login/',
                             status_code=302,target_status_code=200)
-
-
-        

rowers/tests/test_payments.py

@@ -64,7 +64,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -122,7 +122,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -185,7 +185,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -251,7 +251,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -289,7 +289,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -329,7 +329,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -350,7 +350,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -396,7 +396,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -441,7 +441,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -486,7 +486,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -536,7 +536,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -581,7 +581,7 @@ class PaymentTest(TestCase):
         u = UserFactory()
         r = Rower.objects.create(user=u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
                                       paymentprocessor='braintree',
@@ -620,4 +620,3 @@ class PaymentTest(TestCase):
         self.assertRedirects(response,
                              expected_url = '/rowers/downgradecompleted/',
                              status_code=302,target_status_code=200)
-        

rowers/tests/test_permissions.py

@@ -23,7 +23,7 @@ class PermissionsFreeCoach(TestCase):
         self.ufreecoach = UserFactory(username='coachuser')
         self.rfreecoach = Rower.objects.create(user=self.ufreecoach,
                                                birthdate=faker.profile()['birthdate'],
-                                               gdproptin=True,gdproptindate=timezone.now(),
+                                               gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                                rowerplan='freecoach',clubsize=100)
 
         self.coachinggroup = CoachingGroup.objects.create()
@@ -37,7 +37,7 @@ class PermissionsFreeCoach(TestCase):
         self.uplan = UserFactory(username='planuser')
         self.rplan = Rower.objects.create(user=self.uplan,
                                           birthdate=faker.profile()['birthdate'],
-                                          gdproptin=True,gdproptindate=timezone.now(),
+                                          gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                           rowerplan='plan')
 
         self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan)
@@ -49,7 +49,7 @@ class PermissionsFreeCoach(TestCase):
         self.upro = UserFactory(username='prouser')
         self.rpro = Rower.objects.create(user=self.upro,
                                          birthdate=faker.profile()['birthdate'],
-                                         gdproptin=True,gdproptindate=timezone.now(),
+                                         gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                          rowerplan='pro')
 
         self.upro_workouts = WorkoutFactory.create_batch(5, user=self.rpro)
@@ -61,7 +61,7 @@ class PermissionsFreeCoach(TestCase):
         self.uplan2 = UserFactory(username='planuser2')
         self.rplan2 = Rower.objects.create(user=self.uplan2,
                                            birthdate=faker.profile()['birthdate'],
-                                           gdproptin=True,gdproptindate=timezone.now(),
+                                           gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                            rowerplan='plan')
 
         self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2)
@@ -73,7 +73,7 @@ class PermissionsFreeCoach(TestCase):
         self.upro2 = UserFactory(username='prouser2')
         self.rpro2 = Rower.objects.create(user=self.upro2,
                                           birthdate=faker.profile()['birthdate'],
-                                          gdproptin=True,gdproptindate=timezone.now(),
+                                          gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                           rowerplan='pro')
 
         self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2)
@@ -85,7 +85,7 @@ class PermissionsFreeCoach(TestCase):
         self.ubasic = UserFactory(username='basicuser')
         self.rbasic = Rower.objects.create(user=self.ubasic,
                                            birthdate=faker.profile()['birthdate'],
-                                           gdproptin=True,gdproptindate=timezone.now(),
+                                           gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                            rowerplan='basic')
 
         self.ubasic_workouts = WorkoutFactory.create_batch(5, user=self.rbasic)
@@ -201,7 +201,7 @@ class PermissionsBasicsTests(TestCase):
         self.ucoach = UserFactory(username='coachuser')
         self.rcoach = Rower.objects.create(user=self.ucoach,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                            rowerplan='coach',clubsize=10)
 
         self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach)
@@ -216,7 +216,7 @@ class PermissionsBasicsTests(TestCase):
         self.uplan = UserFactory(username='planuser')
         self.rplan = Rower.objects.create(user=self.uplan,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan)
@@ -228,7 +228,7 @@ class PermissionsBasicsTests(TestCase):
         self.upro = UserFactory(username='prouser')
         self.rpro = Rower.objects.create(user=self.upro,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro_workouts = WorkoutFactory.create_batch(5, user=self.rpro)
@@ -240,7 +240,7 @@ class PermissionsBasicsTests(TestCase):
         self.uplan2 = UserFactory(username='planuser2')
         self.rplan2 = Rower.objects.create(user=self.uplan2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2)
@@ -252,7 +252,7 @@ class PermissionsBasicsTests(TestCase):
         self.upro2 = UserFactory(username='prouser2')
         self.rpro2 = Rower.objects.create(user=self.upro2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2)
@@ -264,7 +264,7 @@ class PermissionsBasicsTests(TestCase):
         self.ubasic = UserFactory(username='basicuser')
         self.rbasic = Rower.objects.create(user=self.ubasic,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.ubasic_workouts = WorkoutFactory.create_batch(5, user=self.rbasic)
@@ -461,7 +461,7 @@ class PermissionsViewTests(TestCase):
         self.ucoach = UserFactory(username='coachuser')
         self.rcoach = Rower.objects.create(user=self.ucoach,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                            rowerplan='coach',clubsize=10)
 
         self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach)
@@ -476,7 +476,7 @@ class PermissionsViewTests(TestCase):
         self.uplan = UserFactory(username='planuser')
         self.rplan = Rower.objects.create(user=self.uplan,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan)
@@ -488,7 +488,7 @@ class PermissionsViewTests(TestCase):
         self.upro = UserFactory(username='prouser')
         self.rpro = Rower.objects.create(user=self.upro,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro_workouts = WorkoutFactory.create_batch(5, user=self.rpro)
@@ -500,7 +500,7 @@ class PermissionsViewTests(TestCase):
         self.uplan2 = UserFactory(username='planuser2')
         self.rplan2 = Rower.objects.create(user=self.uplan2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2)
@@ -512,7 +512,7 @@ class PermissionsViewTests(TestCase):
         self.upro2 = UserFactory(username='prouser2')
         self.rpro2 = Rower.objects.create(user=self.upro2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2)
@@ -524,7 +524,7 @@ class PermissionsViewTests(TestCase):
         self.ubasic = UserFactory(username='basicuser')
         self.rbasic = Rower.objects.create(user=self.ubasic,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.ubasic_workouts = WorkoutFactory.create_batch(5, user=self.rbasic)
@@ -1215,7 +1215,7 @@ class PermissionsCoachingTests(TestCase):
         self.ucoach = UserFactory(username='coachuser')
         self.rcoach = Rower.objects.create(user=self.ucoach,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                            rowerplan='coach',clubsize=10)
 
         self.ucoach_workouts = WorkoutFactory.create_batch(5, user=self.rcoach)
@@ -1230,7 +1230,7 @@ class PermissionsCoachingTests(TestCase):
         self.uplan = UserFactory(username='planuser')
         self.rplan = Rower.objects.create(user=self.uplan,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan_workouts = WorkoutFactory.create_batch(5, user=self.rplan)
@@ -1242,7 +1242,7 @@ class PermissionsCoachingTests(TestCase):
         self.upro = UserFactory(username='prouser')
         self.rpro = Rower.objects.create(user=self.upro,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro_workouts = WorkoutFactory.create_batch(5, user=self.rpro)
@@ -1254,7 +1254,7 @@ class PermissionsCoachingTests(TestCase):
         self.uplan2 = UserFactory(username='planuser2')
         self.rplan2 = Rower.objects.create(user=self.uplan2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='plan')
 
         self.uplan2_workouts = WorkoutFactory.create_batch(5, user=self.rplan2)
@@ -1266,7 +1266,7 @@ class PermissionsCoachingTests(TestCase):
         self.upro2 = UserFactory(username='prouser2')
         self.rpro2 = Rower.objects.create(user=self.upro2,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='pro')
 
         self.upro2_workouts = WorkoutFactory.create_batch(5, user=self.rpro2)
@@ -1278,7 +1278,7 @@ class PermissionsCoachingTests(TestCase):
         self.ubasic = UserFactory(username='basicuser')
         self.rbasic = Rower.objects.create(user=self.ubasic,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=True,gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
         self.ubasic_workouts = WorkoutFactory.create_batch(5, user=self.rbasic)

rowers/tests/test_plans.py

@@ -17,7 +17,7 @@ class TrainingPlanTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -175,7 +175,7 @@ class SessionLinkTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -348,7 +348,7 @@ class SessionCompleteTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -603,7 +603,7 @@ class ChallengeCompleteTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -827,7 +827,7 @@ class MandatoryTestCompleteTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -1040,7 +1040,7 @@ class PlannedSessionsView(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
         self.r.save()
@@ -1049,7 +1049,7 @@ class PlannedSessionsView(TestCase):
         self.u2 = UserFactory(username='testbasicuser')
         self.r2 = Rower.objects.create(user=self.u2,
                                        birthdate=faker.profile()['birthdate'],
-                                       gdproptin=True,
+                                       gdproptin=True,surveydone=True,
                                        gdproptindate=timezone.now(),
                                        rowerplan='basic')
 

rowers/tests/test_rowerplans.py

@@ -14,7 +14,7 @@ class TrialsTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='basic')
 
@@ -64,6 +64,3 @@ class TrialsTest(TestCase):
         self.assertEqual(hasplannedsessions(self.u),True)
         self.assertEqual(iscoachmember(self.u),False)
         self.assertEqual(ispromember(self.u),True)
-
-
-        

rowers/tests/test_settings.py

@@ -14,7 +14,7 @@ class DataTest(TestCase):
         u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        r = Rower.objects.create(user=u,gdproptin=True,
+        r = Rower.objects.create(user=u,gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now()
         )
         self.nu = datetime.datetime.now()

rowers/tests/test_simplefunctions.py

@@ -36,7 +36,7 @@ class SimpleViewTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 

rowers/tests/test_staticcharts.py

@@ -18,7 +18,7 @@ class PlotTests(TestCase):
                                      'sander@ds.ds',
                                      'koeinsloot')
         r = Rower.objects.create(user=u,
-                                 gdproptin=True,
+                                 gdproptin=True,surveydone=True,
                                  gdproptindate=timezone.now(),
                                  rowerplan='basic')
         self.nu = datetime.datetime.now()

rowers/tests/test_team.py

@@ -41,7 +41,7 @@ class TeamTest(TestCase):
 
             r = Rower.objects.create(
                 birthdate=faker.profile()['birthdate'],
-                gdproptin=True,
+                gdproptin=True,surveydone=True,
                 gdproptindate=timezone.now(),
                 rowerplan='coach',
                 user=u,
@@ -264,7 +264,7 @@ class TeamTestLowLevel(TestCase):
 
             r = Rower.objects.create(
                 birthdate=faker.profile()['birthdate'],
-                gdproptin=True,
+                gdproptin=True,surveydone=True,
                 gdproptindate=timezone.now(),
                 rowerplan='coach',
                 user=u,
@@ -353,5 +353,3 @@ class TeamTestLowLevel(TestCase):
         # cannot create invite for team you don't manage
         id, comment = create_invite(self.t, self.users[3],self.users[4])
         self.assertEqual(id,0)
-
-

rowers/tests/test_units.py

@@ -26,7 +26,7 @@ class ForceUnits(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 
@@ -164,7 +164,7 @@ class TestForceUnit(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
+                                      gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach')
 

rowers/tests/test_uploads.py

@@ -18,7 +18,7 @@ class ViewTest(TestCase):
         self.u = User.objects.create_user('john',
                                      'sander@ds.ds',
                                      'koeinsloot')
-        self.r = Rower.objects.create(user=self.u,gdproptin=True,
+        self.r = Rower.objects.create(user=self.u,gdproptin=True,surveydone=True,
                                       gdproptindate=timezone.now(),
                                       rowerplan='coach',
         )
@@ -783,4 +783,3 @@ class ViewTest(TestCase):
             os.remove(f_to_be_deleted+'.gz')
         except (FileNotFoundError,OSError):
             pass
-

rowers/tests/test_user.py

@@ -80,8 +80,8 @@ class UserPreferencesTest(TestCase):
 
         self.r = Rower.objects.create(user=self.u,
                                       birthdate=faker.profile()['birthdate'],
-                                      gdproptin=True,
-                                      gdproptindate=timezone.now(),
+                                      gdproptin=True,surveydone=Trueoptin=True,
+                                      gdproptin=True,surveydone=Trueoptindate=timezone.now(),
                                       rowerplan='coach')
 
         self.c = Client()
@@ -245,5 +245,3 @@ class UserPreferencesTest(TestCase):
 
         response = self.c.post(url,form_data)
         self.assertEqual(response.status_code,200)
-
-        

rowers/urls.py

@@ -283,6 +283,10 @@ urlpatterns = [
     re_path(r'^graph/(?P<pk>\d+)/delete/$',views.GraphDelete.as_view(),name='graph_delete'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/get-thumbnails/$',views.get_thumbnails,
         name='get_thumbnails'),
+    re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/otwuseimpeller/$',views.otw_use_impeller,
+        name='otw_use_impeller'),
+    re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/otwusegps/$',views.otw_use_gps,
+        name='otw_use_gps'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/toggle-ranking/$',views.workout_toggle_ranking,
         name='workout_toggle_ranking'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/get-testscript/$',views.get_testscript,
@@ -445,6 +449,7 @@ urlpatterns = [
     re_path(r'^user-multiflex-data/$',views.multiflex_data,name='multiflex_data'),
     re_path(r'^me/deactivate/$',views.deactivate_user,name='deactivate_user'),
     re_path(r'^me/delete/$',views.remove_user,name='remove_user'),
+    re_path(r'^survey/$',views.survey,name='survey'),
     re_path(r'^me/gdpr-optin-confirm/?/$',views.user_gdpr_confirm,name='user_gdpr_confirm'),
     re_path(r'^me/gdpr-optin-confirm/$',views.user_gdpr_confirm,name='user_gdpr_confirm'),
     re_path(r'^me/gdpr-optin/?/$',views.user_gdpr_optin,name='user_gdpr_optin'),

rowers/views/analysisviews.py

@@ -4322,9 +4322,10 @@ def agegrouprecordview(request,sex='male',weightcategory='hwt',
                    })
 
 # alert overview view
-@user_passes_test(ispromember, login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
-                  redirect_field_name=None)
+#@user_passes_test(ispromember, login_url="/rowers/paidplans",
+#                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
+#                  redirect_field_name=None)
+@login_required
 def alerts_view(request,userid=0):
     r = getrequestrower(request,userid=userid)
 
@@ -4436,9 +4437,7 @@ def alert_create_view(request,userid=0):
                       })
 
 # alert report view
-@user_passes_test(ispromember, login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality",
-                  redirect_field_name=None)
+@login_required()
 def alert_report_view(request,id=0,userid=0,nperiod=0):
     r = getrequestrower(request,userid=userid)
     if userid == 0:
@@ -4453,7 +4452,7 @@ def alert_report_view(request,id=0,userid=0,nperiod=0):
         raise Http404("This alert doesn't exist")
 
 
-    if alert.manager != request.user:
+    if not checkalertowner(alert,request.user):
         raise PermissionDenied('You are not allowed to edit this Alert')
 
     stats = alert_get_stats(alert,nperiod=nperiod)
@@ -4505,7 +4504,7 @@ def alert_edit_view(request,id=0,userid=0):
         raise Http404("This alert doesn't exist")
 
 
-    if alert.manager != request.user:
+    if not alert.manager != request.user:
         raise PermissionDenied('You are not allowed to edit this Alert')
 
     FilterFormSet = formset_factory(ConditionEditForm, formset=BaseConditionFormSet,extra=0)
@@ -4603,6 +4602,7 @@ def alert_edit_view(request,id=0,userid=0):
                       })
 
 # alert delete view
+
 class AlertDelete(DeleteView):
     login_requird = True
     model = Alert
@@ -4650,6 +4650,9 @@ class AlertDelete(DeleteView):
     def get_object(self, *args, **kwargs):
         obj = super(AlertDelete, self).get_object(*args, **kwargs)
 
+        if obj.manager != self.request.user:
+            raise PermissionDenied("You are not allowed to delete this Alert")
+
         # some checks
 
         return obj

rowers/views/statements.py

@@ -60,7 +60,7 @@ from rowers.forms import (
     MetricsForm,DisqualificationForm,disqualificationreasons,
     disqualifiers,SearchForm,BillingForm,PlanSelectForm,
     VideoAnalysisCreateForm,WorkoutSingleSelectForm,
-    VideoAnalysisMetricsForm,
+    VideoAnalysisMetricsForm,SurveyForm,
     )
 
 from django.urls import reverse, reverse_lazy

rowers/views/userviews.py

@@ -5,6 +5,31 @@ from __future__ import unicode_literals
 
 from rowers.views.statements import *
 
+@login_required()
+def survey(request):
+
+    r = getrower(request.user)
+
+    surveyform = SurveyForm()
+
+    if request.method == 'POST':
+        form = SurveyForm(request.POST)
+        r.surveydone = True
+        r.surveydonedate = timezone.now()
+        r.save()
+
+        nexturl = request.GET.get('next')
+        return HttpResponseRedirect(nexturl)
+
+    context = {
+        'teams':get_my_teams(request.user),
+        'rower':r,
+        'form':surveyform,
+        }
+
+
+    return render(request,'survey.html',context)
+
 @login_required()
 def start_trial_view(request):
     r = getrower(request.user)

rowers/views/workoutviews.py

@@ -456,18 +456,54 @@ def workout_forcecurve_view(request,id=0,workstrokesonly=False):
                       'teams':get_my_teams(request.user),
                   })
 
-# Test asynchronous tasking and messaging
-#@login_required()
-#def workout_test_task_view(request,id=0):
-#    row = Workout.objects.get(id=id)
-#    res = myqueue(queuehigh,addcomment2,request.user.id,row.id)#
-#
-#
-#    url = reverse('workout_edit_view',
-#                  kwargs = {
-#                      'id':int(id),
-#                  })
-#    return HttpResponseRedirect(url)
+# Switch from GPS to Impeller (only for SpeedCoach 2, if impeller data)
+@login_required
+def otw_use_impeller(request,id=0):
+    w = get_workout(id)
+
+    if (checkworkoutuser(request.user,w)==False):
+        raise PermissionDenied("Access denied")
+
+    row = rdata(w.csvfilename)
+    success = row.use_impellerdata()
+    if success:
+        row.write_csv(w.csvfilename)
+        dataprep.update_strokedata(w.id,row.df)
+        w.impeller = True
+        w.save()
+        messages.info(request,'The distance and speed data are now based on Impeller data')
+    else:
+        messages.error(request,'No impeller data found')
+
+    url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)})
+
+    return HttpResponseRedirect(url)
+
+
+# Switch from Impeller to GPS (only for SpeedCoach 2, if impeller data)
+@login_required
+def otw_use_gps(request,id=0):
+    w = get_workout(id)
+
+    if (checkworkoutuser(request.user,w)==False):
+        raise PermissionDenied("Access denied")
+
+    row = rdata(w.csvfilename)
+    success = row.use_gpsdata()
+    if success:
+        row.write_csv(w.csvfilename)
+        dataprep.update_strokedata(w.id,row.df)
+        w.impeller = False
+        w.save()
+        messages.info(request,'The distance and speed data are now based on GPS data')
+    else:
+        messages.error(request,'No GPS data found')
+
+    url = reverse('workout_edit_view',kwargs={'id':encoder.encode_hex(w.id)})
+
+    return HttpResponseRedirect(url)
+
+
 
 # Show Stroke power histogram for a workout
 @login_required()

rowsandall_app/settings.py

@@ -97,6 +97,7 @@ MIDDLEWARE = [
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
     'tz_detect.middleware.TimezoneMiddleware',
+	'rowers.middleware.SurveyMiddleWare',
     'rowers.middleware.GDPRMiddleWare',
     'rowers.middleware.PowerTimeFitnessMetricMiddleWare',
     'rowers.middleware.RowerPlanMiddleWare',

templates/newbase.html

@@ -43,6 +43,7 @@
     <link rel="stylesheet" href="/static/css/resetnew.css" />
     <link rel="stylesheet" href="/static/fontawesome/css/fontawesome.min.css">
     <link rel="stylesheet" href="/static/fontawesome/css/all.min.css">
+		<link rel="stylesheet" href="https://pro.fontawesome.com/releases/v5.12.0/css/all.css" integrity="sha384-ekOryaXPbeCpWQNxMwSWVvQ0+1VrStoPJq54shlYhR8HzQgig1v5fas6YgOqLoKz" crossorigin="anonymous">
     <link rel="stylesheet" href="/static/css/styles2.min.css">
     <link rel="stylesheet" href="/static/css/text2.css" />
     <link rel="stylesheet" href="/static/css/rowsandall2.min.css" />
@@ -326,6 +327,11 @@
         </p>
         {% endif %}
         {% block ad %}
+				<div class="site-announcement-box">
+					<div class="site-announcement-white">
+						<a href="https://wp.me/P8g86e-Bs">Please take 2 minutes to fill out the survey!</a>
+					</div>
+				</div>
         <div id="id_blogs">
         </div>
         <a href="https://pryglrowing.com">