Changeset 38:fb741bfe9e1d in stamper

Timestamp:

Aug 12, 2014, 6:44:42 PM (10 years ago)

Author:

Borja Lopez <borja@…>

Branch:

default

Phase:

public

Message:

The timeline feature accepts now date-based filters:

• Show the timeline for the last week:

stamps -t 1w

• Show the timeline for august, 2013:

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

And so on.

Files:

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

bin/stamps

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

stamper/stamper.py

@@ -237 +237 @@
         return details, totals, total_customer
 
-    def timeline(self):
+    def timeline(self, 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')
+            if filter_from and start < filter_from:
+                # if there is a filter setting a starting date for the
+                # report and the current stamp is from an earlier date, do
+                # not add it to the totals
+                continue
+            if filter_to and start > filter_to:
+                # similar for the end date
+                continue
             if not stamp['customer']:
                 print(stamp['start'] + ' start')