bookyt_projects 0.19.4 → 0.19.5

data/app/models/activity.rb

@@ -28,10 +28,11 @@ class Activity < ActiveRecord::Base
 
   # Work day
   belongs_to :work_day, :autosave => true
-  before_save :update_work_day
+  after_save :update_work_day
+  after_destroy :update_work_day
 
   private
   def update_work_day
-    WorkDay.create_or_update_upto(self.person, date)
+    WorkDay.create_or_update(self.person, date)
   end
 end

data/app/models/bookyt_projects/person.rb

@@ -3,8 +3,8 @@ module BookytProjects
     extend ActiveSupport::Concern
 
     included do
-      has_many :activities, :foreign_key => :person_id
-      has_many :work_days, :foreign_key => :person_id
+      has_many :activities, :foreign_key => :person_id, :dependent => :destroy
+      has_many :work_days, :foreign_key => :person_id, :dependent => :destroy
     end
 
     def latest_project

data/app/models/work_day.rb

@@ -54,6 +54,8 @@ class WorkDay < ActiveRecord::Base
       work_day = WorkDay.where(:person_id => employee.id, :date => day).first
       work_day ||= WorkDay.create(:person => employee, :date => day)
     end
+
+    work_day
   end
 
   # Get employment
@@ -91,7 +93,7 @@ class WorkDay < ActiveRecord::Base
   # Calculates hours worked by summing up duration of all logged
   # activities.
   def calculate_hours_worked
-    activities.where(:date => date).sum('duration')
+    person.activities.where(:date => date).sum('duration')
   end
 
   # Calculate accumulated overtime

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.19.4'
+  VERSION = '0.19.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 89
   prerelease: 
   segments: 
   - 0
   - 19
-  - 4
-  version: 0.19.4
+  - 5
+  version: 0.19.5
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-27 00:00:00 Z
+date: 2012-01-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -181,7 +181,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt