bookyt_salary 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3deb668d13d35a6fd748f57b475037b07bc8b33b
-  data.tar.gz: 5b96723ac942ffd73e800e0a809c7e9659aec329
+  metadata.gz: 8b8b2d458d924066900a670fb1078e04c29fe4ec
+  data.tar.gz: b6fec30785878fd5ed0395b2ab82f24257505a6f
 SHA512:
-  metadata.gz: bb54ed03025868ecc32fc0f0b00c90035b3da46e8116b537f76efdc3467031e0cd5d2fa6e4eef40c4d6d004e6b1e79204506ce9760ba8ab919383c97c1754447
-  data.tar.gz: 204c8b96120b3bb4819b6f6ce92394d649c7a069ff23b14a35919ef8efb1cb0f783126eb890897e3678a86bcc1c0e08278de45b956db32b000bac5be9d828f9a
+  metadata.gz: 8c04875289ec0413935b21c4344211d6df0e1490e4d7c1616138536d679605036868ee7ecd507b40c570b6527a71418906fa5765bbd2661a9b1709c8bac15f68
+  data.tar.gz: 339e3162875b80bc879ac7a4f5e6b4ae7b991accf66e0bf6078f753fc4108ecb002d331a657752b1199c1833df3acfb4d35fe66f21e229920e2ac5e235c9eff8

data/app/controllers/salaries_controller.rb

@@ -2,12 +2,12 @@ class SalariesController < InvoicesController
   defaults :resource_class => Salary
 
   respond_to :html, :pdf
-  
+
   # Filter/Search
   # =============
   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
+  has_scope :by_employee
 
   # Actions
   # =======

data/app/models/salary.rb

@@ -18,7 +18,7 @@ class Salary < Invoice
   def employee_id
     company_id
   end
-      
+
   # Emplyoment helpers
   def employment
     employee.employments.valid_at(value_date).last
@@ -129,7 +129,7 @@ class Salary < Invoice
   # Filter/Search
   # =============
   scope :by_value_period, lambda {|from, to| where("date(value_date) BETWEEN ? AND ?", from, to) }
-  scope :by_employee_id, lambda {|value| where(:company_id => value)}
+  scope :by_employee, lambda {|value| where(:company_id => value)}
 
   # Accounts
   # ========

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

@@ -6,3 +6,6 @@
 = paginated_section collection do
   - if collection.any?
     = render "list"
+
+= render 'filters/by_calendar_year'
+= render 'filters/by_employee'

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.21.0'
+  VERSION = '0.22.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookyt_salary
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2014-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails