twstats 0.2.5 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '0589a754ec65039304f94cd58dc6339829ee2485bf7a2e782de8ca3e9186ba9a'
-  data.tar.gz: 689f96336353325219a3ed14317e3de8206de93dc975e230afd7feebf0a844aa
+  metadata.gz: e126990ce8c73929882e7246c5a77cce582c46fd115b4241b71f12b17e1e6f6b
+  data.tar.gz: 9184395243e7c2b7305248e724027eca9c84cab170cc6b742bdb0a893e484b69
 SHA512:
-  metadata.gz: b1a24c4cffc2df2f36ecaabbe5873966664dd94f40be6dbfba5d2f9a8de04876a139edc0ac6912a65de4b0a38102b26dceb2ebbe2ec5e1b72c407c786410f218
-  data.tar.gz: 3c09c2ead64c69a666f1da1c7ae2d2ea6971c1c3c45ebc2509aa026cfb237f601d9cd2592b61df53ec845f2e7bbc7ae36573787895ba8aa6fba2c7141d95fae3
+  metadata.gz: 97271cf581f7b696aa23be141ddc3800fe42089803ba999f32f74b0ef9e37bd0577bf55c5bf8ee4e81d1b5257e009725d20f7e9b96db33a2b6390a7d5c5c2cbc
+  data.tar.gz: 9fa944b7a95d245a9c285196893549b2d6f6f804406003d98ccac50878117160b345b31fbd07f13e8ce9473683ecf6fdc0ccc8d9d02dd66dcaaec222476a96fe

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    twstats (0.2.4.pre.6.pre.g29c9d57)
+    twstats (0.2.5)
       descriptive-statistics (>= 2.2.0)
       rainbow (~> 3.0)
       tty-prompt (~> 0.17)

data/exe/twstats

@@ -2,4 +2,4 @@
 
 require "twstats"
 
-Twstats::Runner.new
+Twstats::Runner.new ARGV[0]

data/lib/twstats.rb

@@ -17,12 +17,12 @@ module Twstats
       {name: 'Tags', value: :tags},
       {name: 'Tasks', value: :tasks},
       {name: 'Full stats', value: :fullstats},
-      {name: 'Weekly', value: :weekly},
       {name: 'Back', value: :back}
   ]
   MENU_CHOICES = [
       {name: 'Stats', value: :stats},
-      {name: 'Billing', value: :billing},
+      {name: 'TimeSheet', value: :billing},
+      {name: 'Weekly', value: :weekly},
       {name: 'Quit', value: :quit}
   ]
 end

data/lib/twstats/csv_reader.rb

@@ -54,7 +54,6 @@ module Twstats
         else
           return -99999
       end
-      puts "bill: #{billable}, nonbill: #{non_billable}"
       if filter_billable
         return [billable, non_billable]
       else

data/lib/twstats/runner.rb

@@ -11,9 +11,8 @@ module Twstats
       @prompt = TTY::Prompt.new
       puts WELLCOME_MESSAGE.bright
       # Ask for the csv file
-      file ||= @prompt.ask('Specify the CSV file from a Teamwork time log export', default: 'exportTimeLog.csv') do |input|
-        input.modify :chomp
-      end
+      file = read_file file
+      # Check if the file exists
       @csv = CSVReader.new(file)
       loop do
         option = @prompt.select("Choose an option", Twstats::MENU_CHOICES, cycle: true)
@@ -22,12 +21,38 @@ module Twstats
             show_stats_menu
           when :billing
             billing
+          when :weekly
+            show_weekly_report
           when :quit
             break
           else
             puts 'Option not recognized!'
         end
       end
+      @current = nil
+    end
+
+    def read_file(file = nil)
+      # Check if the file exsis
+      unless file.nil?
+        if File.exists? file
+          return file
+        else
+          file = @prompt.ask('The file you have supplied does not exsists. Try again or type .q to exit twstats.') do |input|
+            input.modify :chomp
+          end
+          if file == ".q"
+            exit 0
+          else
+            read_file file
+          end
+        end
+      end
+      # Now ask for the file if needed
+      file = @prompt.ask('Specify the CSV file from a Teamwork time log export', default: 'exportTimeLog.csv') do |input|
+        input.modify :chomp
+      end
+      read_file file
     end
 
     def billing
@@ -44,8 +69,6 @@ module Twstats
             show_stats option
           when :fullstats
             show_full_stats
-          when :weekly
-            show_weekly_report
           when :back
             return
           else
@@ -59,7 +82,14 @@ module Twstats
       toshow = {}
       max = 0
       filter_billable ||= @prompt.yes?('Do you want to filter billable and non-billable time?', default: true)
-      @csv.send(obj).each do |element|
+      objects = @csv.send(obj)
+      if objects.size > 1
+        list = @prompt.multi_select "Which ones of the following do you want to see? Select or unselect them with the space key\n" do |menu|
+          menu.choices objects
+          menu.default *[*1..objects.size]
+        end
+      end
+      list.each do |element|
         toshow[element] = @csv.get_total_time(obj, element, filter_billable)
         max = element.size if max < element.size
       end
@@ -76,6 +106,7 @@ module Twstats
         end
       end
       show_not_tagged_section false
+      # Further filtering
     end
 
     def ranking_from_not_tagged(list)
@@ -145,7 +176,7 @@ module Twstats
     def show_not_tagged_section(table)
       not_tagged = @csv.not_tagged_tasks
       unless not_tagged[:list].empty?
-        section("Tasks not tagged in this report")
+        section("Logs not tagged in this report")
         puts "A total of #{not_tagged[:list].size} logs have not been tagged:"
         puts " - A total time of #{not_tagged[:total_time]} is not tagged properly."
         puts " - Impact by employee: "
@@ -178,7 +209,7 @@ module Twstats
           return
         end
       end
-      hours = @prompt.ask 'What is the weekly amount of hours worked?', default: 40, convert: :float
+      hours = @prompt.ask 'What is the weekly amount of hours worked?', default: 40, convert: :int
       info = {}
       @csv.people.each do |person|
         billable, non_billable = @csv.get_total_time(:people, person, true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: twstats
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
 platform: ruby
 authors:
 - J.P. Araque
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-06 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler