bookyt_projects 0.11.2 → 0.12.0

data/app/assets/stylesheets/bookyt_projects.sass

@@ -1,2 +1,20 @@
 #overview-capture_hours
-  display: none
+  display: none
+
+.strong
+  font-weight: bold
+
+// Timesheets
+tr
+  &.due_hours
+    background-color: #D1EED1 // block-message success
+  &.overtime
+    background-color: #DDF4FB // block-message info
+  &.undertime
+    background-color: #FDDFDE // block-message error
+  &.free, &.future
+    color: #BFBFBF // subtitle
+
+tr.future
+  td.overtime, td.overall-overtime
+    color: transparent

data/app/controllers/activities_controller.rb

@@ -1,5 +1,6 @@
 class ActivitiesController < AuthorizedController
   belongs_to :project, :optional => true
+  belongs_to :person, :optional => true
 
   has_scope :by_date
 

data/app/controllers/timesheets_controller.rb

@@ -1,9 +1,5 @@
 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/helpers/timesheet_helper.rb

@@ -0,0 +1,28 @@
+module TimesheetHelper
+  # Calculate classes for WorkDay rows
+  #
+  # We add a 0.5h margin when determine over/undertime.
+  # Days in the future get the 'future' class.
+  def work_day_classes(day)
+    # No classes for days in the future
+    return 'future' if day.date > Date.today
+
+    classes = []
+
+    # TODO: make a setting
+    # +/- 0.5h is good
+    margin = 0.5
+
+    if day.overtime > margin
+      classes << 'overtime'
+    elsif day.overtime < -margin
+      classes << 'undertime'
+    elsif day.hours_due == 0.0
+      classes << 'free'
+    else
+      classes << 'due_hours'
+    end
+
+    classes.join(' ')
+  end
+end

data/app/models/work_day.rb

@@ -1,24 +1,71 @@
 class WorkDay
-  attr_accessor :date, :employment
+  attr_accessor :date, :employee
 
-  def initialize(date, employment)
-    @date       = date
-    @employment = employment
+  def initialize(employee, date)
+    @date     = date
+    @employee = employee
   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.for_range(employee, range)
+    range.to_a.map{|day| WorkDay.new(employee, day)}
+  end
+
+  # Get WorkDay instances for a month
+  #
+  # params:
+  #   :employee:      Employee to build WorkDay instances for
+  #   :date_in_month: Any day in the requested month. Uses today by default.
+  def self.for_month(employee, date_in_month = nil)
+    # Assume today if no date given
+    date_in_month ||= Date.today
+
+    start_date = date_in_month.beginning_of_month
+    end_date   = date_in_month.end_of_month
+
+    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
       when 6, 0
+        # Saturday and sunday are off
         0.0
       else
-        employment.daily_workload
+        # Assume same working hours during the week
+        daily_workload
     end
   end
 
+  # Hours worked
+  #
+  # Calculates hours worked by summing up duration of all logged
+  # activities.
   def hours_worked
-    employment.employee.activities.where(:date => date).to_a.sum(&:duration)
+    employee.activities.where(:date => date).to_a.sum(&:duration)
   end
 
+  # Overtime
+  #
+  # Simply substract hours_due from hours_worked.
   def overtime
     hours_worked - hours_due
   end

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

@@ -2,6 +2,3 @@
   %td= activity.person
   %td= link_to activity.date, activity, {'data-href-container' => 'tr'}
   %td= t('bookyt.projects.minutes', :duration => activity.duration)
-  %td.action-links
-    = list_link_for(:edit, activity, :remote => true)
-    = list_link_for(:delete, activity)

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

@@ -2,6 +2,5 @@
   %tr
     - [:person, :date, :duration].each do |attr|
       %th= t_attr(attr, Activity)
-    %th.action-links
 
   = render collection

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

@@ -0,0 +1 @@
+= render 'activities/list', :collection => resource.activities

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

@@ -0,0 +1 @@
+= render 'timesheets/show'

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

@@ -1,11 +1,17 @@
 = semantic_form_for @project do |f|
   = f.semantic_errors
   = f.inputs do
-    = f.input :name, :input_html => {'data-autofocus' => 'true'}
-    = f.input :comment, :input_html => {:rows => 5}
-    = f.input :duration_from, :as => :date_field
-    = f.input :duration_to, :as => :date_field
-    = f.input :project_state
-    = f.input :client, :as => :combobox
+    .row
+      .span8
+        = f.input :name, :input_html => {'data-autofocus' => 'true'}
+        = f.input :duration_from, :as => :date_field
+        = f.input :client, :as => :combobox
+      .span8
+        = f.input :project_state
+        = f.input :duration_to, :as => :date_field
+    .row
+      .span16
+        = f.input :comment, :input_html => {:rows => 5, :class => 'span12'}
+
   = f.buttons do
     = f.commit_button

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

@@ -1,8 +1,7 @@
-.form-view
-  = render 'form'
+%ul.tabs
+  %li.active= link_to 'Details', '#details'
+  %li= link_to 'Stundenrapport', '#activities'
 
