updated income and resume apps

1 files changed, 11 insertions, 2 deletions

diff --git a/app/income/models.py b/app/income/models.py
index 688d1d7..e5a351b 100644
--- a/app/income/models.py
+++ b/app/income/models.py
@@ -69,6 +69,9 @@ class InvoiceItem(models.Model):
     time_end = models.DateTimeField(null=True, blank=True)
     work_done = models.TextField(null=True, blank=True)
 
+    class Meta:
+        ordering = ('time_start',)
+
     def __str__(self):
         return str(self.time_start)
 
@@ -89,6 +92,12 @@ class InvoiceItem(models.Model):
         half_period_seconds = period_seconds / 2
         remainder = td.total_seconds() % period_seconds
         if remainder >= half_period_seconds:
-            return timedelta(seconds=td.total_seconds() + (period_seconds - remainder))
+            tdr = timedelta(seconds=td.total_seconds() + (period_seconds - remainder))
+            hours, remainder = divmod(tdr.total_seconds(), 3600)
+            r = remainder/3600
+            return float(hours)+r
         else:
-            return timedelta(seconds=td.total_seconds() - remainder)
+            tdr = timedelta(seconds=td.total_seconds() - remainder)
+            hours, remainder = divmod(tdr.total_seconds(), 3600)
+            r = remainder/3600
+            return float(hours)+r