bookyt_salary 0.9.1 → 0.10.0

data/app/models/salary_item.rb

@@ -1,4 +1,6 @@
 class SalaryItem < ActiveRecord::Base
   belongs_to :salary_template
   belongs_to :salary_booking_template
+
+  default_scope order(:position)
 end

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

@@ -1,4 +1,5 @@
 %tr.salary_item.nested-form-item
+  %td= salary_item.text_field :position, :required => true, :style => 'width: 3em', :autocomplete => "off"
   %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"

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

@@ -1,4 +1,5 @@
 %tr
+  %th{:style => 'padding: 2px; width: 3em'}= t_attr(:position, SalaryItem)
   %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)

data/db/migrate/20120118155137_add_position_to_salary_item.rb

@@ -0,0 +1,6 @@
+class AddPositionToSalaryItem < ActiveRecord::Migration
+  def change
+    add_column :salary_items, :position, :integer
+    add_index :salary_items, :position
+  end
+end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.9.1'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 55
   prerelease: 
   segments: 
   - 0
-  - 9
-  - 1
-  version: 0.9.1
+  - 10
+  - 0
+  version: 0.10.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -141,6 +141,7 @@ files:
 - 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/migrate/20120118155137_add_position_to_salary_item.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb