Course Times Standards CSV v1 working

rowers/views/racesviews.py

@@ -5,6 +5,7 @@ from __future__ import unicode_literals
 
 from rowers.views.statements import *
 from rowsandall_app.settings import SITE_URL
+from rowers.scoring import *
 
 # List Courses
 def courses_view(request):
@@ -40,7 +41,6 @@ def standards_view(request):
     r = getrower(request.user)
 
     standards = StandardCollection.objects.all().order_by("name")
-    print(standards)
 
     # add search processing
     query = request.GET.get('q')
@@ -49,8 +49,6 @@ def standards_view(request):
         standards = StandardCollection.objects.filter(
             reduce(operator.and_,
                    (Q(name__icontains=q) for q in query_list)) |
-            reduce(operator.and_,
-                   (Q(country__icontains=q) for q in query_list)) |
             reduce(operator.and_,
                    (Q(notes__icontains=q) for q in query_list))
             )
@@ -58,7 +56,6 @@ def standards_view(request):
     else:
         searchform = SearchForm()
 
-    print(standards)
 
     return render(request,'list_standards.html',
                   {'standards':standards,
@@ -464,7 +461,7 @@ def virtualevent_uploadimage_view(request,id=0):
                   })
 
 
-# Image upload
+# Course upload
 @login_required()
 def course_upload_view(request):
     is_ajax = False
@@ -524,6 +521,66 @@ def course_upload_view(request):
         else:
             return {'result':0}
 
+# Standards upload
+@login_required()
+def standards_upload_view(request,id=0):
+    is_ajax = False
+    if request.is_ajax():
+        is_ajax = True
+        r = getrower(request.user)
+
+
+    if request.method == 'POST':
+        print(request.POST)
+        form = StandardsForm(request.POST,request.FILES)
+
+        if form.is_valid():
+            f = form.cleaned_data['file']
+            name = form.cleaned_data['name']
+            notes = form.cleaned_data['notes']
+            if f is not None:
+                filename,path_and_filename = handle_uploaded_file(f)
+
+                id = save_scoring(name,request.user,path_and_filename,notes=notes,id=id)
+                print(notes)
+
+                os.remove(path_and_filename)
+
+
+
+                if id==0:
+                    url = reverse(standards_view)
+                else:
+                    url = reverse(standard_view,kwargs={'id':id})
+
+                if is_ajax:
+                    return JSONResponse({'result':1,'url':url})
+
+                return HttpResponseRedirect(url)
+
+            else:
+                messages.error(request,'Something went wrong - no file attached')
+                url = reverse(standards_upload_view)
+                if is_ajax:
+                    return JSONResponse({'result':0,'url':0})
+
+                return HttpResponseRedirect(url)
+        else:
+            messages.error(request,'Form is not valid')
+            print(form.errors)
+            return render(request,'standard_form.html',
+                          {'form':form,
+                           })
+
+    else:
+        if not is_ajax:
+            form = StandardsForm()
+            return render(request,'standard_form.html',
+                          {'form':form,
+                           'active':'nav-racing',
+                           })
+        return {'result':0}
+
 
 def virtualevents_view(request):
     is_ajax = False

rowers/views/statements.py

@@ -93,7 +93,7 @@ from rowers.forms import (
     FitnessMetricForm,PredictedPieceFormNoDistance,
     EmailForm, RegistrationForm, RegistrationFormTermsOfService,
     RegistrationFormUniqueEmail,RegistrationFormSex,
-    CNsummaryForm,UpdateWindForm,
+    CNsummaryForm,UpdateWindForm,StandardsForm,
     UpdateStreamForm,WorkoutMultipleCompareForm,ChartParamChoiceForm,
     FusionMetricChoiceForm,BoxPlotChoiceForm,MultiFlexChoiceForm,
     TrendFlexModalForm,WorkoutSplitForm,WorkoutJoinParamForm,