Merge branch 'release/v10.53'

2019-11-16 16:57:49 +01:00
parent 1232237564 dcaec4cfa4
commit 9ba5a6a145
7 changed files with 98 additions and 88 deletions
@@ -270,6 +270,7 @@ def create_subscription(rower,data):


    if result.is_success:
+        yesterday = (timezone.now()-datetime.timedelta(days=1)).date()
        rower.paidplan = plan
        rower.planexpires = result.subscription.billing_period_end_date
        rower.teamplanexpires = result.subscription.billing_period_end_date
@@ -277,6 +278,8 @@ def create_subscription(rower,data):
        rower.paymenttype = plan.paymenttype
        rower.rowerplan = plan.shortname
        rower.subscription_id = result.subscription.id
+        rower.protrialexpires = yesterday
+        rower.plantrialexpires = yesterday

        rower.save()
        name = '{f} {l}'.format(
@@ -1707,6 +1707,7 @@ def getrowdata_db(id=0, doclean=False, convertnewtons=True,
 def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,compute=True):
    #    prepmultipledata(ids)

+
    if ids:
        csvfilenames = ['media/strokedata_{id}.parquet.gz'.format(id=id) for id in ids]
    else:
@@ -1716,6 +1717,7 @@ def getsmallrowdata_db(columns, ids=[], doclean=True,workstrokesonly=True,comput
    columns = [c for c in columns if c != 'None']
    columns = list(set(columns))

+
    if len(ids)>1:
        for id,f in zip(ids,csvfilenames):
            try:
@@ -726,7 +726,10 @@ def getsmallrowdata_db(columns,ids=[],debug=False):
        except ValueError:
            df = pd.DataFrame()
    else:
+        try:
            df = pd.read_parquet(csvfilenames[0],columns=columns,engine='pyarrow')
+        except (OSError,IndexError):
+            pass


    return df
@@ -2693,7 +2693,7 @@ def interactive_chart(id=0,promember=0,intervaldata = {}):
        TOOLS = 'pan,box_zoom,wheel_zoom,reset,tap,hover,crosshair'


-    columns = ['time','pace','hr','fpace','ftime']
+    columns = ['time','pace','hr','fpace','ftime','spm']
    datadf = dataprep.getsmallrowdata_db(columns,ids=[id])

    datadf.dropna(axis=0,how='any',inplace=True)
@@ -3314,10 +3314,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
       var distance1 = data['distance']
       var power1 = data['power']
       var driveenergy1 = data['driveenergy']
-       var xname = data['xname'][0]
-       var yname1 = data['yname1'][0]
-       var yname2 = data['yname2'][0]
-       var workoutid1 = data['workoutid'][0]
+       var xname = data['xname']
+       var yname1 = data['yname1']
+       var yname2 = data['yname2']
+       var workoutid1 = data['workoutid']

       var minspm = minspm.value
       var maxspm = maxspm.value
@@ -3362,10 +3362,10 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
                   data2['driveenergy'].push(driveenergy1[i])
                   data2['distance'].push(distance1[i])
                   data2['power'].push(power1[i])
-                   data2['workoutid'].push(workoutid1)
-                   data2['xname'].push(xname)
-                   data2['yname1'].push(yname1)
-                   data2['yname2'].push(yname2)
+                   data2['workoutid'].push(0)
+                   data2['xname'].push(0)
+                   data2['yname1'].push(0)
+                   data2['yname2'].push(0)

                   xm += x1[i]
                   ym1 += y1[i]
@@ -3389,9 +3389,9 @@ def interactive_cum_flex_chart2(theworkouts,promember=0,
       x1means.location = xm
       y1means.location = ym1
       y2means.location = ym2
-       y1label.text = yname1+': '+(ym1).toFixed(2)
-       y2label.text = yname2+': '+(ym2).toFixed(2)
-       xlabel.text = xname+': '+(xm).toFixed(2)
+       y1label.text = yname1[0]+': '+(ym1).toFixed(2)
+       y2label.text = yname2[0]+': '+(ym2).toFixed(2)
+       xlabel.text = xname[0]+': '+(xm).toFixed(2)

       source2.change.emit();
       """)
@@ -3475,16 +3475,16 @@ def interactive_flex_chart2(id=0,promember=0,
    columns = [xparam,yparam1,yparam2,
               'ftime','distance','fpace',
               'power','hr','spm','driveenergy',
-               'time','pace','workoutstate','time']
+               'time','pace','workoutstate']

    rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
                                          workstrokesonly=workstrokesonly)

-    if rowdata.empty:
+    if len(rowdata)<2:
        rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],doclean=True,
                                              workstrokesonly=False)
        workstrokesonly=False
-    if rowdata.empty:
+    if len(rowdata)<2:
        rowdata = dataprep.getsmallrowdata_db(columns,ids=[id],
                                              doclean=False,
                                              workstrokesonly=False)
@@ -3639,6 +3639,8 @@ def interactive_flex_chart2(id=0,promember=0,
        rowdata
        )

+
+
    # second source for filtering
    source2 = ColumnDataSource(
        rowdata.copy()
@@ -3893,12 +3895,11 @@ def interactive_flex_chart2(id=0,promember=0,
       var distance1 = data['distance']
       var power1 = data['power']
       var driveenergy1 = data['driveenergy']
-       var xname = data['xname'][0]
-       var yname1 = data['yname1'][0]
-       var yname2 = data['yname2'][0]
-       var workoutid1 = data['workoutid'][0]
-       var workoutstate1 = data['workoutstate'][0]
-
+       var xname = data['xname']
+       var yname1 = data['yname1']
+       var yname2 = data['yname2']
+       var workoutid1 = data['workoutid']
+       var workoutstate1 = data['workoutstate']

       var annotation = annotation.value
       var minspm = minspm.value
@@ -3956,11 +3957,11 @@ def interactive_flex_chart2(id=0,promember=0,
                   data2['hr'].push(hr1[i])
                   data2['distance'].push(distance1[i])
                   data2['power'].push(power1[i])
-                   data2['workoutid'].push(workoutid1)
-                   data2['workoutstate'].push(workoutstate1)
-                   data2['xname'].push(xname)
-                   data2['yname1'].push(yname1)
-                   data2['yname2'].push(yname2)
+                   data2['workoutid'].push(0)
+                   data2['workoutstate'].push(0)
+                   data2['xname'].push(0)
+                   data2['yname1'].push(0)
+                   data2['yname2'].push(0)


                   xm += x1[i]
@@ -3986,9 +3987,9 @@ def interactive_flex_chart2(id=0,promember=0,
       x1means.location = xm
       y1means.location = ym1
       y2means.location = ym2
-       y1label.text = yname1+': '+ym1.toFixed(2)
-       y2label.text = yname2+': '+ym2.toFixed(2)
-       xlabel.text = xname+': '+xm.toFixed(2)
+       y1label.text = yname1[0]+': '+ym1.toFixed(2)
+       y2label.text = yname2[0]+': '+ym2.toFixed(2)
+       xlabel.text = xname[0]+': '+xm.toFixed(2)
       annolabel.text = annotation

       source2.change.emit();
@@ -31,7 +31,7 @@ defaultoptions = {


@user_passes_test(ispromember, login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def analysis_new(request,userid=0,function='boxplot',teamid=0):
    r = getrequestrower(request, userid=userid)
@@ -667,7 +667,7 @@ def boxplotdata(workouts,options):
    return(script,div)

@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def analysis_view_data(request,userid=0):
    if not request.is_ajax():
@@ -725,7 +725,7 @@ def analysis_view_data(request,userid=0):

 # Histogram for a date/time range
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def histo(request,theuser=0,
          startdate=timezone.now()-datetime.timedelta(days=365),
@@ -2148,7 +2148,7 @@ def rankings_view2(request,theuser=0,

 # Show ranking distances including predicted paces
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def otwrankings_view(request,theuser=0,
                     startdate=timezone.now()-datetime.timedelta(days=365),
@@ -2553,7 +2553,7 @@ def otwcp_toadmin_view(request,theuser=0,

 # Show ranking distances including predicted paces
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def oterankings_view(request,theuser=0,
                     startdate=timezone.now()-datetime.timedelta(days=365),
@@ -2904,7 +2904,7 @@ def oterankings_view(request,theuser=0,

 # Multi Flex Chart with Grouping
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def user_multiflex_select(request,
                          startdatestring="",
@@ -3110,7 +3110,7 @@ def user_multiflex_select(request,
                   })

@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def multiflex_data(request,userid=0,
                 options={
@@ -3363,7 +3363,7 @@ def multiflex_data(request,userid=0,


@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def multiflex_view(request,userid=0,
                 options={
@@ -3530,7 +3530,7 @@ def multiflex_view(request,userid=0,

 # Box plots
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def user_boxplot_select(request,
                        startdatestring="",
@@ -3738,7 +3738,7 @@ def user_boxplot_select(request,
                   })

@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def boxplot_view_data(request,userid=0,
                 options={
@@ -3855,7 +3855,7 @@ def boxplot_view_data(request,userid=0,
        })

@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def boxplot_view(request,userid=0,
                 options={
@@ -3974,7 +3974,7 @@ def boxplot_view(request,userid=0,


 # Cumulative stats page
-@user_passes_test(ispromember,login_url="/rowers/paidplans",message="This functionality requires a Pro plan or higher",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)
 def cumstats(request,theuser=0,
             startdate=timezone.now()-datetime.timedelta(days=30),
             enddate=timezone.now(),
@@ -4323,7 +4323,7 @@ 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",
+                  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)
 def alerts_view(request,userid=0):
    r = getrequestrower(request,userid=userid)
@@ -4357,7 +4357,7 @@ def alerts_view(request,userid=0):

 # alert create view
@user_passes_test(ispromember, login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def alert_create_view(request,userid=0):
    r = getrequestrower(request,userid=userid)
@@ -4437,7 +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",
+                  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)
 def alert_report_view(request,id=0,userid=0,nperiod=0):
    r = getrequestrower(request,userid=userid)
@@ -4494,7 +4494,7 @@ def alert_report_view(request,id=0,userid=0,nperiod=0):

 # alert edit view
@user_passes_test(ispromember, login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def alert_edit_view(request,id=0,userid=0):
    r = getrequestrower(request,userid=userid)
@@ -8,7 +8,7 @@ import rowers.teams as teams

 # Show the EMpower Oarlock generated Stroke Profile
@user_passes_test(ispromember,login_url="/rowers/paidplans/",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_forcecurve_view(request,id=0,workstrokesonly=False):
    row = get_workout(id)
@@ -336,8 +336,9 @@ def fitness_metric_view(request,mode='rower',days=42):
    return HttpResponse("job queued")


+@login_required()
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_update_cp_view(request,id=0):
    row = get_workout(id)
@@ -400,7 +401,7 @@ def workout_recalcsummary_view(request,id=0):

 # Joining workout
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workouts_join_view(request):
    promember=0
@@ -446,7 +447,7 @@ def workouts_join_view(request):
        return HttpResponseRedirect(url)

@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workouts_join_select(request,
                         startdatestring="",
@@ -604,7 +605,7 @@ def workouts_join_select(request,

 # Team comparison
@user_passes_test(ispromember,login_url='/rowers/paidplans/',
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def team_comparison_select(request,
                           startdatestring="",
@@ -1387,7 +1388,7 @@ def workouts_view(request,message='',successmessage='',

 # List of workouts to compare a selected workout to
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_fusion_list(request,id=0,message='',successmessage='',
                            startdatestring="",enddatestring="",
@@ -1593,7 +1594,7 @@ def workout_view(request,id=0):

 # Resets stroke data to raw data (pace)
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_undo_smoothenpace_view(
        request,id=0,message="",successmessage=""
@@ -1632,7 +1633,7 @@ def workout_undo_smoothenpace_view(

 # Data smoothing of pace data
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_smoothenpace_view(request,id=0,message="",successmessage=""):
    row = get_workout(id)
@@ -1685,7 +1686,7 @@ def workout_smoothenpace_view(request,id=0,message="",successmessage=""):

 # Process CrewNerd Summary CSV and update summary
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  message="This functionality requires a Pro plan or higher. If you are already a Pro user, please log in to access this functionality. If you are already a Pro user, please log in to access this functionality",
                  redirect_field_name=None)
 def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):
    row = get_workout(id)
@@ -1762,7 +1763,7 @@ def workout_crewnerd_summary_view(request,id=0,message="",successmessage=""):

 # Get weather for given location and date/time
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def workout_downloadwind_view(request,id=0,
                              airportcode=None,
@@ -1836,7 +1837,7 @@ def workout_downloadwind_view(request,id=0,
    return response

 # Get weather for given location and date/time
-@user_passes_test(ispromember,login_url="/rowers/paidplans",message="This functionality requires a Pro plan or higher",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)
 def workout_downloadmetar_view(request,id=0,
                              airportcode=None,
                              message="",successmessage=""):
@@ -1911,7 +1912,7 @@ def workout_downloadmetar_view(request,id=0,


 # Show form to update wind data
-@user_passes_test(ispromember,login_url="/rowers/paidplans",message="This functionality requires a Pro plan or higher",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)
 def workout_wind_view(request,id=0,message="",successmessage=""):
    row = get_workout(id)
    r = getrower(request.user)
@@ -2047,7 +2048,7 @@ def workout_wind_view(request,id=0,message="",successmessage=""):


 # Show form to update River stream data (for river dwellers)
-@user_passes_test(ispromember,login_url="/rowers/paidplans",message="This functionality requires a Pro plan or higher",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)
 def workout_stream_view(request,id=0,message="",successmessage=""):
    row = get_workout(id)
    r = getrower(request.user)
@@ -4628,7 +4629,7 @@ def workout_summary_restore_view(request,id,message="",successmessage=""):

 # Split a workout
@user_passes_test(ispromember,login_url="/rowers/paidplans",
-                  message="This functionality requires a Pro plan or higher",
+                  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)
 def workout_split_view(request,id=0):
    row = get_workout_permitted(request.user,id)
@@ -4724,7 +4725,7 @@ def workout_split_view(request,id=0):


 # Fuse two workouts
-@user_passes_test(ispromember,login_url="/rowers/paidplans",message="This functionality requires a Pro plan or higher",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)
 def workout_fusion_view(request,id1=0,id2=1):

    try: