bookyt_projects 0.10.0 → 0.11.0

data/app/controllers/activities_controller.rb

@@ -6,14 +6,16 @@ class ActivitiesController < AuthorizedController
     if params[:activity]
       @activity = Activity.new(params[:activity])
     else
-      @activity = Activity.new(:when => Date.today)
+      @activity = Activity.new(:date => Date.today)
     end
 
-    # Nested resources support
-    @activity.project_id ||= params[:project_id] if params[:project_id]
-    # Educated guessing of defaults
+    # Educated guessing of person
     @activity.person = current_user.person if current_user
 
+    # Educated guessing of project
+    @activity.project_id ||= params[:project_id] if params[:project_id]
+    @activity.project_id ||= @activity.person.activities.order(:duration_to).last
+
     new!
   end
 

data/app/models/activity.rb

@@ -1,16 +1,18 @@
 class Activity < ActiveRecord::Base
+  # Associations
   belongs_to :project
   belongs_to :person
+  validates :project, :presence => true, :allow_blank => false
+  validates :person,  :presence => true, :allow_blank => false
   
   attr_accessor :minutes, :hours
   
-  validates :project, :presence => true, :allow_blank => false
-  validates :person,  :presence => true, :allow_blank => false
-  validates_date :when, :allow_nil => false, :allow_blank => false
-  validates :from,    :presence => true, :unless => :hours_minutes
-  validates :to,      :presence => true, :unless => :hours_minutes
-  validates_numericality_of :hours,   :only_integer => true, :unless => :from
-  validates_numericality_of :minutes, :only_integer => true, :unless => :from
+  # Duration
+  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
+  validates_numericality_of :hours,   :only_integer => true, :unless => :duration_from
+  validates_numericality_of :minutes, :only_integer => true, :unless => :duration_from
   
   before_save :calculate_hours
   
@@ -20,14 +22,14 @@ class Activity < ActiveRecord::Base
   
   def calculate_hours
     unless hours.empty? or minutes.empty?
-      self.from = DateTime.now
-      self.to = self.from + hours.to_i.hours + minutes.to_i.minutes
+      self.duration_from = DateTime.now
+      self.duration_to = self.duration_from + hours.to_i.hours + minutes.to_i.minutes
     end
   end
   
   # The duration of the task in minutes
   def duration
-    minutes = (to.to_f - from.to_f).to_i / 60
+    minutes = (duration_to.to_f - duration_from.to_f).to_i / 60
     
     minutes < 0 ? 1.day.to_i + minutes : minutes
   end

data/app/models/bookyt_projects/{employee.rb → person.rb}

@@ -1,5 +1,5 @@
 module BookytProjects
-  module Employee
+  module Person
     extend ActiveSupport::Concern
 
     included do

data/app/models/work_day.rb

@@ -16,7 +16,7 @@ class WorkDay
   end
 
   def hours_worked
-    employment.employee.activities.where(:when => date).to_a.sum(&:duration)
+    employment.employee.activities.where(:date => date).to_a.sum(&:duration)
   end
 
   def overtime

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

@@ -0,0 +1,7 @@
+%tr[activity]
+  %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/_form.html.haml

@@ -3,9 +3,9 @@
     = f.input :project, :as => :combobox
     = f.input :person, :as => :combobox
   = f.inputs do
-    = f.input :when, :as => :date_field, :required => true
-    = f.input :from, :as => :hour_field
-    = f.input :to, :as => :hour_field
+    = 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

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

@@ -1,14 +1,7 @@
 %table.list#activities_list
   %tr
-    - [:person, :when, :duration].each do |attr|
+    - [:person, :date, :duration].each do |attr|
       %th= t_attr(attr, Activity)
     %th.action-links
 
-  - collection.each do |task|
-    %tr
-      %td= task.person
-      %td= link_to task.when, task, {'data-href-container' => 'tr'}
-      %td= t('bookyt.projects.minutes', :duration => task.duration)
-      %td.action-links
-        = list_link_for(:edit, task)
-        = list_link_for(:delete, task)
+  = render collection

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

@@ -3,8 +3,8 @@
   = f.inputs do
     = f.input :name, :input_html => {'data-autofocus' => 'true'}
     = f.input :comment, :input_html => {:rows => 5}
-    = f.input :from, :as => :date_field
-    = f.input :to, :as => :date_field
+    = f.input :duration_from, :as => :date_field
+    = f.input :duration_to, :as => :date_field
     = f.input :project_state
     = f.input :client, :as => :combobox
   = f.buttons do

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

@@ -1,13 +1,16 @@
+.contextual
+  = contextual_link_to :new, Activity
+
 %h1= t_title
 
 %table.list
   %tr
     %th Datum
     %th Wochentag
