bookyt_projects 0.19.23 → 0.20.0

data/app/controllers/activities_controller.rb

@@ -3,6 +3,8 @@ class ActivitiesController < AuthorizedController
   belongs_to :person, :optional => true
 
   has_scope :by_date
+  has_scope :by_period, :using => [:from, :to]
+  has_scope :by_project_id
 
   def new
     # Allow callers specifying defaults

data/app/models/activity.rb

@@ -7,6 +7,16 @@ class Activity < ActiveRecord::Base
   
   # Scopes
   scope :by_date, lambda {|value| where(:date => value)}
+  scope :by_period, lambda {|value|
+    if value.is_a? Array
+      where(:date => (value[0]..value[1]))
+    else
+      where(:date => value)
+    end
+  }
+  scope :by_project_id, lambda {|value|
+    where(:project_id => value) if value.present?
+  }
 
   # Sorting
   default_scope order("date DESC")

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

@@ -1,4 +1,5 @@
 %tr[activity]
-  %td= activity.person
   %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)

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

@@ -1,7 +1,9 @@
 %table.table.table-striped.activities.collection
   %thead
     %tr
-      - [:person, :date, :duration].each do |attr|
+      - [:date, :person, :project, :duration].each do |attr|
         %th= t_attr(attr, Activity)
   %tbody
     = render collection
+
+= render 'sidebar'

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

@@ -0,0 +1,10 @@
+- filter_name = :by_period
+- content_for :sidebar do
+  - filters = month_periods
+  = boot_nav_filter(filter_name, [{:title => t('bookyt.all'), :value => nil}] + filters)
+
+
+- filter_name = :by_project_id
+- content_for :sidebar do
+  - filters = Project.all.collect{|project| {:title => project.to_s, :value => project.id} }
+  = boot_nav_filter(filter_name, [{:title => t('bookyt.all'), :value => nil}] + filters)

data/config/locales/bookyt_projects.de.yml

@@ -53,6 +53,8 @@ de:
       title: Zeit erfassen
     list:
       title: Aktivitäten
+    index:
+      title: Aktivitäten
     timesheet:
       title: Stundenrapport
 

data/lib/bookyt_projects/navigation.rb

@@ -5,6 +5,7 @@ module BookytProjects
         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 :activities, t_title(:index, Activity), activities_path
         projects.item :capture_hours, t('activities.new.title'), new_batch_activity_path
       end
     end

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 125
+  hash: 79
   prerelease: 
   segments: 
   - 0
-  - 19
-  - 23
-  version: 0.19.23
+  - 20
+  - 0
+  version: 0.20.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-12 00:00:00 Z
+date: 2012-04-15 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -116,6 +116,7 @@ files:
 - app/views/activities/_activity.html.haml
 - app/views/activities/_form.html.haml
 - app/views/activities/_list.html.haml
+- app/views/activities/_sidebar.html.haml
 - app/views/batch_activities/_form.html.haml
 - app/views/batch_activities/new.html.haml
 - app/views/people/_show_activities.html.haml
@@ -182,7 +183,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