From 5004d5d2b769af3da293568af5037c9f38f85716 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 30 Apr 2018 17:03:35 +0200
Subject: [PATCH] made rower selection more persistent

---
 rowers/views.py | 77 ++++++++++++++++++++++++++++++++-----------------
 1 file changed, 50 insertions(+), 27 deletions(-)

diff --git a/rowers/views.py b/rowers/views.py
index d202dc58..ccb2b10c 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -1090,8 +1090,8 @@ def start_plantrial_view(request):
 
     messages.info(request,'We have started your 14 day trial period')
     
-    subject2 = "User started Pro Trial"
-    message2 = "User Started Pro Trial.\n"
+    subject2 = "User started Plan Trial"
+    message2 = "User Started Plan Trial.\n"
     message2 += request.user.email + "\n"
     message2 += "User name: "+request.user.username
     
@@ -2980,7 +2980,15 @@ def cum_flex(request,theuser=0,
 
     promember=0
     if theuser == 0:
-	theuser = request.user.id
+        if 'rowerid' in request.session:
+            try:
+                r = Rower.objects.get(id=request.session['rowerid'])
+                theuser = r.user.id
+            except Rower.DoesNotExist:
+                theuser = request.user.id
+        else:
+	    theuser = request.user.id
+
 
     if not request.user.is_anonymous():
 	r = getrower(request.user)
@@ -3133,11 +3141,9 @@ def cum_flex(request,theuser=0,
 def fitnessmetric_view(request,id=0,mode='rower',
                        startdate=timezone.now()-timezone.timedelta(days=365),
                        enddate=timezone.now()):
-    if id==0:
-        id = request.user.id
 
-    theuser = User.objects.get(id=id)
-    therower = Rower.objects.get(user=theuser)
+    therower = getrequestrower(request,userid=id)
+    theuser = therower.user
 
 
     if request.method == 'POST':
@@ -3303,8 +3309,9 @@ def histo(request,theuser=0,
 	startdate = s
 
     promember=0
-    if theuser == 0:
-	theuser = request.user.id
+    r = getrequestrower(request,userid=theuser)
+    theuser = r.user.id
+
 
     if not request.user.is_anonymous():
 	r = getrower(request.user)
@@ -4376,7 +4383,14 @@ def otwrankings_view(request,theuser=0,
 	startdate = s
 
     if theuser == 0:
-	theuser = request.user.id
+        if 'rowerid' in request.session:
+            try:
+                r = Rower.objects.get(id=request.session['rowerid'])
+                theuser = r.user.id
+            except Rower.DoesNotExist:
+                theuser = request.user.id
+        else:
+	    theuser = request.user.id
 
     promember=0
     if not request.user.is_anonymous():
@@ -4430,6 +4444,7 @@ def otwrankings_view(request,theuser=0,
     # get all 2k (if any) - this rower, in date range
     try:
 	r = Rower.objects.get(user=theuser)
+        request.session['rowerid'] = r.id
     except Rower.DoesNotExist:
 	raise Http404("Rower doesn't exist")
 	
@@ -4652,7 +4667,15 @@ def oterankings_view(request,theuser=0,
 	startdate = s
 
     if theuser == 0:
-	theuser = request.user.id
+        if 'rowerid' in request.session:
+            try:
+                r = Rower.objects.get(id=request.session['rowerid'])
+                theuser = r.user.id
+            except Rower.DoesNotExist:
+                theuser = request.user.id
+        else:
+	    theuser = request.user.id
+
 
     promember=0
     if not request.user.is_anonymous():
@@ -4706,6 +4729,7 @@ def oterankings_view(request,theuser=0,
     # get all 2k (if any) - this rower, in date range
     try:
 	r = Rower.objects.get(user=theuser)
+        request.session['rowerid'] = r.id
     except Rower.DoesNotExist:
 	allergworkouts = []
         raise Http404("Rower doesn't exist")
@@ -5523,13 +5547,8 @@ def user_multiflex_select(request,
                           enddate=timezone.now(),
                           userid=0):
 
-    if userid == 0:
-        user = request.user
-    else:
-        user = User.objects.get(id=userid)
-        
-
-    r = getrower(user)
+    r = getrequestrower(request,userid=userid)
+    user = r.user
     
     if 'options' in request.session:
         options = request.session['options']
@@ -6062,13 +6081,8 @@ def user_boxplot_select(request,
                         },
                         userid=0):
 
-    if userid == 0:
-        user = request.user
-    else:
-        user = User.objects.get(id=userid)
-        
-
-    r = getrower(user)
+    r = getrequestrower(request,userid=userid)
+    user = r.user
     
     if 'options' in request.session:
         options = request.session['options']
@@ -7592,7 +7606,15 @@ def cumstats(request,theuser=0,
 
     promember=0
     if theuser == 0:
-	theuser = request.user.id
+        if 'rowerid' in request.session:
+            try:
+                r = Rower.objects.get(id=request.session['rowerid'])
+                theuser = r.user.id
+            except Rower.DoesNotExist:
+                theuser = request.user.id
+        else:
+	    theuser = request.user.id
+
 
     if not request.user.is_anonymous():
 	r = getrower(request.user)
@@ -7716,7 +7738,8 @@ def cumstats(request,theuser=0,
     datadf,extracols = dataprep.read_cols_df_sql(ids,fieldlist)
 
     datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
-    
+
+    request.session['rowerid'] = r.id
     
     if datadf.empty:
         stats = {}