time_cop 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acea5459ff2d87073e48ce8bf49624c3053d29d0
-  data.tar.gz: 19b808d20e27eed1a5ea49f00db0f7668e1acd4d
+  metadata.gz: 556970075820cedaa47a84fb0e5b5e75b3dc1512
+  data.tar.gz: 85b78ef60edc687c8743ce77e68f835567227321
 SHA512:
-  metadata.gz: 479b1ff4901d55092c744987364cb33cbc3c7f3f3ffed69d2777467f747f362a998713499d57d54f68d0d8e7e2fd887e99c6d62f3c63a92a8e41ca4733cd30fc
-  data.tar.gz: f9c45e804a9e90345a424b1866ee754ab17a030b3e0ccd15c11b4463f45e5a97d37e1e138c9effb65914ed9c57363e04b7f81f5763ca8d251079410d8a9802c0
+  metadata.gz: c86d629a0d66e25e4aaefc9de16a1fd4d34cf84f97560f3a7fa5f992f02cff41f4ee125d45756f6d7d4af8dc67627d074e663931660d7a5cc902bf0eecd7e681
+  data.tar.gz: a41f5b231bebeec3bf0f9842e989f5915dc082b4080ea454a81a2a2b92ce5f7f5048f2876260a0ceab30ff6f4807cd7b8c082f595ab8fe4705db93e6803276a7

data/lib/time_cop/accountability.rb

@@ -15,7 +15,7 @@ module TimeCop
       q4: [{month: 10, day: 1}, {month: 12, day: 31}]
     }
 
-    def initialize(harvest_client:, date: Date.today, today: Date.today, report_builder: nil, email: nil, hours_per_week: 32)
+    def initialize(harvest_client:, date: Date.today, today: Date.today, report_builder: nil, email: nil, hours_per_week: 34)
       @client = harvest_client
       @date = date
       @today = today
@@ -46,7 +46,7 @@ module TimeCop
     end
 
     def date_from_period(period)
-        Date.new(date.year, period[:month], period[:day])
+      Date.new(date.year, period[:month], period[:day])
     end
 
     def select_quarter
@@ -82,8 +82,10 @@ module TimeCop
       @quarterly_tracked_time_by_user ||= report_builder.generate
     end
 
-    def total_quarter_time_tracked
-      quarterly_tracked_time_by_user.map { |t| t.hours }.reduce(0, :+)
+    def total_quarter_time_tracked(include_future = true)
+      quarterly_tracked_time_by_user.select do |t|
+        include_future || t.spent_at <= Date.today
+      end.map(&:hours).reduce(0, :+)
     end
 
     def total_quarter_days
@@ -124,18 +126,26 @@ module TimeCop
 
     def average_quarter_hours_per_day
       if weekdays_so_far(false) > 0
-        total_quarter_time_tracked / weekdays_so_far(false)
+        total_quarter_time_tracked(false) / weekdays_so_far(false)
       else
         0
       end
     end
 
     def projected_quarter_hours
-      ((total_quarter_time_tracked + (weekdays_left(false) * average_quarter_hours_per_day)) - expected_quarter_hours)
+      (total_quarter_time_tracked + projected_future_hours) - expected_quarter_hours
     end
 
-    def current_hours_delta
-      total_quarter_time_tracked - expected_quarter_hours_to_today
+    def projected_future_hours
+      (weekdays_left(false) - future_days_with_work)* average_quarter_hours_per_day
+    end
+
+    def future_days_with_work
+      quarterly_tracked_time_by_user.select{ |t| t.spent_at > Date.today}.map(&:spent_at).uniq.length
+    end
+
+    def current_hours_delta(include_future = true)
+      total_quarter_time_tracked(include_future) - expected_quarter_hours_to_today
     end
 
     def quarterly_hours_delta
@@ -146,7 +156,7 @@ module TimeCop
       if weekdays_between(today, end_of_quarter_date) == 0
         quarterly_hours_delta
       else
-        quarterly_hours_delta / weekdays_between(today, end_of_quarter_date).to_f
+        quarterly_hours_delta / weekdays_left(false).to_f
       end
     end
 
@@ -179,20 +189,21 @@ module TimeCop
     def print_report
       puts "Quarter Period: #{start_of_quarter_date} - #{end_of_quarter_date}"
       puts "Hours Per Week: #{@hours_per_week}"
+      puts "Weekdays So Far: #{weekdays_so_far(false)}"
       puts ""
       puts "Quarterly Hour Target: #{expected_quarter_hours.round(2)}"
       puts "Quarterly Hours Charged: #{total_quarter_time_tracked.round(2)}"
       if active_quarter?
         puts ""
+        puts "Additional Hours Needed By End Of Quarter: #{quarterly_hours_delta.round(2)}"
         puts "Business Days Left In The Quarter (Excluding Today): #{weekdays_left(false)}"
         puts ""
-        puts "Additional Hours Needed By End Of Quarter: #{quarterly_hours_delta.round(2)}"
         puts "Average Hours Per Business Day Worked: #{average_quarter_hours_per_day.round(2)}"
         puts "Hours Per Business Day Average Needed: #{quarterly_hours_per_business_day_needed.round(2)}"
       end
-      puts""
-      puts "Quarter Surplus(+)/Deficit(-): #{Accountability.paint_number(current_hours_delta.round(2))}"
-      puts "Projected Surplus(+)/Deficit(-): #{Accountability.paint_number(projected_quarter_hours.round(2))}" if active_quarter?
+      puts ""
+      puts "Current Surplus(+)/Deficit(-): #{Accountability.paint_number(current_hours_delta(false).round(2))}"
+      puts "Projected Quarter Surplus(+)/Deficit(-): #{Accountability.paint_number(projected_quarter_hours.round(2))}" if active_quarter?
     end
   end
 end

data/lib/time_cop/version.rb

@@ -1,3 +1,3 @@
 module TimeCop
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: time_cop
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - Sam Clopton
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: harvested