nikdoof/django-ett
1
0
Fork 0
mirror of https://github.com/nikdoof/django-ett.git synced 2025-12-15 23:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix segment time

Browse Source
This commit is contained in:
Andrew Williams
2012-10-19 23:20:38 +01:00
parent 829eac4767
commit 4ee659af38
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
django_ett/etasks/models.py
View File

@@ -54,7 +54,7 @@ class TimeEntry(models.Model):
updated = models.DateTimeField('Updated Date/Time', auto_now=True) updated = models.DateTimeField('Updated Date/Time', auto_now=True)
def get_segment_time(self): def get_segment_time(self):
if segment: if self.segment > 0:
return self.segment * 15 return self.segment * 15
return 0 return 0

7
django_ett/etasks/tests.py
View File

@@ -24,13 +24,14 @@ class TaskTest(TestCase):
def testTotalTime(self): def testTotalTime(self):
self.assertEqual(self.task.total_time, 0) 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) 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) 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) self.assertEqual(self.task.total_time, 30)
class TaskDetailViewTest(TestCase): class TaskDetailViewTest(TestCase):
def setUp(self): def setUp(self):