bookyt_projects 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/app/controllers/tasks_controller.rb

@@ -1,2 +1,10 @@
-class TasksController < AuthorizedController 
+class TasksController < AuthorizedController
+  
+  def new
+    @task = Task.new(:project_id => params[:project_id]) if params[:project_id]
+    @task.person = current_user.person if current_user
+    
+    new!{ projects_url(@task.project) }
+  end
+   
 end

data/app/models/project.rb

@@ -1,4 +1,5 @@
 class Project < ActiveRecord::Base
   belongs_to :client, :class_name => 'Person'
   belongs_to :project_state
+  has_many :tasks
 end

data/app/models/task.rb

@@ -1,4 +1,8 @@
 class Task < ActiveRecord::Base
   belongs_to :project
   belongs_to :person
+  
+  def duration
+    "2h"
+  end
 end

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

@@ -4,6 +4,7 @@
     %tr
       - @attributes.each do |field|
         %th= t_attr field, collection.first.class
+      %th.new-task= t_title(:new, Task)
       %th.action-links
 
   - @attributes = @attributes - ['client_id', 'project_state_id']
@@ -14,6 +15,8 @@
           %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.action-links
+          = list_link_for(:show, r)
           = list_link_for(:edit, r)
           = list_link_for(:delete, r)

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

@@ -0,0 +1,25 @@
+%table{:class => "#{collection.first.class.to_s.downcase} detail"}
+  - resource.attributes.each_pair do |attr, value|
+    - next if ['id', 'created_at', 'updated_at', 'client_id', 'project_state_id'].include?(attr)
+    %tr
+      %td= attr.titleize
+      %td= value
+  %tr
+    %td= t_model(ProjectState)
+    %td= @project.project_state
+  %tr
+    %td= t_model(Company)
+    %td= @project.client
+    
+
+%table.list
+  %tr
+    - [:person, :when, :duration].each do |attr|
+      %th= t_attr(attr, Task)
+  - @project.tasks.each do |task|
+    %tr
+      %td= task.person
+      %td= task.when
+      %td= task.duration
+
+= link_to t_title(:new, Task), new_project_task_path(resource)

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

@@ -0,0 +1,5 @@
+= contextual_links
+
+%h1= t_title
+
+= render "resource_detail"

data/bookyt_projects.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{bookyt_projects}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Roman Simecek}]
@@ -35,7 +35,9 @@ Gem::Specification.new do |s|
     "app/views/project_states/new.html.haml",
     "app/views/projects/_form.html.haml",
     "app/views/projects/_list.html.haml",
+    "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",
     "bookyt_projects.gemspec",
     "config/locales/de.yml",

data/config/locales/de.yml

@@ -16,3 +16,7 @@ de:
         client_id:        Kunde
       project_state:
         name: Bezeichnung
+      task:
+        person: Person
+        when: Datum
+        duration: Dauer

data/config/routes.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Roman Simecek
@@ -122,7 +122,9 @@ files:
 - app/views/project_states/new.html.haml
 - app/views/projects/_form.html.haml
 - app/views/projects/_list.html.haml
+- 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
 - bookyt_projects.gemspec
 - config/locales/de.yml