Changeset 40:5d592e2950a1 in stamper

Timestamp:

Aug 12, 2014, 11:33:10 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

Added customer filtering support to the timeline feature:

• Get the timeline for the customer customA for the last week:

stamps -t customA 1w

• Get the timeline for the customer customA for august, 2013:

stamps -t customA 2013-08-01--2013-09-01

• Get all timeline for customer customA:

stamps -t customA

Files:

• bin/stamps (modified) (1 diff)
• stamper/stamper.py (modified) (2 diffs)

bin/stamps

@@ -39 +39 @@
     # Call the proper methods, based on the given parameters
     if args.timeline:
-        s.timeline(args.filter)
+        s.timeline(args.customer, args.filter)
     elif args.delete:
         s.remove_stamps(args.delete)

stamper/stamper.py

@@ -237 +237 @@
         return details, totals, total_customer
 
-    def timeline(self, stamp_filter=None):
+    def timeline(self, customer=None, stamp_filter=None):
         filter_from, filter_to = self.validate_filter(stamp_filter)
         for stamp in self.stamps:
-            customer = stamp['customer']
             start = datetime.strptime(stamp['start'], DATETIME_FORMAT)
             start_day = start.strftime('%Y-%m-%d')
@@ -251 +250 @@
                 # similar for the end date
                 continue
+
             if not stamp['customer']:
-                print(stamp['start'] + ' start')
+                if customer is None:
+                    print(stamp['start'] + ' start')
             else:
+                if customer and customer != stamp['customer']:
+                    continue
+                if customer:
+                    print(stamp['start'] + ' start')
                 print(' '.join([stamp['end'],
                                 stamp['customer'],