From 1180b72edcd5e0fec5efbc6f3bd00fdccef68a3b Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Mon, 9 Sep 2019 17:05:51 +0200
Subject: [PATCH] solves #502 fixed

---
 rowers/dataprep.py           |  5 +++--
 rowers/forms.py              |  2 +-
 rowers/urls.py               |  4 ++--
 rowers/views/workoutviews.py | 19 ++++++++++++++++---
 4 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 6101fcde..fdc6d471 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1123,7 +1123,6 @@ def save_workout_database(f2, r, dosmooth=True, workouttype='rower',
                 inboard=inboard, oarlength=oarlength,
                 timezone=timezone_str,
                 privacy=privacy)
-
     try:
         w.save()
     except ValidationError:
@@ -1298,6 +1297,7 @@ def new_workout_from_file(r, f2,
                           makeprivate=False,
                           notes=''):
     message = None
+    print('noot',notes)
     try:
         fileformat = get_file_type(f2)
     except (IOError,UnicodeDecodeError):
@@ -1391,9 +1391,10 @@ def new_workout_from_file(r, f2,
 
     if workoutsource is None:
         workoutsource = fileformat
-    
+        
     id, message = save_workout_database(
         f2, r,
+        notes=notes,
         workouttype=workouttype,
         weightcategory=r.weightcategory,
         adaptiveclass=r.adaptiveclass,
diff --git a/rowers/forms.py b/rowers/forms.py
index 18434a88..f07fd400 100644
--- a/rowers/forms.py
+++ b/rowers/forms.py
@@ -163,7 +163,7 @@ class DocumentsForm(forms.Form):
                                  label = "Boat Type")
 
 
-    notes = forms.CharField(required=False,
+    notes = forms.CharField(initial='these are notes',required=False,
                             widget=forms.Textarea)
 
     offline = forms.BooleanField(initial=False,required=False,
diff --git a/rowers/urls.py b/rowers/urls.py
index 1ad43ed7..4c6fbc50 100644
--- a/rowers/urls.py
+++ b/rowers/urls.py
@@ -384,8 +384,8 @@ urlpatterns = [
     re_path(r'^workout/(?P<pk>\d+)/delete/$',login_required(
         views.WorkoutDelete.as_view()),
         name='workout_delete'),
-    re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/delete/$',login_required(
-        views.workout_code_delete_view),name='workout_code_delete'),
+#    re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/delete/$',login_required(
+#        views.workout_code_delete_view),name='workout_code_delete'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/smoothenpace/$',views.workout_smoothenpace_view,name='workout_smoothenpace_view'),
     re_path(r'^workout/(?P<id>\b[0-9A-Fa-f]+\b)/undosmoothenpace/$',views.workout_undo_smoothenpace_view,name='workout_undo_smoothenpace_view'),
     re_path(r'^workout/c2import/$',views.workout_c2import_view,name='workout_c2import_view'),
diff --git a/rowers/views/workoutviews.py b/rowers/views/workoutviews.py
index 22901823..ac78ea5b 100644
--- a/rowers/views/workoutviews.py
+++ b/rowers/views/workoutviews.py
@@ -3981,6 +3981,8 @@ def workout_upload_view(request,
             notes = form.cleaned_data['notes']
             offline = form.cleaned_data['offline']
 
+            print('aap',form.cleaned_data)
+            
             race = None
             if optionsform.is_valid():
                 make_plot = optionsform.cleaned_data['make_plot']
@@ -4021,6 +4023,7 @@ def workout_upload_view(request,
             f2 = res[1] # file name incl media directory
 
             if not offline:
+                print('noot',notes)
                 id,message,f2 = dataprep.new_workout_from_file(
                     r,f2,
                     workouttype=workouttype,
@@ -4028,7 +4031,7 @@ def workout_upload_view(request,
                     boattype=boattype,
                     makeprivate=makeprivate,
                     title = t,
-                    notes=''
+                    notes=notes,
                 )
             else:
                 workoutsbox = Mailbox.objects.filter(name='workouts')[0]
@@ -5289,7 +5292,11 @@ class GraphDelete(DeleteView):
 def workout_code_delete_view(request,id=0):
     pk = encoder.decode_hex(id)
 
-    url = reverse('workout_delete',kwargs={'pk':pk})
+    try:
+        w = Workout.objects.get(pk=pk)
+        url = reverse('workout_delete',kwargs={'pk':pk})
+    except Workout.DoesNotExist:
+        url = reverse('workout_delete',kwargs={'pk':id})
 
     return HttpResponseRedirect(url)
     
@@ -5341,7 +5348,13 @@ class WorkoutDelete(DeleteView):
         return reverse('workouts_view')
 
     def get_object(self, *args, **kwargs):
-        obj = super(WorkoutDelete, self).get_object(*args, **kwargs)
+        workout_pk = self.kwargs['pk']
+        try:
+            obj = Workout.objects.get(pk=workout_pk)
+        except Workout.DoesNotExist:
+            workout_pk = encoder.decode_hex(workout_pk)
+            obj = Workout.objects.get(pk=workout_pk)
+            #        obj = super(WorkoutDelete, self).get_object(*args, **kwargs)
         if not checkaccessuser(self.request.user,obj.user):
             raise PermissionDenied('You are not allowed to delete this workout')