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

fx

Browse Source
This commit is contained in:
Sander Roosendaal
2022-02-15 14:06:45 +01:00
parent 3d0d7c6e7e
commit 38a10a4a90
4 changed files with 179 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
rowers/views/userviews.py
View File

@@ -106,9 +106,9 @@ def remove_user(request):
PlannedSession.objects.filter(manager=user).delete()
user.delete()
res = myqueue(queuehigh,
handle_sendemail_userdeleted,
name, email)
_ = myqueue(queuehigh,
handle_sendemail_userdeleted,
name, email)
url = '/logout/?next=/login'
# url = reverse(auth_views.logout_then_login)
@@ -128,7 +128,6 @@ def survey(request): # pragma: no cover
surveyform = SurveyForm()
if request.method == 'POST':
form = SurveyForm(request.POST)
r.surveydone = True
r.surveydonedate = timezone.now()
r.save()
@@ -221,7 +220,6 @@ def start_plantrial_view(request):
@permission_required('rower.is_coach', fn=get_user_by_userid, raise_exception=True)
def rower_favoritecharts_view(request, userid=0):
message = ''
successmessage = ''
r = getrequestrowercoachee(request, userid=userid, notpermanent=True)
staticchartform = StaticChartRowerForm(instance=r)
@@ -304,7 +302,6 @@ def rower_favoritecharts_view(request, userid=0):
with transaction.atomic():
FavoriteChart.objects.filter(user=r).delete()
FavoriteChart.objects.bulk_create(new_instances)
successmessage = "You have updated your favorites"
messages.info(request, message)
if len(new_instances) == 0:
FavoriteChartFormSet = formset_factory(
@@ -352,13 +349,14 @@ def rower_exportsettings_view(request, userid=0):
cd = form.cleaned_data
if r.rowerplan == 'basic': # pragma: no cover
messages.error(
request, 'These settings can only be set if you are a user on one of the <a href="/rowers/paidplans">paid plans</a>.')
request, 'These settings can only be set if you are a user" \
" on one of the <a href="/rowers/paidplans">paid plans</a>.')
for attr, value in cd.items():
doset = True
try:
tokenname = attrtokens[attr]
if getattr(r, tokenname) == '' or getattr(r, tokenname) == None:
if getattr(r, tokenname) == '' or getattr(r, tokenname) is None:
doset = False
except KeyError:
doset = True
@@ -519,8 +517,6 @@ def rower_edit_view(request, rowerid=0, userid=0, message=""):
def rower_prefs_view(request, userid=0, message=""):
r = getrequestrowercoachee(request, userid=userid, notpermanent=True)
rowerid = r.id
breadcrumbs = [
{
'url': '/rowers/me/edit/',
@@ -636,8 +632,8 @@ def rower_prefs_view(request, userid=0, message=""):
r.kfatigue = kfatigue
r.save()
messages.info(request, 'Updated CP range and time decay constants')
success = dataprep.update_rolling_cp(r, mytypes.otwtypes, 'water')
success = dataprep.update_rolling_cp(r, mytypes.otetypes, 'erg')
_ = dataprep.update_rolling_cp(r, mytypes.otwtypes, 'water')
_ = dataprep.update_rolling_cp(r, mytypes.otetypes, 'erg')
return render(request, 'rower_preferences.html',
{
@@ -665,10 +661,10 @@ def rower_revokeapp_view(request, id=0): # pragma: no cover
for token in refreshtokens:
token.revoke()
r = getrower(request.user)
form = RowerForm(instance=r)
powerform = RowerPowerForm(instance=r)
grants = AccessToken.objects.filter(user=request.user)
# r = getrower(request.user)
# form = RowerForm(instance=r)
# powerform = RowerPowerForm(instance=r)
# grants = AccessToken.objects.filter(user=request.user)
url = reverse('rower_edit_view')
return HttpResponseRedirect(url)
except AccessToken.DoesNotExist:
@@ -749,7 +745,9 @@ def rower_update_empower_view(
except KeyError:
request.session['async_tasks'] = [(job.id, 'update_empower')]
successmessage = 'Your workouts are being updated in the background. You will receive email when this is done. You can check the status of your calculations <a href="/rowers/jobs-status" target="_blank">here</a>'
successmessage = 'Your workouts are being updated in the background." \
" You will receive email when this is done. You can check the status" \
" of your calculations <a href="/rowers/jobs-status" target="_blank">here</a>'
messages.info(request, successmessage)