From be26c732ce79e8672bf2357716932ea622f3494f Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Wed, 14 Mar 2018 10:54:55 +0100
Subject: [PATCH] improved date processing for otwranking

---
 rowers/.#views.py |  1 -
 rowers/views.py   | 34 +++++++++++++++++++++++++++++-----
 2 files changed, 29 insertions(+), 6 deletions(-)
 delete mode 100644 rowers/.#views.py

diff --git a/rowers/.#views.py b/rowers/.#views.py
deleted file mode 100644
index 1ebe0eda..00000000
--- a/rowers/.#views.py
+++ /dev/null
@@ -1 +0,0 @@
-e408191@CZ27LT9RCGN72.29296:1520959583
\ No newline at end of file
diff --git a/rowers/views.py b/rowers/views.py
index 3969cd93..f5f6e16d 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -4194,10 +4194,23 @@ def otwrankings_view(request,theuser=0,
 	startdate = enddate-datetime.timedelta(days=int(deltadays))
 
     if startdatestring != "":
-	startdate = iso8601.parse_date(startdatestring)
+        try:
+	    startdate = iso8601.parse_date(startdatestring)
+        except ParseError:
+            pass
 
     if enddatestring != "":
-	enddate = iso8601.parse_date(enddatestring)
+        try:
+	    enddate = iso8601.parse_date(enddatestring)
+        except ParseError:
+            pass
+
+    if 'startdate' in request.session:
+        startdate = iso8601.parse_date(request.session['startdate'])
+
+
+    if 'enddate' in request.session:
+        enddate = iso8601.parse_date(request.session['enddate'])
 
     if enddate < startdate:
 	s = enddate
@@ -4243,7 +4256,10 @@ def otwrankings_view(request,theuser=0,
 		    'enddate': enddate,
 		    })
             else:
-                dateform = DateRangeForm()
+	        dateform = DateRangeForm(initial={
+	            'startdate': startdate,
+	            'enddate': enddate,
+	        })
                 deltaform = DeltaDaysForm()
 
     else:
@@ -4418,6 +4434,11 @@ def otwrankings_view(request,theuser=0,
 
     del form.fields["pieceunit"]
 
+    startdatestring = startdate.strftime('%Y-%m-%d')
+    enddatestring = enddate.strftime('%Y-%m-%d')
+    request.session['startdate'] = startdatestring
+    request.session['enddate'] = enddatestring
+
     messages.error(request,message)
     return render(request, 'otwrankings.html',
 		  {'rankingworkouts':theworkouts,
@@ -4435,6 +4456,7 @@ def otwrankings_view(request,theuser=0,
                    'teams':get_my_teams(request.user),
                    'workouttype':'water',
 		   })
+
 # Show ranking distances including predicted paces
 @user_passes_test(ispromember,login_url="/",redirect_field_name=None)
 def oterankings_view(request,theuser=0,
@@ -4510,11 +4532,13 @@ def oterankings_view(request,theuser=0,
 		    'enddate': enddate,
 		    })
             else:
-                dateform = DateRangeForm()
+	        dateform = DateRangeForm(initial={
+	            'startdate': startdate,
+	            'enddate': enddate,
+	        })
                 deltaform = DeltaDaysForm()
 
     else:
-        print 'aap',startdate
 	dateform = DateRangeForm(initial={
 	    'startdate': startdate,
 	    'enddate': enddate,