bookyt_salary 0.8.0 → 0.9.0

data/app/controllers/salary_templates_controller.rb

@@ -8,4 +8,19 @@ class SalaryTemplatesController < AuthorizedController
 
     render 'edit'
   end
+
+  # has_many :salary_items
+  def new_salary_item
+    if salary_template_id = params[:id]
+      @salary_template = resource_class.find(salary_template_id)
+    else
+      @salary_template = resource_class.new
+    end
+
+    @salary_item = @salary_template.salary_items.build(
+      :times          => 1
+    )
+
+    respond_with @salary_item
+  end
 end

data/app/models/salary.rb

@@ -89,9 +89,15 @@ class Salary < Invoice
 
   # Line Items
   def build_line_items
-    salary_template.salary_booking_templates.each do |booking_template|
+    salary_template.salary_items.each do |salary_item|
       line_item = line_items.build(:date => self.value_date)
-      line_item.set_booking_template(booking_template)
+
+      # Defaults from booking_template
+      line_item.set_booking_template(salary_item.salary_booking_template)
+
+      # Overrides from salary_item
+      line_item.times = salary_item.times if salary_item.times.present?
+      line_item.price = salary_item.price if salary_item.price.present?
     end
   end
 

data/app/models/salary_item.rb

@@ -0,0 +1,4 @@
+class SalaryItem < ActiveRecord::Base
+  belongs_to :salary_template
+  belongs_to :salary_booking_template
+end

data/app/models/salary_template.rb

@@ -1,4 +1,7 @@
 class SalaryTemplate < ActiveRecord::Base
   belongs_to :person
-  has_and_belongs_to_many :salary_booking_templates
+
+  # Salary Items
+  has_many :salary_items
+  accepts_nested_attributes_for :salary_items, :allow_destroy => true
 end

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

@@ -0,0 +1,7 @@
+%tr.salary_item.nested-form-item
+  %td= salary_item.select :salary_booking_template_id, SalaryBookingTemplate.all.map{|template| [template.title, template.id]}, :required => true, :style => 'width: 30em'
+  %td= salary_item.text_field :times, :required => true, :style => 'width: 3em', :autocomplete => "off"
+  %td= salary_item.text_field :price, :required => true, :style => 'width: 5em', :autocomplete => "off"
+  %td.action_links
+    = salary_item.hidden_field :_destroy
+    = link_to t_action(:delete), '#', :class => 'icon-delete-text delete-nested-form-item'

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

@@ -0,0 +1,6 @@
+%tr[line_item]
+  %td= line_item.date
+  %td= line_item.title
+  %td.currency= line_item.times_to_s
+  %td.currency= currency_fmt(line_item.price)
+  %td.currency= currency_fmt(line_item.total_amount)

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

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

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

@@ -0,0 +1,6 @@
+%tr
+  %th{:style => 'padding: 2px'}= t_attr(:salary_booking_template, SalaryItem)
+  %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'

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

@@ -3,11 +3,11 @@
   = f.inputs do
     .row
       .span8= f.input :title, :input_html => {"data-autofocus" => true}
-      .span8= f.input :person
-    .row
-      .span16= f.input :salary_booking_templates, :input_html => {:class => 'span12'}
+      .span8= f.input :person, :collection => Employee.all
     .row
       .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
 
+  = render 'salary_items/list_form', :f => f
+
   = f.buttons do
     = f.commit_button

data/app/views/salary_templates/_salary_item_form.html.haml

@@ -0,0 +1,3 @@
+= fields_for @salary_template do |salary_template|
+  = salary_template.fields_for :salary_items, @salary_item, :child_index => -(DateTime.now.to_i) do |salary_item|
+    = render 'salary_items/form', :salary_item => salary_item

data/app/views/salary_templates/new_salary_item.js.erb

@@ -0,0 +1,2 @@
+$('#salary_items tbody').append('<%=j render 'salary_item_form' %>');
+initializeBehaviours();

data/config/locales/bookyt_salary.de.yml

@@ -27,6 +27,10 @@ de:
         salary_booking_templates: Lohnarten
         title:                    Titel
         remarks:                  Bemerkungen
+      salary_item:
+        salary_booking_template:  Lohnart
+        times:         Anzahl
+        price:         Betrag
 
   salaries:
     select_employee:
@@ -37,3 +41,6 @@ de:
   salary_templates:
     index:
       title: Lohnvorlagen
+  salary_items:
+    list:
+      title: Lohnarten

data/config/routes.rb

@@ -6,7 +6,11 @@ Rails.application.routes.draw do
     end
   end
 
-  resources :salary_templates
+  resources :salary_templates do
+    member do
+      get :new_salary_item
+    end
+  end
 
   resources :salaries do
     collection do

data/db/migrate/20120118121223_create_salary_items.rb

@@ -0,0 +1,15 @@
+class CreateSalaryItems < ActiveRecord::Migration
+  def change
+    create_table :salary_items do |t|
+      t.integer :salary_booking_template_id
+      t.integer :salary_template_id
+      t.decimal :times, :precision => 10, :scale => 2
+      t.decimal :price, :precision => 10, :scale => 2
+
+      t.timestamps
+    end
+
+    add_index :salary_items, :salary_booking_template_id
+    add_index :salary_items, :salary_template_id
+  end
+end

data/lib/bookyt_salary/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 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: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -105,6 +105,7 @@ files:
 - app/helpers/salary_booking_template_helper.rb
 - app/models/salary.rb
 - app/models/salary_booking_template.rb
+- app/models/salary_item.rb
 - app/models/salary_template.rb
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
@@ -119,9 +120,15 @@ files:
 - app/views/salary_booking_templates/_form.html.haml
 - app/views/salary_booking_templates/_list.html.haml
 - app/views/salary_booking_templates/_salary_booking_template.html.haml
+- app/views/salary_items/_form.html.haml
+- app/views/salary_items/_line_item.html.haml
+- app/views/salary_items/_list_form.html.haml
+- app/views/salary_items/_list_header.html.haml
 - app/views/salary_templates/_form.html.haml
 - app/views/salary_templates/_list.html.haml
+- app/views/salary_templates/_salary_item_form.html.haml
 - app/views/salary_templates/_salary_template.html.haml
+- app/views/salary_templates/new_salary_item.js.erb
 - config/application.rb
 - config/boot.rb
 - config/locales/bookyt_salary.de.yml
@@ -132,6 +139,7 @@ files:
 - db/migrate/20120117113315_create_salary_template_habtm_table.rb
 - db/migrate/20120117120044_rename_salary_booking_template_habtm_table.rb
 - db/migrate/20120117122025_add_title_and_remarks_to_salary_templates.rb
+- db/migrate/20120118121223_create_salary_items.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb