bookyt_projects 0.21.0 → 1.0.0

data/app/controllers/activities_controller.rb

@@ -1,6 +1,7 @@
 class ActivitiesController < AuthorizedController
   belongs_to :project, :optional => true
   belongs_to :person, :optional => true
+  belongs_to :employee, :optional => true
 
   has_scope :by_date
   has_scope :by_period, :using => [:from, :to]
@@ -15,16 +16,21 @@ class ActivitiesController < AuthorizedController
     end
 
     # Educated guessing of person
+    @activity.person ||= Person.find(params[:employee_id]) if params[:employee_id]
+    @activity.person ||= Person.find(params[:person_id]) if params[:person_id]
     @activity.person ||= current_user.person if current_user
 
     # Educated guessing of project
     @activity.project_id ||= params[:project_id] if params[:project_id]
-    @activity.project_id ||= @activity.person.latest_project.id
+    @activity.project_id ||= @activity.person.latest_project.try(:id)
 
     new!
   end
 
   def create
-    create! { @activity.project }
+    create! {
+      params = {:date => @activity.date.in(1.day).to_date, :project_id => @activity.project_id}
+      polymorphic_url([:new, parent, :activity].compact, :activity => params)
+    }
   end
 end

data/app/models/work_day.rb

@@ -90,6 +90,10 @@ class WorkDay < ActiveRecord::Base
 
   # Calculate accumulated overtime
   def overall_overtime
-    person.work_days.where('date <= ?', date).sum('hours_worked - hours_due')
+    if employment.hourly_paid?
+      person.work_days.where('date BETWEEN ? AND ?', date.beginning_of_month, date).sum('hours_worked - hours_due')
+    else
+      person.work_days.where('date <= ?', date).sum('hours_worked - hours_due')
+    end
   end
 end

data/app/views/activities/_form.html.haml

@@ -1,10 +1,10 @@
-= simple_form_for @activity do |f|
+= simple_form_for [parent, @activity].compact do |f|
   .row-fluid
     .span6= f.association :person, :as => :combobox
     .span6= f.association :project, :as => :combobox
   .row-fluid
+    .span6= f.input :duration, :as => :string, :input_html => {'data-autofocus' => true}
     .span6= f.input :date, :as => :date_field
-    .span6= f.input :duration, :as => :string
 
   .row-fluid
     .span12= f.input :remarks, :input_html => {:rows => 2}

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

@@ -12,7 +12,7 @@
       %tr{tr_params}
         %td
           - if day.activities.empty?
-            = link_to l(day.date, :format => '%d.%m.%Y, %a'), new_activity_path(:activity => {:person_id => day.person_id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
+            = link_to l(day.date, :format => '%d.%m.%Y, %a'), new_person_activity_path(day.person, :activity => {:date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
           - else
             = link_to l(day.date, :format => '%d.%m.%Y, %a'), person_activities_path(day.person, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
         %td.right

data/config/routes.rb

@@ -8,6 +8,7 @@ Rails.application.routes.draw do
 
   resources :employees do
     resources :timesheets
+    resources :activities
   end
 
   resources :people do

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.21.0'
+  VERSION = '1.0.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 75
+  hash: 23
   prerelease: 
   segments: 
+  - 1
   - 0
-  - 21
   - 0
-  version: 0.21.0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-16 00:00:00 Z
+date: 2012-04-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt