brisk-bills 0.8.1 → 0.8.2

data/Gemfile

@@ -1,7 +1,7 @@
 source :rubygems
 
 gem 'i18n', '0.4.2'
-gem 'rails', '2.3.16'
+gem 'rails', '2.3.17'
 gem 'rake', '0.8.7'
 gem 'pdf-writer', :git => 'git://github.com/metaskills/pdf-writer.git', :require => ['pdf/writer', 'pdf/simpletable']
 gem 'slimtimer4r', '0.2.4'

data/Gemfile.lock

@@ -9,16 +9,16 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (2.3.16)
-      actionpack (= 2.3.16)
-    actionpack (2.3.16)
-      activesupport (= 2.3.16)
+    actionmailer (2.3.17)
+      actionpack (= 2.3.17)
+    actionpack (2.3.17)
+      activesupport (= 2.3.17)
       rack (~> 1.1.0)
-    activerecord (2.3.16)
-      activesupport (= 2.3.16)
-    activeresource (2.3.16)
-      activesupport (= 2.3.16)
-    activesupport (2.3.16)
+    activerecord (2.3.17)
+      activesupport (= 2.3.17)
+    activeresource (2.3.17)
+      activesupport (= 2.3.17)
+    activesupport (2.3.17)
     color (1.4.1)
     extensions (0.6.0)
     hoe (3.5.0)
@@ -27,12 +27,12 @@ GEM
     money (2.2.0)
     mysql2 (0.2.18)
     rack (1.1.6)
-    rails (2.3.16)
-      actionmailer (= 2.3.16)
-      actionpack (= 2.3.16)
-      activerecord (= 2.3.16)
-      activeresource (= 2.3.16)
-      activesupport (= 2.3.16)
+    rails (2.3.17)
+      actionmailer (= 2.3.17)
+      actionpack (= 2.3.17)
+      activerecord (= 2.3.17)
+      activeresource (= 2.3.17)
+      activesupport (= 2.3.17)
       rake (>= 0.8.3)
     rake (0.8.7)
     slimtimer4r (0.2.4)
@@ -49,7 +49,7 @@ DEPENDENCIES
   money (= 2.2.0)
   mysql2 (~> 0.2.7)
   pdf-writer!
-  rails (= 2.3.16)
+  rails (= 2.3.17)
   rake (= 0.8.7)
   slimtimer4r (= 0.2.4)
   test-unit (= 1.2.3)

data/lib/brisk-bills.rb

@@ -4,7 +4,7 @@ unless defined? BriskBills::Version
   module BriskBills::Version
     Major = '0'
     Minor = '8'
-    Tiny  = '1'
+    Tiny  = '2'
 
     class << self
       def to_s

data/lib/brisk-bills/initializer.rb

@@ -1,5 +1,5 @@
 require 'rubygems'
-gem 'rails', '= 2.3.16'
+gem 'rails', '= 2.3.17'
 require 'initializer' # This is the rails-2.3.8/lib/initializer
 
 module BriskBills

data/lib/tasks/package.rake

@@ -40,7 +40,7 @@ namespace 'package' do
     s.add_dependency 'slimtimer4r', '>= 0.2.4'
     s.add_dependency 'money',       '>= 2.2.0'
     s.add_dependency 'mysql',       '>= 2.7'
-    s.add_dependency 'rails',       '= 2.3.16'
+    s.add_dependency 'rails',       '= 2.3.17'
     s.add_dependency 'i18n',        '= 0.4.2'
 
     s.has_rdoc = true

data/lib/tasks/slimtimer_import.rake

@@ -29,7 +29,7 @@ namespace :brisk_bills do
     def model_to_update?( map, st_record, klass )
       st_record_id = st_record.id
 
-      if map.has_key?(st_record_id) and st_record.updated_at.to_a != map[st_record_id].st_updated_at.to_a
+      if map.has_key?(st_record_id) and st_record.updated_at != map[st_record_id].st_updated_at
         # UPDATE this record:
         return map[st_record_id]
       elsif !map.has_key? st_record_id
@@ -65,6 +65,8 @@ namespace :brisk_bills do
         st = SlimTimer.new employee.slimtimer.username, employee.slimtimer.password, employee.slimtimer.api_key, 300
         
         ### Tasks: 
+        # At some point this stopped working due to Slimtimer only showing you a limited
+        # number of tasks as a result of this call:
         st.list_tasks('yes').each do |t|
           begin
             # <Record(Result)
@@ -107,7 +109,7 @@ namespace :brisk_bills do
         end
         
         ## Time Entries:
-    
+
         # Let's create an entry update map
         briskbills_time_entries = {}
         employee.slimtimer.time_entries.find(
@@ -117,7 +119,8 @@ namespace :brisk_bills do
       
         # We'll end up using this to tell when something's been deleted:    
         st_time_entry_ids = []
-    
+   
+        missing_task_ids = []
         st.list_timeentries(sync_from,time_now).each do |e|
           begin
             #  <Record(Result) 
@@ -151,6 +154,8 @@ namespace :brisk_bills do
             end
     
             unless update_time_entry.nil?
+              missing_task_ids << e.task.id if !tasks_map.has_key?(e.task.id) and !missing_task_ids.include?(e.task.id)
+
               update_time_entry[:slimtimer_task_id] = e.task.id
               update_time_entry[:employee_slimtimer_id] = employee.slimtimer.id
               update_time_entry[:comments] = e.comments
@@ -186,7 +191,28 @@ namespace :brisk_bills do
             puts "Error in 'deleted_time_entry_ids': #{$!}"
           end
         end
-    
+   
+        # And now create any tasks that were found to be missing:
+        missing_task_ids.each do |task_id|
+          t = st.show_task task_id
+
+          update_task = SlimtimerTask.new
+          update_task[:id] = t.id
+          update_task[:name] = t.name
+          update_task[:st_updated_at] = t.updated_at
+          update_task[:st_created_at] = t.created_at
+          update_task[:owner_employee_slimtimer_id] = t.owners[0]['user_id']
+
+          puts '%s - %s Task: "%s"' % [ 
+            employee.name,
+            (update_task.new_record?)?'Creating':'Updating', 
+            update_task.label
+          ]
+              
+          update_task.save!
+              
+          raise StandardError, "Error #{(update_task.new_record?)?'Creat':'Updat'}ing task: #{update_task.errors.full_messages.inspect}" unless update_task.errors.empty?
+        end
       
 #      rescue
 #        puts "Error in 'Employee.find': #{$!}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brisk-bills
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.16
+        version: 2.3.17
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.3.16
+        version: 2.3.17
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -778,7 +778,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -388466778823291648
+      hash: -4468151445776889320
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -787,7 +787,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -388466778823291648
+      hash: -4468151445776889320
 requirements: []
 rubyforge_project: brisk-bills
 rubygems_version: 1.8.24