-    %th Soll-Stunden
-    %th Stunden
-    %th Über-/Unterzeit
-    %th Saldo
+    %th.number Soll-Stunden
+    %th.number Stunden
+    %th.number Über-/Unterzeit
+    %th.number Saldo
 
   - overall_overtime = 0
   - @work_days.each do |day|
@@ -15,7 +18,7 @@
     %tr
       %td= day.date
       %td= l(day.date, :format => '%A')
-      %td= day.hours_due
-      %td= day.hours_worked
-      %td= day.overtime
-      %td= overall_overtime
+      %td.number= day.hours_due
+      %td.number= day.hours_worked
+      %td.number= day.overtime
+      %td.number= overall_overtime

data/config/locales/de.yml

@@ -9,8 +9,8 @@ de:
       project:
         name:             Bezeichnung
         comment:          Kommentar
-        from:             Von
-        to:               Bis
+        duration_from:    Begin
+        duration_to:      Ende
         project_state:    Status
         project_state_id: Status
         client:           Kunde
@@ -20,9 +20,9 @@ de:
       activity:
         person:           Person
         person_id:        Person
-        when:             Datum
-        from:             Von
-        to:               Bis
+        date:             Datum
+        duration_from:    Von
+        duration_to:      Bis
         duration:         Dauer
         hours:            Stunden
         minutes:          Minuten

data/db/migrate/20110909075128_create_project_states.rb

@@ -0,0 +1,9 @@
+class CreateProjectStates < ActiveRecord::Migration
+  def change
+    create_table :project_states do |t|
+      t.string :name
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20110909075220_create_projects.rb

@@ -0,0 +1,14 @@
+class CreateProjects < ActiveRecord::Migration
+  def change
+    create_table :projects do |t|
+      t.string :name
+      t.text :comment
+      t.date :from
+      t.date :to
+      t.integer :project_state_id
+      t.integer :client_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20110912071440_create_tasks.rb

@@ -0,0 +1,14 @@
+class CreateTasks < ActiveRecord::Migration
+  def change
+    create_table :tasks do |t|
+      t.date :when
+      t.datetime :from
+      t.datetime :to
+      t.integer :person_id
+      t.integer :project_id
+      t.string :comment
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20111010114218_rename_task_to_activity.rb

@@ -0,0 +1,5 @@
+class RenameTaskToActivity < ActiveRecord::Migration
+  def change
+    rename_table :tasks, :activities
+  end
+end

data/db/migrate/20111025090501_rename_duration_columns_in_projects_and_activities.rb

@@ -0,0 +1,10 @@
+class RenameDurationColumnsInProjectsAndActivities < ActiveRecord::Migration
+  def change
+    rename_column :activities, :when, :date
+    rename_column :activities, :from, :duration_from
+    rename_column :activities, :to, :duration_to
+
+    rename_column :projects, :from, :duration_from
+    rename_column :projects, :to, :duration_to
+  end
+end

data/lib/bookyt_projects/railtie.rb

@@ -3,8 +3,10 @@ require 'rails'
 
 module BookytProjects
   class Railtie < Rails::Engine
+    engine_name "bookyt_projects"
+
     config.to_prepare do
-      ::Employee.send :include, BookytProjects::Employee
+      ::Person.send :include, BookytProjects::Person
     end
   end
 end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 55
-  prerelease: 
+  hash: 51
+  prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-25 00:00:00 +02:00
+date: 2011-10-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -109,10 +109,11 @@ files:
 - app/controllers/projects_controller.rb
 - app/controllers/timesheets_controller.rb
 - app/models/activity.rb
-- app/models/bookyt_projects/employee.rb
+- app/models/bookyt_projects/person.rb
 - app/models/project.rb
 - app/models/project_state.rb
 - app/models/work_day.rb
+- app/views/activities/_activity.html.haml
 - app/views/activities/_form.html.haml
 - app/views/activities/_list.html.haml
 - app/views/project_states/_form.html.haml
@@ -124,6 +125,11 @@ files:
 - config/boot.rb
 - config/locales/de.yml
 - config/routes.rb
+- db/migrate/20110909075128_create_project_states.rb
+- db/migrate/20110909075220_create_projects.rb
+- db/migrate/20110912071440_create_tasks.rb
+- db/migrate/20111010114218_rename_task_to_activity.rb
+- db/migrate/20111025090501_rename_duration_columns_in_projects_and_activities.rb
 - lib/bookyt_projects.rb
 - lib/bookyt_projects/navigation.rb
 - lib/bookyt_projects/railtie.rb
@@ -160,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Project management plugin for bookyt