bookyt_projects 0.9.0 → 0.10.0

data/app/controllers/timesheets_controller.rb

@@ -0,0 +1,9 @@
+class TimesheetsController < ApplicationController
+  def index
+    @employee = Employee.find(params[:employee_id])
+    @employment = @employee.employments.current
+
+    days = (Date.today.beginning_of_month..Date.today.end_of_month).to_a
+    @work_days = days.map{|day| WorkDay.new(day, @employment)}
+  end
+end

data/app/models/bookyt_projects/employee.rb

@@ -0,0 +1,9 @@
+module BookytProjects
+  module Employee
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :activities, :foreign_key => :person_id
+    end
+  end
+end

data/app/models/work_day.rb

@@ -0,0 +1,25 @@
+class WorkDay
+  attr_accessor :date, :employment
+
+  def initialize(date, employment)
+    @date       = date
+    @employment = employment
+  end
+  
+  def hours_due
+    case date.wday
+      when 6, 0
+        0.0
+      else
+        employment.daily_workload
+    end
+  end
+
+  def hours_worked
+    employment.employee.activities.where(:when => date).to_a.sum(&:duration)
+  end
+
+  def overtime
+    hours_worked - hours_due
+  end
+end

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

@@ -2,7 +2,7 @@
   = render 'form'
 
 .contextual
-  = icon_link_to :new, new_project_activity_path(resource), :remote => true
+  = icon_link_to :new, new_project_activity_path(resource)
 %h2= t_title :index, Activity
 
 = render 'activities/list', :collection => @project.activities

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

@@ -0,0 +1,21 @@
+%h1= t_title
+
+%table.list
+  %tr
+    %th Datum
+    %th Wochentag
+    %th Soll-Stunden
+    %th Stunden
+    %th Über-/Unterzeit
+    %th Saldo
+
+  - overall_overtime = 0
+  - @work_days.each do |day|
+    - overall_overtime += day.overtime
+    %tr
+      %td= day.date
+      %td= l(day.date, :format => '%A')
+      %td= day.hours_due
+      %td= day.hours_worked
+      %td= day.overtime
+      %td= overall_overtime

data/config/routes.rb

@@ -4,7 +4,7 @@ Rails.application.routes.draw do
   end
   resources :project_states
   resources :activities
-  
+
   resources :employees do
     resources :timesheets
   end

data/lib/bookyt_projects/railtie.rb

@@ -1,8 +1,10 @@
 require 'bookyt_projects'
 require 'rails'
 
-module BookytProject
+module BookytProjects
   class Railtie < Rails::Engine
-    
+    config.to_prepare do
+      ::Employee.send :include, BookytProjects::Employee
+    end
   end
 end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.9.0'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
+  - 10
   - 0
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-24 00:00:00 +02:00
+date: 2011-10-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -107,16 +107,19 @@ files:
 - app/controllers/activities_controller.rb
 - app/controllers/project_states_controller.rb
 - app/controllers/projects_controller.rb
+- app/controllers/timesheets_controller.rb
 - app/models/activity.rb
+- app/models/bookyt_projects/employee.rb
 - app/models/project.rb
 - app/models/project_state.rb
+- app/models/work_day.rb
 - app/views/activities/_form.html.haml
 - app/views/activities/_list.html.haml
-- app/views/activities/new.js.erb
 - app/views/project_states/_form.html.haml
 - app/views/projects/_form.html.haml
 - app/views/projects/_list.html.haml
 - app/views/projects/_show.html.haml
+- app/views/timesheets/index.html.haml
 - config/application.rb
 - config/boot.rb
 - config/locales/de.yml

data/app/views/activities/new.js.erb

@@ -1,10 +0,0 @@
-$('#new_<%= resource.class.name.underscore %>').remove();
-var form = '<div id="new_activity_dialog"><%=j render "form" %></div>';
-$('#<%= resource.class.name.tableize %>_list').before(form);
-$('#new_activity_dialog').dialog({
-  modal:    true,
-  minWidth: 580,
-  title:    '<%=j t_title :edit, Activity %>'
-});
-
-initializeBehaviours();