bookyt_projects 0.7.0 → 0.8.0

data/app/controllers/activities_controller.rb

@@ -20,8 +20,4 @@ class ActivitiesController < AuthorizedController
   def create
     create! { @activity.project }
   end
-
-  def index
-    redirect_to :projects
-  end
 end

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

@@ -1,7 +1,7 @@
-= semantic_form_for @activity do |f| #when:date from:datetime to:datetime person_id:integer project_id:integer comment:string
+= semantic_form_for @activity do |f|
   = f.inputs do
-    = f.input :person
-    = f.input :project
+    = 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

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

@@ -0,0 +1,14 @@
+%table.list
+  %tr
+    - [:person, :when, :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)

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

@@ -2,4 +2,4 @@
   = f.semantic_errors
   = f.inputs :name
   = f.buttons do
-    = f.submit
+    = f.commit_button

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

@@ -2,10 +2,10 @@
   = f.semantic_errors
   = f.inputs do
     = f.input :name, :input_html => {'data-autofocus' => 'true'}
-    = f.input :comment
+    = f.input :comment, :input_html => {:rows => 5}
     = f.input :from, :as => :date_field
     = f.input :to, :as => :date_field
     = f.input :project_state
-    = f.input :client
+    = f.input :client, :as => :combobox
   = f.buttons do
-    = f.submit
+    = f.commit_button

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

@@ -4,7 +4,6 @@
     %tr
       - @attributes.each do |field|
         %th= t_attr field, collection.first.class
-      %th.new-task= t_title(:new, Activity)
       %th.action-links
 
   - @attributes = @attributes - ['name', 'client_id', 'project_state_id']
@@ -16,8 +15,6 @@
           %td= r.send(field) if r.respond_to?(field)
         %td= r.client
         %td= r.project_state
-        %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)
           = list_link_for(:delete, r)

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

@@ -0,0 +1,8 @@
+.form-view
+  = render 'form'
+
+.contextual
+  = icon_link_to :new, new_project_activity_path(resource)
+%h2= t_title :index, Activity
+
+= render 'activities/list', :collection => @project.activities

data/config/locales/de.yml

@@ -1,9 +1,9 @@
 de:
   activerecord:
     models:
-      project: Projekte
-      project_state: Projektstatus
-      activity: Arbeitsschritt
+      project:            Projekt
+      project_state:      Projektstatus
+      activity:           Aktivität
     attributes:
       project:
         name:             Bezeichnung
@@ -15,14 +15,21 @@ de:
         client:           Kunde
         client_id:        Kunde       
       project_state:
-        name: Bezeichnung
+        name:             Bezeichnung
       activity:
-        person: Person
-        when: Datum
-        duration: Dauer
-        project: Projekt
-        comment: Kommentar
-        time: Zeitraum
+        person:           Person
+        person_id:        Person
+        when:             Datum
+        from:             Von
+        to:               Bis
+        duration:         Dauer
+        hours:            Stunden
+        minutes:          Minuten
+        project:          Projekt
+        project_id:       Projekt
+        comment:          Kommentar
+        time:             Zeitraum
+
   bookyt:
     projects:
-      minutes: "%{duration} Minuten"
+      minutes:            "%{duration} Minuten"

data/config/routes.rb

@@ -4,4 +4,4 @@ Rails.application.routes.draw do
   end
   resources :project_states
   resources :activities
-end
+end

data/lib/bookyt_projects/version.rb

@@ -1,3 +1,3 @@
 module BookytPos
-  VERSION = '0.7.0'
+  VERSION = '0.8.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
+  - 8
   - 0
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 +02:00
+date: 2011-10-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -77,7 +77,7 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-description: This plugin extends bookyt with project management functionallty.
+description: This plugin extends bookyt with project management functionality.
 email: 
 - roman.simecek@cyt.ch
 - simon.huerlimann@cyt.ch
@@ -97,15 +97,11 @@ files:
 - app/models/project.rb
 - app/models/project_state.rb
 - app/views/activities/_form.html.haml
-- app/views/activities/_resource_detail.html.haml
-- app/views/activities/show.html.haml
+- app/views/activities/_list.html.haml
 - app/views/project_states/_form.html.haml
-- 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/projects/_show.html.haml
 - config/application.rb
 - config/boot.rb
 - config/locales/de.yml

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

@@ -1,19 +0,0 @@
-%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/app/views/activities/show.html.haml

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

data/app/views/project_states/new.html.haml

@@ -1,3 +0,0 @@
-%h1= t_title(:new, ProjectState)
-
-= render 'form'

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

@@ -1,25 +0,0 @@
-%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, 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, Activity), new_project_activity_path(resource)

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

@@ -1,3 +0,0 @@
-%h1= t_title(:new)
-
-= render 'form'

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

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