bookyt_projects 0.8.0 → 0.9.0

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

@@ -1,4 +1,4 @@
-%table.list
+%table.list#activities_list
   %tr
     - [:person, :when, :duration].each do |attr|
       %th= t_attr(attr, Activity)

data/app/views/activities/new.js.erb

@@ -0,0 +1,10 @@
+$('#new_<%= resource.class.name.underscore %>').remove();
+var form = '<div id="new_activity_dialog"><%=j render "form" %></div>';
+$('#<%= resource.class.name.tableize %>_list').before(form);
+$('#new_activity_dialog').dialog({
+  modal:    true,
+  minWidth: 580,
+  title:    '<%=j t_title :edit, Activity %>'
+});
+
+initializeBehaviours();

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

@@ -2,7 +2,7 @@
   = render 'form'
 
 .contextual
-  = icon_link_to :new, new_project_activity_path(resource)
+  = icon_link_to :new, new_project_activity_path(resource), :remote => true
 %h2= t_title :index, Activity
 
 = render 'activities/list', :collection => @project.activities

data/config/locales/de.yml

@@ -4,6 +4,7 @@ de:
       project:            Projekt
       project_state:      Projektstatus
       activity:           Aktivität
+      timesheet:          Stundenrapport
     attributes:
       project:
         name:             Bezeichnung
@@ -33,3 +34,8 @@ de:
   bookyt:
     projects:
       minutes:            "%{duration} Minuten"
+
+  # Titles
+  timesheets:
+    index:
+      title:  Stundenrapport

data/config/routes.rb

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

data/lib/bookyt_projects/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_projects
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Roman Simecek (CyT)
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-22 00:00:00 +02:00
+date: 2011-10-24 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -36,7 +36,7 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: recurrence
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -47,10 +47,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: rcov
+  name: shoulda
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -64,7 +64,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec-rails
+  name: rcov
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -77,6 +77,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: This plugin extends bookyt with project management functionality.
 email: 
 - roman.simecek@cyt.ch
@@ -98,6 +112,7 @@ files:
 - app/models/project_state.rb
 - app/views/activities/_form.html.haml
 - app/views/activities/_list.html.haml
+- app/views/activities/new.js.erb
 - app/views/project_states/_form.html.haml
 - app/views/projects/_form.html.haml
 - app/views/projects/_list.html.haml