Changeset 8:0b63f5eb49b3 in stamper

Timestamp:

Jul 8, 2014, 10:40:05 AM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Refactored totals, removed totals_by_customer.
Refactored details, added support to return details by customer.

File:

• stamper/stamper.py (modified) (1 diff)

stamper/stamper.py

@@ -93 +93 @@
         return customers
 
-    def total_by_customer(self, customer):
-        total = 0
+    def totals(self, stamp_filter=None):
+        totals = {}
         for stamp in self.stamps:
-            if stamp['customer'] == customer:
-                total += self.worktime(stamp['start'], stamp['end'])
-        total = timedelta(seconds=total)
-        return str(total)
+            customer = stamp['customer']
+            if customer:
+                # c will be None for "start" stamps, having no end time
+                if customer not in totals:
+                    totals[customer] = 0
+                totals[customer] += self.worktime(stamp['start'], stamp['end'])
+        return totals
 
-    def totals(self):
+    def details(self):
+        details = {}
         totals = {}
-        for customer in self.customers():
-            totals[customer] = self.total_by_customer(customer)
-        return totals
+        for stamp in self.stamps:
+            if stamp['customer']:
+                # avoid "start" stamps
+                start_day = stamp['start'].split(' ')[0]
+                if start_day not in details:
+                    details[start_day] = []
+                if start_day not in totals:
+                    totals[start_day] = 0
+                worktime = self.worktime(stamp['start'], stamp['end'])
+                details[start_day].append(
+                    ' -> %(worktime)s %(customer)s %(action)s' % {
+                        'worktime': str(timedelta(seconds=worktime)),
+                        'customer': stamp['customer'],
+                        'action': stamp['action']
+                    })
+                totals[start_day] += worktime
+        for day in totals:
+            totals[day] = str(timedelta(seconds=totals[day]))
+        return details, totals
 
     def details_by_customer(self, customer):