Merge branch 'release/v16.0.2'

cvkbrno/templates/cvkbrno_boat_add_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Boat" %}{% endblock %}

cvkbrno/templates/cvkbrno_boat_delete_confirm.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 

cvkbrno/templates/cvkbrno_boat_edit_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Boat" %}{% endblock %}

cvkbrno/templates/cvkbrno_boats_admin.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Boats Admin" %}{% endblock %}

cvkbrno/templates/cvkbrno_categories_admin.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Boat Category Admin" %}{% endblock %}

cvkbrno/templates/cvkbrno_categories_delete_confirm.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Delete Boat Category" %}{% endblock %}

cvkbrno/templates/cvkbrno_categories_edit_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Category" %}{% endblock %}

cvkbrno/templates/cvkbrno_category_add_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Category" %}{% endblock %}

cvkbrno/templates/cvkbrno_member_add_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Member" %}{% endblock %}

cvkbrno/templates/cvkbrno_member_edit_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Member" %}{% endblock %}

cvkbrno/templates/cvkbrno_members_admin.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Members Admin" %}{% endblock %}

cvkbrno/templates/cvkbrno_members_delete_confirm.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Delete Member" %}{% endblock %}

cvkbrno/templates/cvkbrno_memberswork_add_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Members Work" %}{% endblock %}

cvkbrno/templates/cvkbrno_memberswork_admin.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Members Work Admin" %}{% endblock %}

cvkbrno/templates/cvkbrno_memberwork_edit_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Edit Member Work" %}{% endblock %}

cvkbrno/templates/cvkbrno_meterboard.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Meterboard" %}{% endblock %}

cvkbrno/templates/cvkbrno_outing_admin.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load filter %}
 {% load tz %}

cvkbrno/templates/cvkbrno_outing_closeform.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Return from outing" %}

cvkbrno/templates/cvkbrno_outing_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

cvkbrno/templates/cvkbrno_races_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Create Races Event" %}{% endblock %}

cvkbrno/templates/cvkbrno_races_list.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{% trans "Races Admin" %}{% endblock %}

cvkbrno/templates/cvkbrno_reservation_form.html

@@ -1,6 +1,6 @@
 {% extends "cvkbrnobase.html" %}
 {% load i18n %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

cvkbrno/templates/cvkbrno_setlanguage.html

@@ -1,5 +1,5 @@
 {% extends "cvkbrnobase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Jdu na vodu {% endblock %}

rowers/c2stuff.py

@@ -773,14 +773,12 @@ def createc2workoutdata(w):
     if workouttype in otwtypes:
         workouttype = 'water'
 
-    try:
-        startdatetime = w.startdatetime.isoformat()
-    except AttributeError:
-        startdate = datetime.datetime.combine(w.date,datetime.time())
+
+    wendtime = w.startdatetime-datetime.timedelta(seconds=makeseconds(durationstr))
 
     data = {
         "type": mytypes.c2mapping[workouttype],
-        "date": w.startdatetime.isoformat(),
+        "date": wendtime.strftime('%Y-%m-%d %H:%M:%S'), #w.startdatetime.isoformat(),
         "stroke_count": int(row.stroke_count),
         "timezone": w.timezone,
         "distance": int(w.distance),

rowers/dataprep.py

@@ -1858,7 +1858,6 @@ def parsenonpainsled(fileformat,f2,summary,startdatetime='',empowerfirmware=None
         if fileformat == 'nklinklogbook' and empowerfirmware is not None:
             if inboard is not None and oarlength is not None:
                 row = NKLiNKLogbookParser(f2,firmware=empowerfirmware,inboard=inboard,oarlength=oarlength)
-                print(row,'aap')
             else:
                 row = NKLiNKLogbookParser(f2)
         else:
@@ -3038,7 +3037,6 @@ def dataprep(rowdatadf, id=0, bands=True, barchart=True, otwpower=True,
         df = dd.from_pandas(data,npartitions=1)
         df.to_parquet(filename,engine='fastparquet',compression='GZIP')
 
-
     return data
 
 

rowers/dataprepnodjango.py

@@ -754,9 +754,6 @@ def dataprep(rowdatadf,id=0,bands=True,barchart=True,otwpower=True,
             print("empty")
         return 0
 
-    if debug:
-        print("dataprep",id)
-
     # rowdatadf.set_index([range(len(rowdatadf))],inplace=True)
     t = rowdatadf.loc[:,'TimeStamp (sec)']
     t = pd.Series(t-rowdatadf.loc[:,'TimeStamp (sec)'].iloc[0])

rowers/nkstuff.py

@@ -210,7 +210,7 @@ def rower_nk_token_refresh(user):
 def make_authorization_url(request):
     return imports_make_authorization_url(oauth_data)
 
-def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
+def get_nk_workout_list(user,fake=False,after=0,before=0):
     r = Rower.objects.get(user=user)
 
     if (r.nktoken == '') or (r.nktoken is None):
@@ -221,12 +221,12 @@ def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
         return custom_exception_handler(401,s)
     else:
         # ready to fetch. Hurray
-        if not endTime:
-            endTime = int(arrow.now().timestamp())*1000
-            endTime = str(endTime)
-        if not startTime:
-            startTime = arrow.now()-timedelta(days=30)
-            startTime = str(int(startTime.timestamp())*1000)
+        if not before:
+            before = arrow.now()+timedelta(days=1)
+            before = str(int(before.timestamp())*1000)
+        if not after:
+            after = arrow.now()-timedelta(days=30)
+            after = str(int(after.timestamp())*1000)
         authorizationstring = str('Bearer ' + r.nktoken)
         headers = {'Authorization': authorizationstring,
                    'user-agent': 'sanderroosendaal',
@@ -236,8 +236,8 @@ def get_nk_workout_list(user,fake=False,startTime=0,endTime=0):
         url = NK_API_LOCATION+"api/v1/sessions"
 
         params = {
-            'startTime':startTime,
-            'endTime':endTime,
+            'after':after,
+            'before':before,
         } # start / end time
 
         s = requests.get(url,headers=headers,params=params)
@@ -260,6 +260,7 @@ def get_workout(user,nkid):
         'sessionIds': nkid,
     }
 
+
     authorizationstring = str('Bearer ' + r.nktoken)
     headers = {'Authorization': authorizationstring,
                'user-agent': 'sanderroosendaal',
@@ -270,7 +271,6 @@ def get_workout(user,nkid):
     url = NK_API_LOCATION+"api/v1/sessions/strokes"
     response = requests.get(url,headers=headers,params=params)
 
-
     if response.status_code != 200:
         # error handling and logging
         return {},pd.DataFrame()
@@ -287,8 +287,8 @@ def get_workout(user,nkid):
 
     url = NK_API_LOCATION+"api/v1/sessions/"
     params = {
-        'startTime':timestampbegin-1,
-        'endTime': timestampend+1,
+        'after':timestampbegin-1,
+        'before': timestampend+1,
     }
 
     response = requests.get(url, headers=headers,params=params)
@@ -303,4 +303,5 @@ def get_workout(user,nkid):
         if str(w['id']) == str(nkid):
             workoutdata = w
 
+
     return workoutdata, df

rowers/tasks.py

@@ -2040,12 +2040,12 @@ def handle_otwsetpower(self,f1, boattype, boatclass, coastalbrand, weightvalue,
 
     # do something with boat type
     try:
-        rowdata = rdata(csvfile)
+        rowdata = rdata(csvfile=csvfile)
     except IOError:
         try:
-            rowdata = rdata(csvfile)
+            rowdata = rdata(csvfile=csvfile)
         except IOError:
-            rowdata = rdata(csvfile)
+            rowdata = rdata(csvfile=csvfile)
 
     # do calculation, but do not overwrite NK Empower Power data
     powermeasured = False
@@ -2097,12 +2097,12 @@ def handle_otwsetpower(self,f1, boattype, boatclass, coastalbrand, weightvalue,
             return 0
         # do something with boat type
         try:
-            rowdata = rdata(csvfile)
+            rowdata = rdata(csvfile=csvfile)
         except IOError:
             try:
-                rowdata = rdata(csvfile)
+                rowdata = rdata(csvfile=csvfile)
             except IOError:
-                rowdata = rdata(csvfile)
+                rowdata = rdata(csvfile=csvfile)
 
     update_strokedata(workoutid, rowdata.df, debug=debug)
 
@@ -2205,6 +2205,7 @@ def cp_from_workoutids(workoutids,debug=False):
     if len(data)>1:
         df = pd.concat(data,axis=0)
 
+
     df = df[df['cp'] == df.groupby(['delta'])['cp'].transform('max')]
     df = df.sort_values(['delta']).reset_index()
 
@@ -2250,6 +2251,7 @@ def cp_from_workoutids(workoutids,debug=False):
 
     power2k = fitfunc(p1,t3)
 
+
     return powerfourmin,power2k,powerhour
 
 
@@ -2818,6 +2820,7 @@ def handle_setcp(strokesdf,filename,workoutid,debug=False,**kwargs):
     except FileNotFoundError:
         pass
     if not strokesdf.empty:
+
         try:
             totaltime = strokesdf['time'].max()
         except KeyError:
@@ -2827,6 +2830,7 @@ def handle_setcp(strokesdf,filename,workoutid,debug=False,**kwargs):
         except KeyError:
             powermean = 0
 
+
         if powermean != 0:
             thesecs = totaltime
             maxt = 1.05 * thesecs

rowers/templates/add_instantplan.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Add Instant Plan{% endblock %}

rowers/templates/add_result.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
  
 {% block title %}Here's your result{% endblock %}
  

rowers/templates/agegroupchart.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Age Group Records{% endblock %}

rowers/templates/agegroupcp.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Age Group CP{% endblock %}

rowers/templates/alert_create.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Metric Alert{% endblock %}
 

rowers/templates/alert_delete_confirm.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Planned Session{% endblock %}
 

rowers/templates/alert_edit.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}Metric Alert{% endblock %}
 

rowers/templates/alert_stats.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Metric Alert{% endblock %}

rowers/templates/alerts.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}

rowers/templates/analysis.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}

rowers/templates/async_tasks.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Tasks {% endblock %}

rowers/templates/boxplot.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Box Plot {% endblock %}

rowers/templates/c2_list_import.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}

rowers/templates/c2_list_import2.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}

rowers/templates/cn_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 
 {% block title %}CrewNerd Summary loading{% endblock %}
 

rowers/templates/comparison_list.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}

rowers/templates/course_edit_view.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 

rowers/templates/course_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}

rowers/templates/course_form_update.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}

rowers/templates/course_replace.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 

rowers/templates/course_replace_confirm.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 

rowers/templates/course_view.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 

rowers/templates/coursemap.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}
 