-.contextual
-  = icon_link_to :new, new_project_activity_path(resource)
-%h2= t_title :index, Activity
-
-= render 'activities/list', :collection => @project.activities
+.tab-content
+  #details.active= render "form"
+  #activities= render 'show_activities'

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

@@ -0,0 +1,5 @@
+.contextual
+  = icon_link_to :new, new_project_activity_path(resource)
+%h2= t_title :index, Activity
+
+= render 'activities/list', :collection => @project.activities

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

@@ -0,0 +1,3 @@
+- activities.each do |activity|
+  %h4= "#{activity.project.name}: #{activity.duration}"
+  %p= activity.comment

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

@@ -0,0 +1,20 @@
+%table.condensed-table.span8
+  %tr
+    %th= t_attr :date, Activity
+    %th.number= t_attr :working_hours, Activity
+    %th.number= t_attr :overtime, Activity
+    %th.number= t_attr :overall_overtime, Activity
+
+  - 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 'activities_popover', :activities => activities), 'data-original-title' => 'Aktivitäten', 'data-html' => 'true') unless 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.1f" % day.hours_worked
+        = "(%0.1f)" % day.hours_due
+      %td.number.overtime.strong= day.overtime
+      %td.number.overall-overtime.strong= overall_overtime

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

@@ -1,24 +1,7 @@
 .contextual
   = contextual_link_to :new, Activity
 
-%h1= t_title
+.page-header
+  %h1= t_title
 
-%table.list
-  %tr
-    %th= t_attr :date, Activity
-    %th Wochentag
-    %th.number= t_attr :hours_due, Activity
-    %th.number= t_attr :hours_worked, Activity
-    %th.number= t_attr :overtime, Activity
-    %th.number= t_attr :overall_overtime, Activity
-
-  - overall_overtime = 0
-  - @work_days.each do |day|
-    - overall_overtime += day.overtime
-    %tr
-      %td= day.date
-      %td= l(day.date, :format => '%A')
-      %td.number= day.hours_due
-      %td.number= day.hours_worked
-      %td.number= day.overtime
-      %td.number= overall_overtime
+= render 'show'

data/config/locales/bookyt_projects.de.yml

@@ -33,6 +33,7 @@ de:
         time:             Zeitraum
         hours_due:        Soll-Stunden
         hours_worked:     Arbeitsstunden
+        working_hours:    Stunden (Soll)
         overtime:         Über-/Unterzeit
         overall_overtime: Saldo
 
@@ -51,3 +52,7 @@ de:
   activities:
     new:
       title: Zeit erfassen
+    list:
+      title: Aktivitäten
+    timesheet:
+      title: Stundenrapport

data/config/routes.rb

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

data/lib/bookyt_projects/navigation.rb

@@ -2,9 +2,11 @@ module BookytProjects
   module Navigation
     def setup_bookyt_projects(navigation)
       navigation.item :projects, t('bookyt.main_navigation.projects'), projects_path, :if => Proc.new { user_signed_in? } do |projects|
-        projects.item :capture_hours, t('activities.new.title'), new_batch_activity_path
         projects.item :project_index, t_title(:index, Project), projects_path, :highlights_on => /\/(projects|activities)($|\/[0-9]*($|\/.*))/
         projects.item :new_project, t_title(:new, Project), new_project_path
+        projects.item :divider, "", :class => 'divider'
+        projects.item :capture_hours, t('activities.new.title'), new_batch_activity_path
+        projects.item :divider, "", :class => 'divider'
         projects.item :project_states, t_model(ProjectState), project_states_path, :highlights_on => /\/project_states($|\/([0-9]*|new)($|\/.*))/ 
       end
     end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 47
   prerelease: 
   segments: 
   - 0
-  - 11
-  - 2
-  version: 0.11.2
+  - 12
+  - 0
+  version: 0.12.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
+date: 2012-01-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -108,6 +108,7 @@ files:
 - app/controllers/project_states_controller.rb
 - app/controllers/projects_controller.rb
 - app/controllers/timesheets_controller.rb
+- app/helpers/timesheet_helper.rb
 - app/models/activity.rb
 - app/models/bookyt_projects/person.rb
 - app/models/project.rb
@@ -118,11 +119,16 @@ files:
 - app/views/activities/_list.html.haml
 - app/views/batch_activities/_form.html.haml
 - app/views/batch_activities/new.html.haml
+- app/views/people/_show_activities.html.haml
+- app/views/people/_show_timesheet.html.haml
 - app/views/project_states/_form.html.haml
 - app/views/projects/_form.html.haml
 - app/views/projects/_list.html.haml
 - app/views/projects/_project.html.haml
 - app/views/projects/_show.html.haml
+- app/views/projects/_show_activities.html.haml
+- app/views/timesheets/_activities_popover.html.haml
+- app/views/timesheets/_show.html.haml
 - app/views/timesheets/index.html.haml
 - config/application.rb
 - config/boot.rb
@@ -168,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt