bookyt_projects 0.11.1 → 0.11.2

data/app/controllers/activities_controller.rb

@@ -1,6 +1,8 @@
 class ActivitiesController < AuthorizedController
   belongs_to :project, :optional => true
 
+  has_scope :by_date
+
   def new
     # Allow callers specifying defaults
     if params[:activity]

data/app/controllers/batch_activities_controller.rb

@@ -0,0 +1,22 @@
+class BatchActivitiesController < ApplicationController
+  def new
+    # Allow callers specifying defaults
+    @date = params[:date] || Date.today
+
+    # TODO: only employees currently working for tenant
+    people = current_tenant.company.employees
+
+    @activities = people.map{|person|
+      person.activities.build(:project => person.latest_project)
+    }
+  end
+
+  def create
+    date = Date.parse(params[:batch_activities][:date])
+    @activites = params[:activities].collect{|activity_params|
+      Activity.create(activity_params.merge(:date => date, :minutes => "0"))
+    }
+
+    redirect_to activities_path(:by_date => date.to_s(:db))
+  end
+end

data/app/models/activity.rb

@@ -5,9 +5,12 @@ class Activity < ActiveRecord::Base
   validates :project, :presence => true, :allow_blank => false
   validates :person,  :presence => true, :allow_blank => false
   
-  attr_accessor :minutes, :hours
-  
+  # Scopes
+  scope :by_date, lambda {|value| where(:date => value)}
+
   # Duration
+  attr_accessor :minutes, :hours
+
   validates_date :date, :allow_nil => false, :allow_blank => false
   validates :duration_from,    :presence => true, :unless => :hours_minutes
   validates :duration_to,      :presence => true, :unless => :hours_minutes

data/app/models/bookyt_projects/person.rb

@@ -5,5 +5,11 @@ module BookytProjects
     included do
       has_many :activities, :foreign_key => :person_id
     end
+
+    module InstanceMethods
+      def latest_project
+        activities.order(:duration_to).last.try(:project)
+      end
+    end
   end
 end

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

@@ -2,13 +2,16 @@
   = f.inputs do
     = f.input :project, :as => :combobox
     = f.input :person, :as => :combobox
+
   = f.inputs do
     = f.input :date, :as => :date_field, :required => true
     = f.input :duration_from, :as => :hour_field
     = f.input :duration_to, :as => :hour_field
     = f.input :hours
     = f.input :minutes
+
   = f.inputs do
     = f.input :comment
+
   = f.buttons do
     = f.commit_button

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

@@ -0,0 +1,25 @@
+= semantic_form_for :batch_activities, :url => batch_activities_path do |f|
+  = f.inputs do
+    = f.input :date, :as => :date_field, :label => t('attributes.date'), :input_html => {:value => @date}
+
+  = f.inputs do
+    %table{:style => 'width: 100%'}
+      %thead
+        %th= t_attr :person, Activity
+        %th= t_attr :project, Activity
+        %th{:style => 'width: 5em'}= t_attr :duration, Activity
+        %th= t_attr :comment, Activity
+
+      %tbody
+      - for activity in @activities
+        %tr
+          = fields_for 'activities[]', activity do |a|
+            %td
+              = link_to activity.person, activity.person
+              = a.hidden_field :person_id
+            %td= a.select :project_id, Project.all.map{|project| [project.to_s, project.id]}, {:prompt => t_select_prompt(Project)}
+            %td= a.text_field :hours
+            %td= a.text_field :comment
+
+  = f.buttons do
+    = f.commit_button

data/app/views/batch_activities/new.html.haml

@@ -0,0 +1,3 @@
+%h2= t_title
+
+= render 'form'

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

@@ -1,20 +1,10 @@
-- @attributes ||= collection.first.attribute_names - ['id', 'created_at', 'updated_at']
 %table.list{:class => "#{collection.first.class.to_s.downcase.pluralize} collection"}
   %thead
     %tr
-      - @attributes.each do |field|
-        %th= t_attr field, collection.first.class
+      %th= t_attr :name
+      %th= t_attr :client
+      %th= t_attr :duration
       %th.action-links
 
-  - @attributes = @attributes - ['name', 'client_id', 'project_state_id']
   %tbody
-    - collection.each do |r|
-      %tr
-        %td= link_to r.name, r, {'data-href-container' => 'tr'}
-        - @attributes.each do |field|
-          %td= r.send(field) if r.respond_to?(field)
-        %td= r.client
-        %td= r.project_state
-        %td.action-links
-          = list_link_for(:edit, r)
-          = list_link_for(:delete, r)
+    =render collection

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

@@ -0,0 +1,7 @@
+%tr
+  %td= link_to project.name, project, {'data-href-container' => 'tr'}
+  %td= project.client
+  %td= [project.duration_from, project.duration_to].compact.join(' - ')
+  %td.action-links
+    = list_link_for(:edit, project)
+    = list_link_for(:delete, project)

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

@@ -5,12 +5,12 @@
 
 %table.list
   %tr
-    %th Datum
+    %th= t_attr :date, Activity
     %th Wochentag
-    %th.number Soll-Stunden
-    %th.number Stunden
-    %th.number Über-/Unterzeit
-    %th.number Saldo
+    %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|

data/config/locales/{de.yml → bookyt_projects.de.yml}

@@ -5,6 +5,7 @@ de:
       project_state:      Projektstatus
       activity:           Aktivität
       timesheet:          Stundenrapport
+      batch_activity:     Tagesrapport
     attributes:
       project:
         name:             Bezeichnung
@@ -30,10 +31,17 @@ de:
         project_id:       Projekt
         comment:          Kommentar
         time:             Zeitraum
+        hours_due:        Soll-Stunden
+        hours_worked:     Arbeitsstunden
+        overtime:         Über-/Unterzeit
+        overall_overtime: Saldo
 
   bookyt:
     projects:
       minutes:            "%{duration} Minuten"
+    main_navigation:
+      salaries: Löhne
+      projects: Projekte
 
   # Titles
   timesheets:

data/config/routes.rb

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

data/lib/bookyt_projects/navigation.rb

@@ -1,12 +1,12 @@
 module BookytProjects
   module Navigation
     def setup_bookyt_projects(navigation)
-      navigation.item :projects, t_model(Project), projects_path, :if => Proc.new { user_signed_in? } do |projects|
+      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 :project_states, t_model(ProjectState), project_states_path, :highlights_on => /\/project_states($|\/([0-9]*|new)($|\/.*))/ 
       end
-      navigation.item :capture_hours, t('activities.new.title'), new_activity_path, :if => Proc.new { user_signed_in? }
     end
   end
 end

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 11
-  - 1
-  version: 0.11.1
+  - 2
+  version: 0.11.2
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 Z
+date: 2012-01-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -104,6 +104,7 @@ extra_rdoc_files:
 files: 
 - app/assets/stylesheets/bookyt_projects.sass
 - app/controllers/activities_controller.rb
+- app/controllers/batch_activities_controller.rb
 - app/controllers/project_states_controller.rb
 - app/controllers/projects_controller.rb
 - app/controllers/timesheets_controller.rb
@@ -115,14 +116,17 @@ files:
 - app/views/activities/_activity.html.haml
 - app/views/activities/_form.html.haml
 - app/views/activities/_list.html.haml
+- app/views/batch_activities/_form.html.haml
+- app/views/batch_activities/new.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/timesheets/index.html.haml
 - config/application.rb
 - config/boot.rb
-- config/locales/de.yml
+- config/locales/bookyt_projects.de.yml
 - config/routes.rb
 - db/migrate/20110909075128_create_project_states.rb
 - db/migrate/20110909075220_create_projects.rb
@@ -164,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.12
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt