milton 1.0.0 → 1.0.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.0.1 / 2009-06-30
+
+* 1 Bugfix
+
+  * Now handles holidays!  Holiday, celebrate. If we took a holiday,
+    took some time to celebrate
+
 === 1.0.0 / 2009-02-23
 
 * 1 major enhancement

data/Rakefile

@@ -2,11 +2,11 @@
 
 require 'rubygems'
 require 'hoe'
-require './lib/milton.rb'
 
-Hoe.new('milton', Milton::VERSION) do |p|
-  p.developer('Aaron Patterson', 'aaronp@rubyforge.org')
-  p.extra_deps      = [['mechanize', '>= 0.9.2']]
+Hoe.spec 'milton' do |p|
+  developer('Aaron Patterson', 'aaronp@rubyforge.org')
+  self.extra_deps      = [['mechanize', '>= 0.9.2']]
+  self.rubyforge_name = 'seattlerb'
 end
 
 # vim: syntax=Ruby

data/lib/milton.rb

@@ -12,7 +12,7 @@ require 'yaml'
 
 class Milton
 
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 
   def self.load_config config_file
     unless File.exist? config_file then
@@ -168,24 +168,35 @@ the current week with eight hours/day.
   def fill_timesheet
     rows = []
     last_date = nil
+    filled_in = false
 
     parse_timesheet.each do |data|
-      next if data[0].to_i > 0
-
       department  = data[6]
       employee_id = data[7]
       date        = Date.parse(CGI.unescape(data[1])).strftime('%m/%d/%Y')
 
-      start, finish = starting_and_ending_timestamp(date, last_date)
+      # skip days with data already filled (like holidays)
+      if data[0].to_i > 0 or (filled_in and date == last_date) then
+        filled_in = true
+        last_date = date
+        next
+      end
+
+      filled_in = false
 
-      rows << ['0','','False','True','False','False','False',
-      "#{date} 12:00:00 AM",
-      start,'',
-      finish,
-      '8','',
-      department,
-      employee_id,
-      '','','','','','','','','','','','','','','','','','','','','EDIT','','','','','2','','0','False']
+      start, finish = starting_and_ending_timestamp date, last_date
+
+      rows << [
+        '0', '', 'False', 'True', 'False', 'False', 'False',
+        "#{date} 12:00:00 AM",
+        start, '',
+        finish,
+        '8', '',
+        department,
+        employee_id,
+        '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
+        '', '', '', 'EDIT', '', '', '', '', '2', '', '0', 'False'
+      ]
 
       # This reset is for the timestamp calculations.
       last_date = date
@@ -217,12 +228,23 @@ the current week with eight hours/day.
 
     puts "-" * 80
 
+    date      = nil
+    last_date = nil
+
     timesheet.each do |row|
-      if row[0] == '0' then
+      date = row[2]
+
+      if row[0] == '0' and date == last_date then
+        # do nothing
+      elsif row[0] == '0' then
         puts "#{row[2]} no time entered"
+      elsif date == last_date then
+        puts "           %s to %s for %3s hours %s" % row.values_at(3, 4, 5, 8)
       else
-        puts "#{row[2]} #{row[3]} to #{row[4]} for %2s hours" % row[5]
+        puts "%s %s to %s for %3s hours %s" % row.values_at(2, 3, 4, 5, 8)
       end
+
+      last_date = date
     end
   end
 
@@ -261,13 +283,15 @@ the current week with eight hours/day.
 
   ##
   # Returns an array of arrays containing: row id, day start time, date, start
-  # time, end time, hours, department, employee id.  All values are strings.
+  # time, end time, hours, department, employee id and earnings code.  All
+  # values are strings.
 
   def parse_timesheet
     @page.body.scan(/TCMS.oTD.push\((\[.*\])\)/).map do |match|
-      match[0].gsub(/"/, '').split(',').map { |x|
+      row = match[0].gsub(/"/, '').split(',')
+      row.map { |x|
         CGI.unescape(x.strip).delete('[]')
-      }.values_at(0, 7, 8, 9, 11, 12, 14, 15)
+      }.values_at(0, 7, 8, 9, 11, 12, 14, 15, 32)
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: milton
 version: !ruby/object:Gem::Version 
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-04 00:00:00 -07:00
+date: 2009-06-30 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.12.2
+        version: 2.2.0
     version: 
 description: Milton fills out your ADP ezLaborManager timesheet
 email: 
@@ -77,8 +77,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   version: 
 requirements: []
 
-rubyforge_project: milton
-rubygems_version: 1.3.3
+rubyforge_project: seattlerb
+rubygems_version: 1.3.4
 signing_key: 
 specification_version: 3
 summary: Milton fills out your ADP ezLaborManager timesheet