bookyt_projects 0.13.0 → 0.14.0

data/app/models/activity.rb

@@ -2,6 +2,7 @@ class Activity < ActiveRecord::Base
   # Associations
   belongs_to :project
   belongs_to :person
+  belongs_to :work_day
   validates :project, :presence => true, :allow_blank => false
   validates :person,  :presence => true, :allow_blank => false
   
@@ -13,6 +14,8 @@ class Activity < ActiveRecord::Base
 
   validates_date :date, :allow_nil => false, :allow_blank => false
 
+  before_save :create_work_day
+
   def duration=(value)
     if value.match(/:/)
       hours, minutes = value.split(':')
@@ -25,4 +28,13 @@ class Activity < ActiveRecord::Base
   def to_s
     "%s: %0.2fh" % [project.name, duration]
   end
+
+  private
+
+  def create_work_day
+    work_day = WorkDay.where(:person_id => person_id, :date => date).first
+    work_day ||= WorkDay.create(:person_id => person_id, :date => date)
+
+    self.work_day = work_day
+  end
 end

data/app/models/work_day.rb

@@ -1,11 +1,27 @@
-class WorkDay
-  attr_accessor :date, :employee
+class WorkDay < ActiveRecord::Base
 
-  def initialize(employee, date)
-    @date     = date
-    @employee = employee
+  belongs_to :person
+  has_many :activities
+
+  before_create :current_daily_workload
+
+  def current_daily_workload
+    unless person && person.employments.current && person.employments.current.daily_workload
+      self.daily_workload = 0.0
+    else
+      self.daily_workload = person.employments.current(self.date).daily_workload
+    end
+  end
+
+  def self.create_for_current_employment(employee)
+    if employee.employments.current
+      range = employee.employments.current.duration_from..Date.today
+      range.each do |date|
+        WorkDay.create(:person => employee, :date => date)
+      end
+    end
   end
-  
+
   # Get WorkDay instances for a range
   #
   # Returns an array of WorkDay instances. You probably want
@@ -15,7 +31,15 @@ class WorkDay
   #   :employee: Employee to build WorkDay instances for
   #   :range:    Date range giving first and last day
   def self.for_range(employee, range)
-    range.to_a.map{|day| WorkDay.new(employee, day)}
+    self.create_for_current_employment(employee)
+
+    range.inject([]) do |out, day|
+      work_day = WorkDay.where(:person_id => employee.id, :date => day).first
+      work_day ||= WorkDay.create(:person => employee, :date => day)
+      out << work_day
+
+      out
+    end
   end
 
   # Get WorkDay instances for a month
@@ -33,16 +57,6 @@ class WorkDay
     self.for_range(employee, start_date..end_date)
   end
 
-  # Helper to access daily workload
-  #
-  # Returns 0.0 if no current daily_workload can be determined
-  def daily_workload
-    # Guard
-    return 0.0 unless employee && employee.employments.current && employee.employments.current.daily_workload
-
-    employee.employments.current.daily_workload
-  end
-
   # Working hours for this day
   def hours_due
     case date.wday
@@ -60,7 +74,7 @@ class WorkDay
   # Calculates hours worked by summing up duration of all logged
   # activities.
   def hours_worked
-    employee.activities.where(:date => date).to_a.sum(&:duration)
+    activities.where(:date => date).to_a.sum(&:duration)
   end
 
   # Overtime
@@ -69,4 +83,8 @@ class WorkDay
   def overtime
     hours_worked - hours_due
   end
+
+  def overall_overtime
+    WorkDay.where(:person_id => person.id).where('date <= ?', date).to_a.sum(&:overtime)
+  end
 end

data/app/views/timesheets/_show.html.haml

@@ -8,13 +8,12 @@
   - overall_overtime = 0
   - WorkDay.for_month(@employee).each do |day|
     - overall_overtime += day.overtime
-    - activities = @employee.activities.where(:date => day.date)
     - tr_params = {:class => work_day_classes(day)}
-    - tr_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/activities_popover', :activities => activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless activities.empty?
+    - tr_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/activities_popover', :activities => day.activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless day.activities.empty?
     %tr{tr_params}
       %td= link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(@employee, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
       %td.number
         %span.strong= "%0.2f" % day.hours_worked
         = "(%0.2f)" % day.hours_due
       %td.number.overtime.strong= "%0.2f" % day.overtime
-      %td.number.overall-overtime.strong= "%0.2f" % overall_overtime
+      %td.number.overall-overtime.strong= "%0.2f" % day.overall_overtime

data/db/migrate/20120118131814_create_work_days.rb

@@ -0,0 +1,11 @@
+class CreateWorkDays < ActiveRecord::Migration
+  def change
+    create_table :work_days do |t|
+      t.integer :person_id
+      t.date    :date
+      t.decimal :daily_workload, :precision => 10, :scale => 2
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20120118140839_add_activities_to_work_day.rb

@@ -0,0 +1,5 @@
+class AddActivitiesToWorkDay < ActiveRecord::Migration
+  def change
+    add_column :activities, :work_day_id, :integer
+  end
+end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.13.0'
+  VERSION = '0.14.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 43
+  hash: 39
   prerelease: 
   segments: 
   - 0
-  - 13
+  - 14
   - 0
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-17 00:00:00 Z
+date: 2012-01-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -142,6 +142,8 @@ files:
 - db/migrate/20120117070747_rename_comment_columns_to_remarks.rb
 - db/migrate/20120117075541_use_single_duration_field.rb
 - db/migrate/20120117080212_use_decimal_for_activity_duration.rb
+- db/migrate/20120118131814_create_work_days.rb
+- db/migrate/20120118140839_add_activities_to_work_day.rb
 - lib/bookyt_projects.rb
 - lib/bookyt_projects/navigation.rb
 - lib/bookyt_projects/railtie.rb