rowers/templates/cum_flex.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}

rowers/templates/cumstats.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}

rowers/templates/dashboard.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 

rowers/templates/disqualification_view.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block scripts %}
 {% include "monitorjobs.html" %}

rowers/templates/document_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}

rowers/templates/dropathleteconfirm.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Remove Athlete {% endblock %}

rowers/templates/dropcoachconfirm.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Remove Coach {% endblock %}

rowers/templates/embedded_video.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load i18n %}
 {% load leaflet_tags %}

rowers/templates/embedded_video_mini.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load i18n %}
 {% load leaflet_tags %}

rowers/templates/empower_fix.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Empower FIX{% endblock %}

rowers/templates/entryedit.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Register for a Virtual Race{% endblock %}

rowers/templates/export.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Export {% endblock %}

rowers/templates/export_workouts.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Workouts Summary Export{% endblock %}

rowers/templates/failed_jobs.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Failed Que{% endblock %}

rowers/templates/fastestvirtualeventcreate.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}

rowers/templates/fitnessfit.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Fitness Progress {% endblock %}

rowers/templates/fitnessmetric.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Fitness Progress {% endblock %}

rowers/templates/flexchart3otw.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

rowers/templates/flexchartstacked.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

rowers/templates/followerform.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

rowers/templates/forcecurve_single.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

rowers/templates/freecoach_registration_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% block title %}New Coach Registration{% endblock title %}
 {% block meta %}

rowers/templates/frontpage.html

@@ -1,5 +1,5 @@
 {% extends "newbasefront.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Rowing Data{% endblock %}

rowers/templates/frontpageblogs.html

@@ -1,4 +1,4 @@
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% for blog in blogposts %}

rowers/templates/fusion.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}

rowers/templates/fusion_list.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Workouts{% endblock %}

rowers/templates/gdpr_optin.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}GDPR Opt-In{% endblock %}

rowers/templates/goldmedalscores.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Gold Medal Score {% endblock %}

rowers/templates/graphimage_delete_confirm.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Delete Graph Image {% endblock %}

rowers/templates/help.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block main %}

rowers/templates/histo.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}

rowers/templates/histo_single.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}View Workout {% endblock %}

rowers/templates/history.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall {% endblock %}

rowers/templates/image_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}

rowers/templates/image_page.html

@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% load staticfiles %}
+{% load static %}
  
 {% block title %}Here's your plot{% endblock %}
  

rowers/templates/indoorvirtualeventcreate.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}New Virtual Challenge{% endblock %}

rowers/templates/instantplan.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}{{ plan.name }}{% endblock %}

rowers/templates/instantplans.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Training Plans{% endblock %}

rowers/templates/instroke.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Advanced Features {% endblock %}

rowers/templates/laboratory.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall - Analysis {% endblock %}

rowers/templates/list_courses.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Courses List{% endblock %}

rowers/templates/list_graphs.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Recent Graphs{% endblock %}

rowers/templates/list_standards.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Course Standards List{% endblock %}

rowers/templates/list_videos.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Recent Video Analyses{% endblock %}

rowers/templates/list_workouts.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}Rowsandall Workouts List{% endblock %}

rowers/templates/logo_form.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 
 {% block title %}File loading{% endblock %}

rowers/templates/manualadd.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load tz %}
 

rowers/templates/map_view.html

@@ -1,5 +1,5 @@
 {% extends "newbase.html" %}
-{% load staticfiles %}
+{% load static %}
 {% load rowerfilters %}
 {% load leaflet_tags %}