diff --git a/2a1bfe9f-acd8-4fbc-9b75-8caf203e4fcf.gpx b/2a1bfe9f-acd8-4fbc-9b75-8caf203e4fcf.gpx new file mode 100644 index 00000000..462f2508 --- /dev/null +++ b/2a1bfe9f-acd8-4fbc-9b75-8caf203e4fcf.gpx @@ -0,0 +1,574 @@ +Garmin InternationalExport by rowingdata + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/rowers/tests/test_plans.py b/rowers/tests/test_plans.py index 52006a29..6b818c3d 100644 --- a/rowers/tests/test_plans.py +++ b/rowers/tests/test_plans.py @@ -1349,11 +1349,15 @@ class PlannedSessionsView(TestCase): response = self.c.get(url) self.assertEqual(response.status_code,200) + s = self.w1.startdatetime.date().strftime("%Y-%m-%d") + e = (self.w1.startdatetime+datetime.timedelta(days=5)).date().strftime("%Y-%m-%d") + p = self.w1.startdatetime.date().strftime("%Y-%m-%d") + form_data = { - 'team':[1], - 'startdate': self.w1.startdatetime.date(), - 'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date(), - 'preferreddate': self.w1.startdatetime.date(), + 'team':['1'], + 'startdate': s, + 'enddate': e, + 'preferreddate': p, 'name': faker.word(), 'sessiontype': 'session', 'sessionmode': 'distance', @@ -1362,9 +1366,28 @@ class PlannedSessionsView(TestCase): 'sessionunit': 'm', 'course': '', 'comment':faker.text(), - 'members': [self.r.id,self.r2.id] + 'members': ['{id1}'.format(id1=self.r.id)], + 'initial-startdate':s, + 'initial-enddate':e, + 'initial-preferreddate':p + } + + form = PlannedSessionForm(form_data,instance=self.ps_trimp) + if not form.is_valid(): + print form.errors + self.assertTrue(form.is_valid()) + + form = PlannedSessionTeamForm(self.u,form_data) + if not form.is_valid(): + print form.errors + self.assertTrue(form.is_valid()) + + form = PlannedSessionTeamMemberForm(self.ps_trimp,form_data) + if not form.is_valid(): + print form.errors + self.assertTrue(form.is_valid()) response = self.c.post(url,follow=True) self.assertEqual(response.status_code,200) @@ -1373,9 +1396,19 @@ class PlannedSessionsView(TestCase): login = self.c.login(username=self.u.username, password=self.password) self.assertTrue(login) + d1 = (self.ps_trimp.startdate-datetime.timedelta(days=1)).strftime( + "%Y-%m-%d") + d2 = (self.ps_trimp.enddate+datetime.timedelta(days=1)).strftime( + "%Y-%m-%d") + + sps = plannedsessions.get_sessions_manager(self.u,teamid=0, + enddate=d2,startdate=d1) + + self.assertTrue(len(sps)>0) + url = '/rowers/sessions/coach/?when={d1}/{d2}'.format( - d1=self.ps_trimp.startdate.strftime("%Y-%m%d"), - d2=self.ps_trimp.enddate.strftime("%Y-%m%d") + d1=d1, + d2=d2, ) response = self.c.get(url) @@ -1431,9 +1464,9 @@ class PlannedSessionsView(TestCase): self.assertEqual(response.status_code,200) form_data = { - 'startdate': self.w1.startdatetime.date(), - 'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date(), - 'preferreddate': self.w1.startdatetime.date(), + 'startdate': self.w1.startdatetime.date().strftime("%Y-%m-%d"), + 'enddate': (self.w1.startdatetime+datetime.timedelta(days=5)).date().strftime("%Y-%m-%d"), + 'preferreddate': self.w1.startdatetime.date().strftime("%Y-%m-%d"), 'name': faker.word(), 'sessiontype': 'session', 'sessionmode': 'distance', @@ -1444,6 +1477,12 @@ class PlannedSessionsView(TestCase): 'comment':faker.text(), } + form = PlannedSessionForm(form_data,instance=self.ps_time) + if not form.is_valid(): + print form.errors + + self.assertTrue(form.is_valid()) + response = self.c.post(url,follow=True) self.assertEqual(response.status_code,200) diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz index 66b5f5a1..5112eb13 100644 Binary files a/rowers/tests/testdata/testdata.csv.gz and b/rowers/tests/testdata/testdata.csv.gz differ diff --git a/rowers/views/planviews.py b/rowers/views/planviews.py index 8f0c26ee..32de7ce1 100644 --- a/rowers/views/planviews.py +++ b/rowers/views/planviews.py @@ -605,6 +605,8 @@ def plannedsession_teamedit_view(request, request.user,request.POST ) sessionrowerform = PlannedSessionTeamMemberForm(ps,request.POST) + + if sessioncreateform.is_valid(): cd = sessioncreateform.cleaned_data