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

added messaging on tasks status

Browse Source
This commit is contained in:
Sander Roosendaal
2018-01-10 20:30:43 +01:00
parent d0455a97c0
commit e8ca3abe20
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rowers/views.py
View File

@@ -4126,7 +4126,7 @@ def otwrankings_view(request,theuser=0,
request.session['async_tasks'] += [(job.id,'updatecpwater')] request.session['async_tasks'] += [(job.id,'updatecpwater')]
except KeyError: except KeyError:
request.session['async_tasks'] = [(job.id,'updatecpwater')] 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({ powerdf = pd.DataFrame({
'Delta':delta, 'Delta':delta,
@@ -4134,7 +4134,7 @@ def otwrankings_view(request,theuser=0,
}) })
if powerdf.empty: 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 = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True) powerdf.dropna(axis=0,inplace=True)
@@ -4377,7 +4377,7 @@ def oterankings_view(request,theuser=0,
request.session['async_tasks'] += [(job.id,'updatecp')] request.session['async_tasks'] += [(job.id,'updatecp')]
except KeyError: except KeyError:
request.session['async_tasks'] = [(job.id,'updatecp')] 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({ powerdf = pd.DataFrame({
'Delta':delta, 'Delta':delta,
@@ -4385,7 +4385,7 @@ def oterankings_view(request,theuser=0,
}) })
if powerdf.empty: 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 = powerdf[powerdf['CP']>0]
powerdf.dropna(axis=0,inplace=True) powerdf.dropna(axis=0,inplace=True)
@@ -6878,7 +6878,7 @@ def workout_otwsetpower_view(request,id=0,message="",successmessage=""):
except KeyError: except KeyError:
request.session['async_tasks'] = [(job.id,'otwsetpower')] 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) messages.info(request,successmessage)
kwargs = { kwargs = {
'id':int(id)} 'id':int(id)}