bookyt_projects 0.19.7 → 0.19.8

data/app/models/activity.rb

@@ -8,6 +8,9 @@ class Activity < ActiveRecord::Base
   # Scopes
   scope :by_date, lambda {|value| where(:date => value)}
 
+  # Sorting
+  default_scope order("date DESC")
+
   # Duration
   validates :duration, :presence => true, :format => {:with => /[0-9]{1,2}([:.][0-9]{1,2})/}
 

data/app/models/work_day.rb

@@ -10,6 +10,11 @@ class WorkDay < ActiveRecord::Base
   # Order
   default_scope order(:date)
 
+  # String
+  def to_s
+    "%s %s: %s/%s" % [date, person, hours_worked, hours_due]
+  end
+
   # Calculations
   default_scope select('work_days.*, hours_worked - hours_due AS overtime')
 
@@ -42,24 +47,6 @@ class WorkDay < ActiveRecord::Base
     end
   end
 
-  # Get WorkDay instances for a range
-  #
-  # Returns an array of WorkDay instances. You probably want
-  # to feed it a first day of month kind of starting_date.
-  #
-  # params:
-  #   :employee: Employee to build WorkDay instances for
-  #   :range:    Date range giving first and last day
-  def self.build_or_update(employee, date)
-    self.create_for_current_employment(employee)
-    range.collect do |day|
-      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
   #
   # Lookup the employment for this day.
@@ -100,6 +87,6 @@ class WorkDay < ActiveRecord::Base
 
   # Calculate accumulated overtime
   def overall_overtime
-    WorkDay.where('date <= ?', date).sum('hours_worked - hours_due')
+    person.work_days.where('date <= ?', date).sum('hours_worked - hours_due')
   end
 end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.19.7'
+  VERSION = '0.19.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 67
   prerelease: 
   segments: 
   - 0
   - 19
-  - 7
-  version: 0.19.7
+  - 8
+  version: 0.19.8
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-30 00:00:00 Z
+date: 2012-02-01 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails