bookyt_salary 0.10.2 → 0.11.0

data/app/models/bookyt_salary/employee.rb

@@ -0,0 +1,9 @@
+module BookytSalary
+  module Employee
+    extend ActiveSupport::Concern
+
+    included do
+      has_many :salary_templates, :foreign_key => :person_id
+    end
+  end
+end

data/app/views/employees/_show_salaries.html.haml

@@ -0,0 +1,6 @@
+.contextual
+  = link_to t_action('new', Salary), select_employee_salaries_path(:salary => {:employee_id => @employee.id}), :class => "icon icon-add"
+%h2= t_model SalaryTemplate
+
+- @salary_template = @employee.salary_templates.first
+= render 'salary_templates/form'

data/app/views/salary_items/_list_form.html.haml

@@ -1,7 +1,7 @@
 = f.inputs t_title(:list, SalaryItem) do
   %table#salary_items
     %thead
-      = render 'salary_items/list_header'
+      = render 'salary_items/list_header', :template => f.object
     %tbody
       = f.fields_for :salary_items do |salary_item|
-        = render 'salary_items/form', :salary_item => salary_item
+        = render 'salary_items/form', :salary_item => salary_item, :template => f.object

data/app/views/salary_items/_list_header.html.haml

@@ -4,4 +4,4 @@
   %th{:style => 'padding: 2px; width: 3em'}= t_attr(:times, SalaryItem)
   %th{:style => 'padding: 2px; width: 3em'}= t_attr(:price, SalaryItem)
   %th
-  %th.action_links= link_to t_action(:more), [:new_salary_item, resource.persisted? ? resource : resource.class.name.underscore.pluralize.to_sym], :remote => true, :class => 'icon-add-text'
+  %th.action_links= link_to t_action(:more), [:new_salary_item, template.persisted? ? template : template.class.name.underscore.pluralize.to_sym], :remote => true, :class => 'icon-add-text'

data/lib/bookyt_salary/railtie.rb

@@ -3,8 +3,8 @@ require 'rails'
 
 module BookytSalary
   class Railtie < Rails::Engine
-    config.autoload_paths << File.expand_path("../lib", __FILE__)
-
     engine_name "bookyt_salary"
+
+    config.autoload_paths << File.expand_path("../lib", __FILE__)
   end
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.10.2'
+  VERSION = '0.11.0'
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 0
-  - 10
-  - 2
-  version: 0.10.2
+  - 11
+  - 0
+  version: 0.11.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -103,10 +103,12 @@ files:
 - app/controllers/salary_booking_templates_controller.rb
 - app/controllers/salary_templates_controller.rb
 - app/helpers/salary_booking_template_helper.rb
+- app/models/bookyt_salary/employee.rb
 - app/models/salary.rb
 - app/models/salary_booking_template.rb
 - app/models/salary_item.rb
 - app/models/salary_template.rb
+- app/views/employees/_show_salaries.html.haml
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml