bookyt_projects 0.2.3 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.3.0

data/app/models/project.rb

@@ -2,4 +2,8 @@ class Project < ActiveRecord::Base
   belongs_to :client, :class_name => 'Person'
   belongs_to :project_state
   has_many :tasks
+  
+  def to_s
+    name
+  end
 end

data/app/models/task.rb

@@ -2,7 +2,31 @@ class Task < ActiveRecord::Base
   belongs_to :project
   belongs_to :person
   
+  attr_accessor :minutes, :hours
+  
+  validates :project, :presence => true
+  validates :person,  :presence => true
+  validates :when,    :presence => true
+  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
+  
+  before_save :calculate_hours, :if => :hours_minutes
+  
+  def hours_minutes
+    minutes || hours
+  end
+  
+  def calculate_hours
+    self.from = DateTime.now
+    self.to = self.from + hours.to_i.hours + minutes.to_i.minutes
+  end
+  
+  # The duration of the task in minutes
   def duration
-    "2h"
+    minutes = (to.to_f - from.to_f).to_i / 60
+    
+    minutes < 0 ? 1.day.to_i + minutes : minutes
   end
 end

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

@@ -20,6 +20,6 @@
     %tr
       %td= task.person
       %td= task.when
-      %td= task.duration
+      %td= t('bookyt.projects.minutes', :duration => task.duration)
 
 = link_to t_title(:new, Task), new_project_task_path(resource)

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

@@ -6,6 +6,8 @@
     = f.input :when, :as => :date_field
     = f.input :from, :as => :hour_field
     = f.input :to, :as => :hour_field
+    = f.input :hours
+    = f.input :minutes
   = f.inputs do
     = f.input :comment
   = f.buttons do

data/app/views/tasks/_resource_detail.html.haml

@@ -0,0 +1,19 @@
+%table{:class => "#{collection.first.class.to_s.downcase} detail"}
+  %tr
+    %th= t_attr(:project)
+    %td= resource.project
+  %tr
+    %th= t_attr(:person)
+    %td= resource.person
+  %tr
+    %th= t_attr(:when)
+    %td= l(resource.when)
+  %tr
+    %th= t_attr(:time)
+    %td= "#{l(resource.from, :format => :time)} - #{l(resource.to, :format => :time)}"
+  %tr
+    %th= t_attr(:duration)
+    %td= t('bookyt.projects.minutes', :duration => resource.duration)
+  %tr
+    %th= t_attr(:comment)
+    %td= resource.comment

data/bookyt_projects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookyt_projects}
-  s.version = "0.2.3"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Simecek}]
-  s.date = %q{2011-09-19}
+  s.date = %q{2011-09-20}
   s.description = %q{Rails engine for project management it's used to extend the functionallity of bookyt.}
   s.email = %q{roman.simecek@cyt.ch}
   s.extra_rdoc_files = [
@@ -39,6 +39,7 @@ Gem::Specification.new do |s|
     "app/views/projects/new.html.haml",
     "app/views/projects/show.html.haml",
     "app/views/tasks/_form.html.haml",
+    "app/views/tasks/_resource_detail.html.haml",
     "bookyt_projects.gemspec",
     "config/locales/de.yml",
     "config/routes.rb",

data/config/locales/de.yml

@@ -13,10 +13,16 @@ de:
         project_state:    Status
         project_state_id: Status
         client:           Kunde
-        client_id:        Kunde
+        client_id:        Kunde       
       project_state:
         name: Bezeichnung
       task:
         person: Person
         when: Datum
         duration: Dauer
+        project: Projekt
+        comment: Kommentar
+        time: Zeitraum
+  bookyt:
+    projects:
+      minutes: "%{duration} Minuten"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-19 00:00:00 Z
+date: 2011-09-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -126,6 +126,7 @@ files:
 - app/views/projects/new.html.haml
 - app/views/projects/show.html.haml
 - app/views/tasks/_form.html.haml
+- app/views/tasks/_resource_detail.html.haml
 - bookyt_projects.gemspec
 - config/locales/de.yml
 - config/routes.rb