Changeset 22:43d14913e8fd in stamper

Timestamp:

Jul 23, 2014, 2:03:55 PM (10 years ago)

Author:

Óscar M. Lage <info@…>

Branch:

default

Phase:

public

Message:

Added -s option to sum all the times and show a resume

Files:

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

bin/stamps

@@ -15 +15 @@
     parser.add_argument('-v', '--verbose', action="store_true",
                         help='Include detailed times information')
+    parser.add_argument('-s', '--sum', action="store_true",
+                        help='Include sum of times')
 
     args = parser.parse_args()
@@ -20 +22 @@
     s = Stamper()
     s.load_stamps()
-    s.show_stamps(args.customer, args.filter, args.verbose)
+    s.show_stamps(args.customer, args.filter, args.verbose, args.sum)

stamper/stamper.py

@@ -9 +9 @@
 STAMPS_FILE = expanduser('~/.workstamps.json')
 DATE_FORMAT = '%Y-%m-%d %H:%M'
+HOURS_DAY = 8
+SECS_DAY = HOURS_DAY * 60 * 60
 
 
@@ -150 +152 @@
         return details, totals
 
-    def show_stamps(self, customer=None, stamp_filter=None, verbose=False):
+    def show_stamps(self, customer=None, stamp_filter=None, verbose=False,
+        sum=False):
         if stamp_filter:
             stamp_filter = self.validate_filter(stamp_filter)
@@ -157 +160 @@
 
         if customer:
-            total = timedelta(seconds=totals.get(customer, 0))
+            seconds=totals.get(customer, 0)
+            total = timedelta(seconds)
             print(' %(customer)s: %(total)s' % {'customer': customer,
                                                 'total': total})
         else:
             for c in totals:
-                total = timedelta(seconds=totals[c])
+                seconds=totals[c]
+                total = timedelta(seconds)
                 print(' %(customer)s: %(total)s' % {'customer': c,
                                                     'total': total})
@@ -176 +181 @@
                     print(line)
                 print(' Total: %(total)s' % {'total': totals[day]})
+
+        if sum:
+            sum_tot = ''
+            if totals:
+                print('------ Totals ------' % {'day': day})
+                for day, tot in totals.iteritems():
+                    print(' %(day)s: %(total)s' % {'day': day, 'total': tot})
+                    sum_tot = "%(total)s %(new)s" % {
+                        'total': sum_tot,
+                        'new': total
+                    }
+                totalSecs, sec = divmod(seconds, 60)
+                hr, min = divmod(totalSecs, 60)
+                totalDays, remaining = divmod(seconds, SECS_DAY)
+                remainingMin, remainingSec = divmod(remaining, (60))
+                remainingHr, remainingMin = divmod(remainingMin, (60))
+                print('----- %d:%02d:%02d -----' % (hr, min, sec))
+                print('--- %d days, remaining: %d:%02d (%d hours/day) ---' % (
+                    totalDays, remainingHr, remainingMin, HOURS_DAY
+                ))