Merge branch 'feature/metar2' into develop

rowers/models.py

@@ -393,7 +393,7 @@ class Workout(models.Model):
     maxhr = models.IntegerField(blank=True,null=True)
     uploadedtostrava = models.IntegerField(default=0)
     uploadedtosporttracks = models.IntegerField(default=0)
-    notes = models.CharField(blank=True,null=True,max_length=200)
+    notes = models.CharField(blank=True,null=True,max_length=1000)
     summary = models.TextField(blank=True)
     privacy = models.CharField(default='visible',max_length=30,
                                choices=privacychoices)

rowers/tests.py

@@ -580,9 +580,7 @@ class ViewTest(TestCase):
         form = WorkoutForm(data=form_data)
         self.assertTrue(form.is_valid())
         response = self.c.post('/rowers/workout/1/edit', form_data, follow=True)
-	self.assertRedirects(response,
-                             expected_url='/rowers/workout/1/edit/s/Changes%20saved',
-			     status_code=302,target_status_code=200)
+	self.assertEqual(response.status_code, 200)
         
 
         w = Workout.objects.get(id=1)

rowers/views.py

@@ -357,7 +357,7 @@ def add_workout_from_strokedata(user,importid,data,strokedata,
 	except:
 	    title = 'Imported'
 
-    starttimeunix = mktime(rowdatetime.timetuple())
+    starttimeunix = mktime(rowdatetime.utctimetuple())
 
     res = make_cumvalues(0.1*strokedata['t'])
     cum_time = res[0]
@@ -521,7 +521,7 @@ def add_workout_from_stdata(user,importid,data):
     except:
 	title = "Imported data"
 
-    starttimeunix = mktime(rowdatetime.timetuple())
+    starttimeunix = mktime(rowdatetime.utctimetuple())
 
     res = splitstdata(data['distance'])
 
@@ -2469,7 +2469,7 @@ def workout_downloadwind_view(request,id=0,
 	avgtime = int(rowdata.df['TimeStamp (sec)'].mean()-rowdata.df.ix[0,'TimeStamp (sec)'])
 	startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
 							      row.starttime))
-	
+	
 	starttimeunix = int(mktime(startdatetime.utctimetuple()))
 	avgtime = starttimeunix+avgtime
 	winddata = get_wind_data(avglat,avglon,avgtime)
@@ -2533,7 +2533,7 @@ def workout_downloadmetar_view(request,id=0,
 	avgtime = int(rowdata.df['TimeStamp (sec)'].mean()-rowdata.df.ix[0,'TimeStamp (sec)'])
 	startdatetime = dateutil.parser.parse("{}, {}".format(row.date,
 							      row.starttime))
-	
+	
 	starttimeunix = int(mktime(startdatetime.utctimetuple()))
 	avgtime = starttimeunix+avgtime
 	winddata = get_metar_data(airportcode,avgtime)
@@ -3597,6 +3597,12 @@ def workout_comment_view(request,id=0):
 @login_required()
 def workout_edit_view(request,id=0,message="",successmessage=""):
     request.session[translation.LANGUAGE_SESSION_KEY] = USER_LANGUAGE
+
+    try:
+	# check if valid ID exists (workout exists)
+	row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        raise Http404("Workout doesn't exist")
 
     if request.method == 'POST':
 	# Form was submitted
@@ -3621,9 +3627,6 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
 	    startdatetime = (str(date) + ' ' + str(starttime))
 	    startdatetime = datetime.datetime.strptime(startdatetime,
 						       "%Y-%m-%d %H:%M:%S")
-	    startdatetime = timezone.make_aware(startdatetime)
-	    try:
-		# check if valid ID exists (workout exists)
 	    startdatetime = timezone.make_aware(startdatetime)
             # check if user is owner of this workout
             if checkworkoutuser(request.user,row):
@@ -3658,39 +3661,22 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
                 message = "You are not allowed to change this workout"
                 url = reverse(workouts_view,args=[str(message)])
 
-		    response = HttpResponseRedirect(url)
-	    except Workout.DoesNotExist:
-		# create new workout
-		r = Rower.objects.get(user=request.user)
-		w = Workout(name=name,date=date,workouttype=workouttype,
-			    user=r)
-		w.save()
-		successmessage = "New Workout Created"
-		url = reverse(workouts_view,
-			      kwargs = {
-				  'successmessage':str(successmessage),
                 response = HttpResponseRedirect(url)
-
-		response = HttpResponseRedirect(url)
-	else:
-	    message = "Invalid Form"
-	    url = reverse(workouts_view,args=[str(message)])
+
+    else: # form not POSTed
+        form = WorkoutForm(instance=row)
 
-
-	return response
 
     try:
-	    row = Workout.objects.get(id=id)
+	row = Workout.objects.get(id=id)
+    except Workout.DoesNotExist:
+        raise Http404("Workout doesn't exist")
 
     g = GraphImage.objects.filter(workout=row).order_by("-creationdatetime")
     # check if user is owner of this workout
 
-	    if (checkworkoutuser(request.user,row)==False):
-		message = "You are not allowed to edit this workout"
+    if (checkworkoutuser(request.user,row)==False):
         raise Http404("You are not allowed to edit this workout")
-
-		return HttpResponseRedirect(url)
-
 
     # create interactive plot
     f1 = row.csvfilename
@@ -3745,12 +3731,6 @@ def workout_edit_view(request,id=0,message="",successmessage=""):
                        'gmdiv': gmdiv,
                        })
 
-
-	except Workout.DoesNotExist:
-            message = "workout doesn't exist"
-            url = reverse(workouts_view,
-			  kwargs = {
-			      'message': str(message)
 
     return HttpResponseRedirect(url)
 

rowers/weather.py

@@ -60,8 +60,6 @@ def get_metar_data(airportcode,unixtime):
             return [0,0,message,'',timestamp]
 
 
-        print temp_c,wind_dir,wind_speed
-        
         windbearing = float(wind_dir)
         wind_knots = float(wind_speed)
         wind_ms = 0.514444*wind_knots