bookyt_projects 0.19.8 → 0.19.9

data/app/controllers/timesheets_controller.rb

@@ -1,5 +1,8 @@
 class TimesheetsController < ApplicationController
   def index
     @employee = Employee.find(params[:employee_id])
+    WorkDay.create_or_update_upto(@employee, Date.today.end_of_month)
+    range = Date.today.beginning_of_month..Date.today.end_of_month
+    @work_days = @employee.work_days.where(:date => range)
   end
 end

data/app/views/people/_show_timesheet.html.haml

@@ -1 +1,9 @@
-= render 'timesheets/show'
+- WorkDay.create_or_update_upto(@employee, Date.today.end_of_month)
+
+.row
+  .span8
+    - range = Date.parse('2012-01-01')..Date.parse('2012-01-31')
+    = render 'timesheets/show', :work_days => @employee.work_days.where(:date => range)
+  .span8
+    - range = Date.today.beginning_of_month..Date.today.end_of_month
+    = render 'timesheets/show', :work_days => @employee.work_days.where(:date => range)

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

@@ -1,3 +1,5 @@
+%h3= "%s - %s" % [work_days.first.date, work_days.last.date]
+
 %table.condensed-table.span8
   %tr
     %th= t_attr :date, Activity
@@ -5,17 +7,15 @@
     %th.right= t_attr :overtime, Activity
     %th.right= t_attr :overall_overtime, Activity
 
-  - WorkDay.create_or_update_upto(@employee, Date.today.end_of_month)
-  - range = Date.today.beginning_of_month..Date.today.end_of_month
-  - @employee.work_days.where(:date => range).each do |day|
+  - work_days.each do |day|
     - tr_params = {:class => work_day_classes(day)}
     - 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
         - if day.activities.empty?
-          = link_to l(day.date, :format => '%a, %d.%m.%Y'), new_activity_path(:activity => {:person_id => @employee.id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
+          = link_to l(day.date, :format => '%a, %d.%m.%Y'), new_activity_path(:activity => {:person_id => day.person_id, :date => day.date.to_s(:db)}), 'data-href-container' => 'tr'
         - else
-          = 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'
+          = link_to l(day.date, :format => '%a, %d.%m.%Y'), person_activities_path(day.person, :by_date => day.date.to_s(:db)), 'data-href-container' => 'tr'
       %td.right
         %span.strong= "%0.2f" % day.hours_worked
         = "(%0.2f)" % day.hours_due

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

@@ -4,4 +4,4 @@
 .page-header
   %h1= t_title
 
-= render 'show'
+= render 'show', :work_days => @work_days

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: 
   segments: 
   - 0
   - 19
-  - 8
-  version: 0.19.8
+  - 9
+  version: 0.19.9
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -181,7 +181,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