bookyt_projects 0.3.2 → 0.6.0

data/Gemfile

@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 # Rails
 # =====
-gem 'rails', '~> 3.1.0.rc'
+gem 'rails', '~> 3.1.0'
 
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.

data/Gemfile.lock

@@ -93,6 +93,6 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   jeweler (~> 1.6.4)
-  rails (~> 3.1.0.rc)
+  rails (~> 3.1.0)
   rcov
   shoulda

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.6.0

data/app/controllers/activities_controller.rb

@@ -0,0 +1,27 @@
+class ActivitiesController < AuthorizedController
+  belongs_to :project
+
+  def new
+    # Allow callers specifying defaults
+    @activity = Activity.new(params[:activity])
+
+    # Nested resources support
+    @activity.project_id ||= params[:project_id] if params[:project_id]
+
+    # Educated guessing of defaults
+    @activity.person = current_user.person if current_user
+    
+    new!
+  end
+
+  def create
+    @activity = Activity.create(params[:activity])
+    @project = @activity.project
+
+    create! { project_path(@project) }
+  end
+
+  def index
+    redirect_to :projects
+  end
+end

data/app/models/{task.rb → activity.rb}

@@ -1,4 +1,4 @@
-class Task < ActiveRecord::Base
+class Activity < ActiveRecord::Base
   belongs_to :project
   belongs_to :person
   
@@ -31,4 +31,8 @@ class Task < ActiveRecord::Base
     
     minutes < 0 ? 1.day.to_i + minutes : minutes
   end
+
+  def to_s
+    "#{duration} => #{person}"
+  end
 end

data/app/models/project.rb

@@ -1,7 +1,7 @@
 class Project < ActiveRecord::Base
   belongs_to :client, :class_name => 'Person'
   belongs_to :project_state
-  has_many :tasks
+  has_many :activities
   
   def to_s
     name

data/app/views/{tasks → activities}/_form.html.haml

@@ -1,4 +1,4 @@
-= semantic_form_for @task do |f| #when:date from:datetime to:datetime person_id:integer project_id:integer comment:string
+= semantic_form_for @activity do |f| #when:date from:datetime to:datetime person_id:integer project_id:integer comment:string
   = f.inputs do
     = f.input :person
     = f.input :project

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

@@ -0,0 +1,6 @@
+.contextual
+  = link_to 'Liste', project_path(@task.project), :class => 'icon icon-index'
+
+%h1= t_title
+
+= render "resource_detail"

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

@@ -4,7 +4,7 @@
     %tr
       - @attributes.each do |field|
         %th= t_attr field, collection.first.class
-      %th.new-task= t_title(:new, Task)
+      %th.new-task= t_title(:new, Activity)
       %th.action-links
 
   - @attributes = @attributes - ['client_id', 'project_state_id']
@@ -15,7 +15,7 @@
           %td= r.send(field) if r.respond_to?(field)
         %td= r.client
         %td= r.project_state
-        %td= link_to t_title(:new, Task), new_project_task_url(r)
+        %td= link_to t_title(:new, Activity), new_project_activity_url(r)
         %td.action-links
           = list_link_for(:show, r)
           = list_link_for(:edit, r)

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

@@ -15,11 +15,11 @@
 %table.list
   %tr
     - [:person, :when, :duration].each do |attr|
-      %th= t_attr(attr, Task)
-  - @project.tasks.each do |task|
+      %th= t_attr(attr, Activity)
+  - @project.activities.each do |task|
     %tr
       %td= task.person
       %td= task.when
       %td= t('bookyt.projects.minutes', :duration => task.duration)
 
-= link_to t_title(:new, Task), new_project_task_path(resource)
+= link_to t_title(:new, Activity), new_project_activity_path(resource)

data/bookyt_projects.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookyt_projects}
-  s.version = "0.3.2"
+  s.version = "0.6.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-21}
+  s.date = %q{2011-10-10}
   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 = [
@@ -25,12 +25,15 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "app/assets/stylesheets/bookyt_projects.sass",
+    "app/controllers/activities_controller.rb",
     "app/controllers/project_states_controller.rb",
     "app/controllers/projects_controller.rb",
-    "app/controllers/tasks_controller.rb",
+    "app/models/activity.rb",
     "app/models/project.rb",
     "app/models/project_state.rb",
-    "app/models/task.rb",
+    "app/views/activities/_form.html.haml",
+    "app/views/activities/_resource_detail.html.haml",
+    "app/views/activities/show.html.haml",
     "app/views/project_states/_form.html.haml",
     "app/views/project_states/new.html.haml",
     "app/views/projects/_form.html.haml",
@@ -38,8 +41,6 @@ Gem::Specification.new do |s|
     "app/views/projects/_resource_detail.html.haml",
     "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",
@@ -59,20 +60,20 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0.rc"])
+      s.add_runtime_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_development_dependency(%q<rcov>, [">= 0"])
     else
-      s.add_dependency(%q<rails>, ["~> 3.1.0.rc"])
+      s.add_dependency(%q<rails>, ["~> 3.1.0"])
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.0.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.6.4"])
       s.add_dependency(%q<rcov>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rails>, ["~> 3.1.0.rc"])
+    s.add_dependency(%q<rails>, ["~> 3.1.0"])
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.0.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.6.4"])

data/config/locales/de.yml

@@ -3,7 +3,7 @@ de:
     models:
       project: Projekte
       project_state: Projektstatus
-      task: Arbeitsschritt
+      activity: Arbeitsschritt
     attributes:
       project:
         name:             Bezeichnung
@@ -16,7 +16,7 @@ de:
         client_id:        Kunde       
       project_state:
         name: Bezeichnung
-      task:
+      activity:
         person: Person
         when: Datum
         duration: Dauer

data/config/routes.rb

@@ -1,7 +1,7 @@
 Rails.application.routes.draw do
   resources :projects do
-    resources :tasks
+    resources :activities
   end
   resources :project_states
-  resources :tasks
+  resources :activities
 end

data/lib/bookyt_projects/navigation.rb

@@ -2,12 +2,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|
-        projects.item :project_index, t_title(:index, Project), projects_path, :highlights_on => /\/(projects|tasks)($|\/[0-9]*($|\/.*))/
-        projects.item :capture_hours, t_title(:new, Task), new_task_path
+        projects.item :project_index, t_title(:index, Project), projects_path, :highlights_on => /\/(projects|activities)($|\/[0-9]*($|\/.*))/
+        projects.item :capture_hours, t_title(:new, Activity), new_activity_path
         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_title(:new, Task), new_task_path, :if => Proc.new { user_signed_in? }
+      navigation.item :capture_hours, t_title(:new, Activity), new_activity_path, :if => Proc.new { user_signed_in? }
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 3
-  - 2
-  version: 0.3.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Roman Simecek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 Z
+date: 2011-10-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -23,13 +23,12 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7712034
+        hash: 3
         segments: 
         - 3
         - 1
         - 0
-        - rc
-        version: 3.1.0.rc
+        version: 3.1.0
   version_requirements: *id001
   name: rails
   prerelease: false
@@ -112,12 +111,15 @@ files:
 - Rakefile
 - VERSION
 - app/assets/stylesheets/bookyt_projects.sass
+- app/controllers/activities_controller.rb
 - app/controllers/project_states_controller.rb
 - app/controllers/projects_controller.rb
-- app/controllers/tasks_controller.rb
+- app/models/activity.rb
 - app/models/project.rb
 - app/models/project_state.rb
-- app/models/task.rb
+- app/views/activities/_form.html.haml
+- app/views/activities/_resource_detail.html.haml
+- app/views/activities/show.html.haml
 - app/views/project_states/_form.html.haml
 - app/views/project_states/new.html.haml
 - app/views/projects/_form.html.haml
@@ -125,8 +127,6 @@ files:
 - app/views/projects/_resource_detail.html.haml
 - 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/app/controllers/tasks_controller.rb

@@ -1,14 +0,0 @@
-class TasksController < AuthorizedController
-  def new
-    # Allow callers specifying defaults
-    @task = Task.new(params[:task])
-
-    # Nested resources support
-    @task.project_id ||= params[:project_id] if params[:project_id]
-
-    # Educated guessing of defaults
-    @task.person = current_user.person if current_user
-    
-    new!{ projects_url(@task.project) }
-  end
-end