bookyt_salary 0.17.0 → 0.17.2

data/app/controllers/salaries_controller.rb

@@ -5,7 +5,7 @@ class SalariesController < InvoicesController
   
   # Filter/Search
   # =============
-  has_scope :by_state, :default => nil
+  has_scope :invoice_state, :default => nil
   has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_employee_id
 

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

@@ -9,6 +9,7 @@
     .span6= f.input :duration_to, :as => :date_field
   .row-fluid
     .span12= f.input :text, :input_html => {:rows => 4}
+  .row-fluid
     .span12= f.input :remarks, :input_html => {:rows => 4}
 
   = render 'line_items/list_form', :f => f, :invoice => resource

data/app/views/salaries/_sidebar.html.haml

@@ -1,11 +1,4 @@
-- unless @salary_sidebar
-  - @salary_sidebar = true
-
-  - content_for :sidebar do
-    .sub-tabs
-      %h3 Filter
-      %ul.pager
-        %li= link_to t('bookyt.all'), url_for(params.merge(:by_state => 'all', :overdue => nil))
-        - for state in Salary::STATES
-          %li= link_to t(state, :scope => 'invoice.state'), url_for(params.merge(:by_state => state, :overdue => nil))
-        %li= link_to t(:overdue, :scope => 'invoice.state'), url_for(params.merge(:by_state => nil, :overdue => true))
+- filter_name = :invoice_state
+- params[filter_name] ||= 'all'
+- content_for :sidebar do
+  = boot_nav_filter(filter_name, ['all'] + Salary::STATES)

data/app/views/salaries/select_employee.html.haml

@@ -2,8 +2,10 @@
 
 = simple_form_for @salary, :url => new_salary_path, :method => :get do |f|
   .row-fluid
-    .span6= f.input :employee, :as => :combobox
+    .span12
+      =f.association :employee, :as => :combobox
   .row-fluid
-    .span6= f.input :duration_from, :as => :date_field
+    .span12
+      = f.input :duration_from, :as => :date_field
 
   = f.button :submit

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

@@ -8,13 +8,13 @@
 - credit_accounts = bookings.select('credit_account_id').group('credit_account_id').map{|account| account.credit_account}
 - debit_accounts = bookings.select('debit_account_id').group('debit_account_id').map{|account| account.debit_account}
 - accounts = (credit_accounts + debit_accounts).uniq
-
-%ul.tabs
-  %li.active= link_to t_model, '#tab-main'
-  - accounts.each do |account|
-    %li= link_to account.to_s, "#tab-account-#{account.id}"
+.tabbable
+  %ul.nav.nav-tabs
+    %li.active= link_to t_model, '#tab-main', {:data => {:toggle => 'tab'}}
+    - accounts.each do |account|
+      %li= link_to account.to_s, "#tab-account-#{account.id}", {:data => {:toggle => 'tab'}}
 
 .tab-content
-  #tab-main.active= render "form"
+  #tab-main.tab-pane.active= render "form"
   - accounts.each do |account|
     %div.tab-pane{:id => "tab-account-#{account.id}"}= render 'direct_bookings/show', :reference => resource, :direct_account => account

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

@@ -3,8 +3,8 @@
     .span6= f.input :title, :input_html => {"data-autofocus" => true}
     .span6= f.input :code
   .row-fluid
-    .span6= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
-    .span6= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
+    .span6= f.association :credit_account, :as => :combobox, :collection => accounts_as_collection
+    .span6= f.association :debit_account, :as => :combobox, :collection => accounts_as_collection
   .row-fluid
     .span6= f.input :amount
     .span6= f.input :amount_relates_to, :collection => amount_relates_to_collection
@@ -15,6 +15,6 @@
     .span12= f.input :include_in_saldo_list
 
   .row-fluid
-    .span6= f.input :salary_declaration_code
+    .span12= f.input :salary_declaration_code
 
   = f.button :submit

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

@@ -1,7 +1,7 @@
 = simple_form_for @salary_template do |f|
   .row-fluid
     .span6= f.input :title, :input_html => {"data-autofocus" => true}
-    .span6= f.input :person, :as => :combobox, :collection => Employee.all
+    .span6= f.association :person, :as => :combobox, :collection => Employee.all
   .row-fluid
     .span12= f.input :remarks, :input_html => {:rows => 2}
 

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.17.0'
+  VERSION = '0.17.2'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 91
+  hash: 95
   prerelease: 
   segments: 
   - 0
   - 17
-  - 0
-  version: 0.17.0
+  - 2
+  version: 0.17.2
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-03 00:00:00 Z
+date: 2012-04-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails