From 4ee659af382cf68b2a46be6b9c7bad3ed1505da0 Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Fri, 19 Oct 2012 23:20:38 +0100 Subject: [PATCH] Fix segment time --- django_ett/etasks/models.py | 2 +- django_ett/etasks/tests.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/django_ett/etasks/models.py b/django_ett/etasks/models.py index 46624de..1c5727a 100644 --- a/django_ett/etasks/models.py +++ b/django_ett/etasks/models.py @@ -54,7 +54,7 @@ class TimeEntry(models.Model): updated = models.DateTimeField('Updated Date/Time', auto_now=True) def get_segment_time(self): - if segment: + if self.segment > 0: return self.segment * 15 return 0 diff --git a/django_ett/etasks/tests.py b/django_ett/etasks/tests.py index 3044190..ec6de15 100644 --- a/django_ett/etasks/tests.py +++ b/django_ett/etasks/tests.py @@ -24,13 +24,14 @@ class TaskTest(TestCase): def testTotalTime(self): self.assertEqual(self.task.total_time, 0) - entry = TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_ON, date=now(), segment=10) + TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_ON, date=now(), segment=10) self.assertEqual(self.task.total_time, 15) - entry2 = TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_OFF, date=now(), segment=11) + TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_OFF, date=now(), segment=11) self.assertEqual(self.task.total_time, 15) - entry3 = TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_ON, date=now(), segment=12) + TimeEntry.objects.create(task=self.task, type=TimeEntry.TYPE_ON, date=now(), segment=12) self.assertEqual(self.task.total_time, 30) + class TaskDetailViewTest(TestCase): def setUp(self):