bookyt_projects 0.20.0 → 0.21.0

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

@@ -1,5 +1,7 @@
-%tr[activity]
+- tr_params = {}
+- tr_params = {:rel => 'popover', 'data-placement' => 'bottom', 'data-content' => activity.remarks, 'data-original-title' => t_attr(:remarks, Activity)} if activity.remarks.present?
+%tr[activity]{tr_params}
   %td= link_to activity.date, activity, {'data-href-container' => 'tr'}
-  %td= activity.person
-  %td= activity.project
-  %td= t('bookyt.projects.hours', :duration => "%0.2f" % activity.duration)
+  %td= link_to activity.person, activity.person
+  %td= link_to activity.project, activity.project
+  %td.right= t('bookyt.projects.hours', :duration => "%0.2f" % activity.duration)

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

@@ -1,9 +1,16 @@
 %table.table.table-striped.activities.collection
   %thead
     %tr
-      - [:date, :person, :project, :duration].each do |attr|
+      - [:date, :person, :project].each do |attr|
         %th= t_attr(attr, Activity)
+      %th.right= t_attr(:duration, Activity)
   %tbody
     = render collection
+  %tfoot
+    %tr
+      %th= "#{collection.minimum(:date)} - #{collection.maximum(:date)}"
+      %th
+      %th
+      %th.right= t('bookyt.projects.hours', :duration => "%0.2f" % collection.sum(:duration))
 
-= render 'sidebar'
+= render 'activities/sidebar'

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

@@ -1,7 +1,10 @@
-- @activities = resource.activities
+- @activities = resource.activities.where(:date => current_month_period(:by_period)).by_project_id(params[:by_project_id])
 - if @activities.empty?
   = boot_alert(t('activities.alerts.empty'))
   .activities.collection
 
 - else
-  = render 'activities/list', :collection => resource.activities unless @activities.empty?
+  = render 'activities/list', :collection => @activities unless @activities.empty?
+
+.form-actions
+  = icon_link_to :new, new_person_activity_path(resource)

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

@@ -2,7 +2,4 @@
 
 .row-fluid
   .span12
-    = render 'timesheets/show', :work_days => @employee.work_days.where(:date => current_month_period(:time_sheet_period))
-
-- content_for :sidebar do
-  = render 'timesheets/pager'
+    = render 'timesheets/show', :work_days => @employee.work_days.where(:date => current_month_period(:by_period))

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

@@ -1,10 +1,10 @@
 .tabbable
   %ul.nav.nav-tabs
-    %li.active= link_to 'Details', '#details', {:data => {:toggle => 'tab'}}
-    %li= link_to 'Stundenrapport', '#activities', {:data => {:toggle => 'tab'}}
+    %li.active= link_to 'Details', '#tab-details', {:data => {:toggle => 'tab'}}
+    %li= link_to t_title(:list, Activity), '#tab-activities', {:data => {:toggle => 'tab'}}
 
 .tab-content
-  #details.tab-pane.active
+  #tab-details.tab-pane.active
     = render "form"
-  #activities.tab-pane
+  #tab-activities.tab-pane
     = render 'show_activities'

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

@@ -1,10 +1,10 @@
-- @activities = resource.activities
+- @activities = resource.activities.where(:date => current_month_period(:by_period))
 - if @activities.empty?
   = boot_alert(t('activities.alerts.empty'))
   .activities.collection
 
 - else
-  = render 'activities/list', :collection => @project.activities unless @activities.empty?
+  = render 'activities/list', :collection => @activities unless @activities.empty?
 
-.contextual
+.form-actions
   = icon_link_to :new, new_project_activity_path(resource)

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

@@ -12,9 +12,9 @@
       %tr{tr_params}
         %td
           - if day.activities.empty?
-            = 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'
+            = 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'
           - else
-            = 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'
+            = 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
           %span.strong= "%0.2f" % day.hours_worked
           = "(%0.2f)" % day.hours_due

data/config/locales/bookyt_projects.de.yml

@@ -68,3 +68,7 @@ de:
 
   time_sheet_period:
     title:    Zeitraum
+
+  # Filters
+  by_project_id:
+    title:    Projekt

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 75
   prerelease: 
   segments: 
   - 0
-  - 20
+  - 21
   - 0
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-15 00:00:00 Z
+date: 2012-04-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -128,7 +128,6 @@ files:
 - app/views/projects/_show.html.haml
 - app/views/projects/_show_activities.html.haml
 - app/views/timesheets/_activities_popover.html.haml
-- app/views/timesheets/_pager.html.haml
 - app/views/timesheets/_show.html.haml
 - app/views/timesheets/index.html.haml
 - config/application.rb
@@ -183,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt

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

@@ -1,6 +0,0 @@
-- filter_name = :time_sheet_period
-- params[filter_name] ||= {"from" => Date.today.beginning_of_month.to_s(:db), "to" => Date.today.end_of_month.to_s(:db)}
-
-- content_for :sidebar do
-  - filters = month_periods
-  = boot_nav_filter(filter_name, filters)