freshbooks-cli 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d2af6c0466a7a8eaacbb37f6c4d805fdc2aeea352ee1863a980ebca4ef35c53
-  data.tar.gz: f54441a12a096b41b4271fd190fe6c82747606d083178d008c51b26c29afeef1
+  metadata.gz: 7e9f2e80e5c692c3e2f848dc206858d680c0061166e8a013b16e877830b70db1
+  data.tar.gz: 8e52c8bc022ee719e91b8d4b35848c497d0ef5e8795e3e980e90fd773add1b76
 SHA512:
-  metadata.gz: 8e53b29f695cae36221dc1bc84c5ae53e5420774d749290d735b38816415fcccd1b14b9704d85f20ec6248be448e8dbfcb9c793913fa04a4df0c3b2d6d24b788
-  data.tar.gz: b5233605f884883cbed0759cee065776b8a6288b7ae2ca6f7e87cd4eef185eca220537ee060115d3a2abac34d37e8b7d9cfe24bd9f1af5e78b540b926b17dd5e
+  metadata.gz: 888e34a5ac7493d2b5ad9974094c90caf7f1151b711f717bc8ed41adf19c487cd446bbe5545e30cb7cddec9c16f60b2cbf9a6a38e7781f7b1921d47726e46542
+  data.tar.gz: 06ac47c6e320242bb088b90d8e55e3452e71ae72e5eb42fb0a69c8f1ca620e0564a10a5a2c0cd926c120b942db326511b75f57b4d2b8e26725f541ae20d33a7d

data/lib/fb/cli.rb

@@ -299,7 +299,7 @@ module FB
       entries.sort_by! { |e| e["started_at"] || "" }
 
       rows = entries.map do |e|
-        date = e["started_at"] || "?"
+        date = (e["local_started_at"] || e["started_at"] || "?").slice(0, 10)
         client = maps[:clients][e["client_id"].to_s] || e["client_id"].to_s
         project = maps[:projects][e["project_id"].to_s] || "-"
         service = maps[:services][e["service_id"].to_s] || "-"
@@ -311,6 +311,25 @@ module FB
       print_table(["ID", "Date", "Client", "Project", "Service", "Note", "Duration"], rows, wrap_col: 5)
 
       total = entries.sum { |e| e["duration"].to_i } / 3600.0
+
+      # Per-client breakdown
+      by_client = entries.group_by { |e| maps[:clients][e["client_id"].to_s] || e["client_id"].to_s }
+      if by_client.length > 1
+        puts "\nBy client:"
+        by_client.sort_by { |_, es| -es.sum { |e| e["duration"].to_i } }.each do |name, es|
+          puts "  #{name}: #{(es.sum { |e| e["duration"].to_i } / 3600.0).round(2)}h"
+        end
+      end
+
+      # Per-service breakdown
+      by_service = entries.group_by { |e| maps[:services][e["service_id"].to_s] || "-" }
+      if by_service.length > 1
+        puts "\nBy service:"
+        by_service.sort_by { |_, es| -es.sum { |e| e["duration"].to_i } }.each do |name, es|
+          puts "  #{name}: #{(es.sum { |e| e["duration"].to_i } / 3600.0).round(2)}h"
+        end
+      end
+
       puts "\nTotal: #{total.round(2)}h"
     end
 

data/lib/fb/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FB
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: freshbooks-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - parasquid