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

Merge tag 'v5.5' into develop

Browse Source 
release
This commit is contained in:
Sander Roosendaal
2018-01-12 08:50:21 +01:00
parent 22eb1c0f9a 1dd9e9617c
commit ecea34c094
2 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
rowers/models.py
View File

@@ -1238,38 +1238,59 @@ class RowerForm(ModelForm):
try:
rest = self.cleaned_data['rest']
except:
rest = int(self.data['rest'])
try:
rest = int(self.data['rest'])
except ValueError:
rest = 0
try:
ut2 = self.cleaned_data['ut2']
except:
ut2 = self.data['ut2']
try:
ut2 = self.data['ut2']
except ValueError:
ut2 = 0
try:
ut1 = self.cleaned_data['ut1']
except:
ut1 = self.data['ut1']
try:
ut1 = self.data['ut1']
except ValueError:
ut1 = 0
try:
at = self.cleaned_data['at']
except:
at = self.data['at']
try:
at = self.data['at']
except ValueError:
at = 0
try:
an = self.cleaned_data['an']
except:
an = self.data['an']
try:
an = self.data['an']
except ValueError:
an = 0
try:
tr = self.cleaned_data['tr']
except:
tr = self.data['tr']
try:
tr = self.data['tr']
except ValueError:
tr = 0
try:
max = self.cleaned_data['max']
except:
max = self.data['max']
try:
max = self.data['max']
except ValueError:
max = 0
if rest>=ut2:
raise forms.ValidationError("Resting heart rate should be lower than UT2")
if ut2>=ut1:

10
rowers/views.py
View File

@@ -4126,7 +4126,7 @@ def otwrankings_view(request,theuser=0,
request.session['async_tasks'] += [(job.id,'updatecpwater')]
except KeyError:
request.session['async_tasks'] = [(job.id,'updatecpwater')]
messages.info(request,'New calculation queued. Refresh page or resubmit the date form to get the result')
messages.info(request,'New calculation queued. Page will reload automatically. You can check the status of your calculations <a href="/rowers/jobs-status/" target="_blank">here</a>')
powerdf = pd.DataFrame({
'Delta':delta,
@@ -4134,7 +4134,7 @@ def otwrankings_view(request,theuser=0,
})
if powerdf.empty:
messages.info(request,'Your calculations are running in the background. Please reload this page.')
messages.info(request,'Your calculations are running in the background. Page will reload automatically. You can check the status of your calculations <a href="/rowers/jobs-status/" target="_blank">here</a>')
powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True)
@@ -4377,7 +4377,7 @@ def oterankings_view(request,theuser=0,
request.session['async_tasks'] += [(job.id,'updatecp')]
except KeyError:
request.session['async_tasks'] = [(job.id,'updatecp')]
messages.info(request,'New calculation queued.')
messages.info(request,'New calculation queued. Page will reload automatically. You can check the status of your calculations <a href="/rowers/jobs-status/" target="_blank">here</a>')
powerdf = pd.DataFrame({
'Delta':delta,
@@ -4385,7 +4385,7 @@ def oterankings_view(request,theuser=0,
})
if powerdf.empty:
messages.info(request,'Your calculations are running in the background. Please reload this page.')
messages.info(request,'Your calculations are running in the background. Page will reload automatically. You can check the status of your calculations <a href="/rowers/jobs-status/" target="_blank">here</a>')
powerdf = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True)
@@ -6878,7 +6878,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
except KeyError:
request.session['async_tasks'] = [(job.id,'otwsetpower')]
successmessage = 'Your calculations have been submitted. You will receive an email when they are done. You can check the status of your calculations <a href="/rowers/jobs-status/">here</a>'
successmessage = 'Your calculations have been submitted. You will receive an email when they are done. You can check the status of your calculations <a href="/rowers/jobs-status/" target="_blank">here</a>'
messages.info(request,successmessage)
kwargs = {
'id':int(id)}