bookyt_projects 0.12.0 → 0.13.0

data/app/controllers/activities_controller.rb

@@ -17,7 +17,7 @@ class ActivitiesController < AuthorizedController
 
     # Educated guessing of project
     @activity.project_id ||= params[:project_id] if params[:project_id]
-    @activity.project_id ||= @activity.person.activities.order(:duration_to).last
+    @activity.project_id ||= @activity.person.activities.order(:date).last
 
     new!
   end

data/app/controllers/batch_activities_controller.rb

@@ -14,7 +14,7 @@ class BatchActivitiesController < ApplicationController
   def create
     date = Date.parse(params[:batch_activities][:date])
     @activites = params[:activities].collect{|activity_params|
-      Activity.create(activity_params.merge(:date => date, :minutes => "0"))
+      Activity.create(activity_params.merge(:date => date))
     }
 
     redirect_to activities_path(:by_date => date.to_s(:db))

data/app/models/activity.rb

@@ -9,35 +9,20 @@ class Activity < ActiveRecord::Base
   scope :by_date, lambda {|value| where(:date => value)}
 
   # Duration
-  attr_accessor :minutes, :hours
+  validates :duration, :presence => true, :format => {:with => /[0-9]{1,2}([:.][0-9]{1,2})/}
 
   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
-  
-  def hours_minutes
-    minutes || hours
-  end
-  
-  def calculate_hours
-    unless hours.empty? or minutes.empty?
-      self.duration_from = DateTime.now
-      self.duration_to = self.duration_from + hours.to_i.hours + minutes.to_i.minutes
+
+  def duration=(value)
+    if value.match(/:/)
+      hours, minutes = value.split(':')
+      write_attribute(:duration, hours.to_i + BigDecimal.new(minutes) / 60)
+    else
+      write_attribute(:duration, value)
     end
   end
-  
-  # The duration of the task in minutes
-  def duration
-    minutes = (duration_to.to_f - duration_from.to_f).to_i / 60
-    
-    minutes < 0 ? 1.day.to_i + minutes : minutes
-  end
 
   def to_s
-    "#{duration} => #{person}"
+    "%s: %0.2fh" % [project.name, duration]
   end
 end

data/app/models/bookyt_projects/person.rb

@@ -8,7 +8,7 @@ module BookytProjects
 
     module InstanceMethods
       def latest_project
-        activities.order(:duration_to).last.try(:project)
+        activities.order(:date).last.try(:project)
       end
     end
   end

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

@@ -1,4 +1,4 @@
 %tr[activity]
   %td= activity.person
   %td= link_to activity.date, activity, {'data-href-container' => 'tr'}
-  %td= t('bookyt.projects.minutes', :duration => activity.duration)
+  %td= t('bookyt.projects.hours', :duration => "%0.2f" % activity.duration)

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

@@ -1,17 +1,14 @@
 = semantic_form_for @activity do |f|
   = f.inputs do
-    = f.input :project, :as => :combobox
-    = f.input :person, :as => :combobox
+    .row
+      .span8= f.input :person, :as => :combobox
+      .span8= f.input :project, :as => :combobox
+    .row
+      .span8= f.input :date, :as => :date_field
+      .span8= f.input :duration, :as => :string
 
-  = 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
+    .row
+      .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
 
   = f.buttons do
     = f.commit_button

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

@@ -8,7 +8,7 @@
         %th= t_attr :person, Activity
         %th= t_attr :project, Activity
         %th{:style => 'width: 5em'}= t_attr :duration, Activity
-        %th= t_attr :comment, Activity
+        %th= t_attr :remarks, Activity
 
       %tbody
       - for activity in @activities
@@ -18,8 +18,8 @@
               = 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
+            %td= a.text_field :duration
+            %td= a.text_field :remarks
 
   = f.buttons do
     = f.commit_button

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

@@ -11,7 +11,7 @@
         = f.input :duration_to, :as => :date_field
     .row
       .span16
-        = f.input :comment, :input_html => {:rows => 5, :class => 'span12'}
+        = f.input :remarks, :input_html => {:rows => 5, :class => 'span12'}
 
   = f.buttons do
     = f.commit_button

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

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

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

@@ -10,11 +10,11 @@
     - 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_params.merge!(:rel => 'popover', 'data-content' => h(render 'timesheets/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
+        %span.strong= "%0.2f" % day.hours_worked
+        = "(%0.2f)" % day.hours_due
+      %td.number.overtime.strong= "%0.2f" % day.overtime
+      %td.number.overall-overtime.strong= "%0.2f" % overall_overtime

data/config/locales/bookyt_projects.de.yml

@@ -39,7 +39,7 @@ de:
 
   bookyt:
     projects:
-      minutes:            "%{duration} Minuten"
+      hours:            "%{duration}h"
     main_navigation:
       salaries: Löhne
       projects: Projekte

data/db/migrate/20120117070747_rename_comment_columns_to_remarks.rb

@@ -0,0 +1,15 @@
+class RenameCommentColumnsToRemarks < ActiveRecord::Migration
+  def up
+    rename_column :projects, :comment, :remarks
+    rename_column :activities, :comment, :remarks
+
+    change_column :activities, :remarks, :text
+  end
+
+  def down
+    change_column :activities, :remarks, :string
+
+    rename_column :projects, :remarks, :comment
+    rename_column :activities, :remarks, :comment
+  end
+end

data/db/migrate/20120117075541_use_single_duration_field.rb

@@ -0,0 +1,8 @@
+class UseSingleDurationField < ActiveRecord::Migration
+  def up
+    add_column :activities, :duration, :datetime
+    
+    remove_column :activities, :duration_from
+    remove_column :activities, :duration_to
+  end
+end

data/db/migrate/20120117080212_use_decimal_for_activity_duration.rb

@@ -0,0 +1,8 @@
+class UseDecimalForActivityDuration < ActiveRecord::Migration
+  def up
+    change_column :activities, :duration, :decimal, :scale => 2, :precision => 4
+  end
+
+  def down
+  end
+end

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 43
   prerelease: 
   segments: 
   - 0
-  - 12
+  - 13
   - 0
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-16 00:00:00 Z
+date: 2012-01-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -139,6 +139,9 @@ files:
 - 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
+- db/migrate/20120117070747_rename_comment_columns_to_remarks.rb
+- db/migrate/20120117075541_use_single_duration_field.rb
+- db/migrate/20120117080212_use_decimal_for_activity_duration.rb
 - lib/bookyt_projects.rb
 - lib/bookyt_projects/navigation.rb
 - lib/bookyt_projects/railtie.rb
@@ -174,9 +177,10 @@ 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
 test_files: []
 
+has_rdoc: