twstats 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 27db2b5244ab293d6e6f955c7392b1473daeaf2832c0a5f9db342a10216a72df
-  data.tar.gz: 1a475fe0708379be56cfd4cf9329c84cf03b4c7b21a4572a4c1a45c8c6e39608
+  metadata.gz: f34d4ba10054132e2b0cddb54033e418979735a7ea7c5e3d487f40eb2c5472e7
+  data.tar.gz: 1017e1b74d4cf8da667b634ea71285952f9f9c44a7b297cb2c8c31c21f884406
 SHA512:
-  metadata.gz: '09a95242b4c137c7cdc474be974ab3b1f9623daeb5caaf2af63a411a0556914d30ca77a1b18f687dafd99e848e85f25b2e7486afe88a9c7399e7f1671c7c32cf'
-  data.tar.gz: 0470c445f623518a781d4da31376c3161e1ead38f3df8b32aa7a60c3fa98507edcae85c2d5c986d7758e23b8196a4554dfe332e703db6b80d27da52b9eb439a9
+  metadata.gz: 21bff3055a10fd3fafb6d92647a2537afb908024e053e7bfca171532e4e7ad55e3eb7758656e8a35895411b520184d526f07b631e1ad9989d1f53855ed257182
+  data.tar.gz: 128b0efb50ae73c9b7b598b841ebdfeb66fb38b4ce510d2fe2a8e1b1f290cd23bfccddabb37dc4bd8fa8bee495b7fda6b0f8cd5e377b142a395aaf644170763a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twstats (0.2.2)
+    twstats (0.2.3.pre.2.pre.g8db668b)
       rainbow (~> 3.0)
       tty-prompt (~> 0.17)
 

data/lib/twstats.rb

@@ -2,6 +2,7 @@ require_relative 'twstats/extensions'
 require_relative 'twstats/version'
 require_relative 'twstats/tw_log'
 require_relative 'twstats/csv_reader'
+require_relative 'twstats/timesheet_export'
 require_relative 'twstats/runner'
 
 module Twstats
@@ -19,7 +20,7 @@ module Twstats
   ]
   MENU_CHOICES = [
       {name: 'Stats', value: :stats},
-      {name: 'Info', value: :info},
+      {name: 'Billing', value: :billing},
       {name: 'Quit', value: :quit}
   ]
 end

data/lib/twstats/runner.rb

@@ -20,8 +20,8 @@ module Twstats
         case option
           when :stats
             show_stats_menu
-          when :info
-            show_info
+          when :billing
+            billing
           when :quit
             break
           else
@@ -30,6 +30,12 @@ module Twstats
       end
     end
 
+    def billing
+      ## Takes care of using the current CSV file to be imported into timesheets.
+      # Makes it easier to do it than manually going through all of them
+      TimeSheetExport.new(@csv, @prompt).execute
+    end
+
     def show_stats_menu
       loop do
         option = @prompt.select("Select what time logging stats you want to see", Twstats::STATS_MENU_CHOICES, cycle: true)
@@ -59,8 +65,12 @@ module Twstats
       end
       toshow.sort_by{ |k,v| v}.reverse.to_h.each do |k,v|
         if filter_billable
-          puts " - #{k.ljust(max,' ').bright.blue} | #{"Billable:".ljust(13," ").bright} #{v[0].round(2)} (#{((v[0]/(v[0]+v[1]))*100).round(2)} %)" unless v[0].zero?
-          puts "   #{"".ljust(max,' ').bright.blue} | #{"Non-billable:".bright} #{v[1].round(2)}" unless v[1].zero?
+          if v[0].zero?
+            puts " - #{k.ljust(max,' ').bright.blue} | #{"Non-billable:".bright} #{v[1].round(2)}"# unless v[1].zero?
+          else
+            puts " - #{k.ljust(max,' ').bright.blue} | #{"Billable:".ljust(13," ").bright} #{v[0].round(2)} (#{((v[0]/(v[0]+v[1]))*100).round(2)} %)"
+            puts "   #{"".ljust(max,' ').bright.blue} | #{"Non-billable:".bright} #{v[1].round(2)}" unless v[1].zero?
+          end
         else
           puts " - #{k.ljust(max,' ').bright.blue} | #{v.round(2)}" unless v.zero?
         end

data/lib/twstats/timesheet_export.rb

@@ -0,0 +1,51 @@
+require 'rainbow/refinement'
+using Rainbow
+
+module Twstats
+  class TimeSheetExport
+    def initialize(csv, prompt)
+      @prompt = prompt
+      @rows = []
+      # Filter by billable and not billed
+      csv.logs.select{|x| x.billable && !x.invoiced}.sort_by{|x| x.date}.each do |log|
+        @rows << {
+          date: log.date.strftime('%m/%d/%Y'),
+          who: public_name(log.who),
+          description: log.description,
+          time: log.decimal_time,
+          proj: log.project
+        }
+      end
+      @proj = csv.projects
+
+      # Ask the user how to configure the export
+      if csv.projects.size > 1
+        @proj = @prompt.multi_select 'I have found more than one project in the CSV file, which ones do you want to export for timesheet?' do |menu|
+          menu.choices csv.projects
+          menu.default *[*1..csv.projects.size] # Generates an array from 1 to the maximum index of the projects array
+        end
+      end
+    end
+
+    def execute
+      puts "Copy each column below into the proper column of the spreadsheet"
+      columns = [:date, :who, :description, :time]
+      columns.each do |column|
+        puts "***********".bright.blue
+        puts column.to_s.capitalize.bright.blue
+        puts "***********".bright.blue
+        @rows.each do |row|
+          next unless @proj.include? row[:proj]
+          puts "#{row[column]}"
+        end
+      end
+      puts "******* Total amount of time billed *******".bright.blue
+      puts "This amounts to #{@rows.inject(0) { |sum, x| sum += x[:time].to_f }} hours.".bright
+      puts "Check with the amount of hours to be billed to see they match".bright
+    end
+
+    def public_name(name)
+      name.split[0]
+    end
+  end
+end

data/lib/twstats/tw_log.rb

@@ -10,7 +10,7 @@ module Twstats
     attr_reader :project
     attr_reader :task
     attr_reader :billable
-
+    attr_reader :invoiced
 
     # Class use to store the information needed form a given log
     def initialize(row)
@@ -23,6 +23,7 @@ module Twstats
       @project = row["Project"]
       @task = row["Task"]
       @billable = !row["Is it Billable?"].to_i.zero?
+      @invoiced = !row['Invoice Number']
       @date = DateTime.parse(row['Date'])
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twstats
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - J.P. Araque
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-22 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -106,6 +106,7 @@ files:
 - lib/twstats/csv_reader.rb
 - lib/twstats/extensions.rb
 - lib/twstats/runner.rb
+- lib/twstats/timesheet_export.rb
 - lib/twstats/tw_log.rb
 - lib/twstats/version.rb
 - twstats.gemspec