bookyt_salary 0.19.4 → 0.20.0

data/app/controllers/salary_reports_controller.rb

@@ -9,4 +9,16 @@ class SalaryReportsController < ApplicationController
 
     @employments = Employment.valid_during(@value_period).all
   end
+
+  def salary_declaration
+    @value_period = Date.parse(params[:by_value_period][:from] || Date.today.beginning_of_year)..Date.parse(params[:by_value_period][:to] || Date.today.end_of_year) if params[:by_value_period]
+    @value_period ||= Date.today.beginning_of_year..Date.today.end_of_year
+
+    @employee = Employee.find(params[:employee_id])
+    @salaries = @employee.salaries.where(:value_date => @value_period)
+    @line_items = @salaries.collect{|salary| salary.line_items}.flatten
+
+    # TODO: better sorting
+    @salary_declaration_codes = SalaryBookingTemplate.pluck(:salary_declaration_code).uniq.select{|code| code.present?}
+  end
 end

data/app/models/bookyt_salary/employee.rb

@@ -3,6 +3,9 @@ module BookytSalary
     extend ActiveSupport::Concern
 
     included do
+      # Associations
+      has_many :salaries, :foreign_key => :company_id
+
       has_many :salary_templates, :foreign_key => :person_id
     end
   end

data/app/views/salary_reports/yearly_ahv_statement.html.haml

@@ -12,6 +12,7 @@
       %th.currency ALV-Lohn
       %th.currency ALVZ-Lohn
       %th M/F
+      %th.action-links
   %tbody
     - ahv_total = 0
     - for employment in @employments
@@ -27,6 +28,7 @@
         %td.currency= currency_fmt(ahv_amount)
         %td.currency= currency_fmt(0)
         %td= employment.employee.sex_to_s
+        %td.action-links= link_to t_action(:salary_declaration), salary_declaration_path(:employee_id => employment.employee, :by_value_period => params[:by_value_period])
 
   %tfoot
     %tr
@@ -36,6 +38,7 @@
       %th.currency= currency_fmt(ahv_total)
       %th.currency= currency_fmt(0)
       %th
+      %th.action-links
 
 - content_for :sidebar do
   .sub-tabs

data/config/locales/bookyt_salary.de.yml

@@ -48,9 +48,14 @@ de:
   salary_reports:
     yearly_ahv_statement:
       title: AHV Lohnbescheinigung
+    salary_declaration:
+      title: Lohnausweis
 
   overview:
     bookyt:
       overview:
         title:
-          title: Übersicht
+          title: Übersicht
+  crud:
+    action:
+      salary_declaration: Lohnausweis

data/config/routes.rb

@@ -38,4 +38,5 @@ Rails.application.routes.draw do
   end
 
    get 'salary_reports/:action', :controller => :salary_reports
+   get 'salary_reports/salary_declaration', :to => 'salary_reports#salary_declaration', :as => :salary_declaration
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.19.4'
+  VERSION = '0.20.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bookyt_salary
 version: !ruby/object:Gem::Version
-  version: 0.19.4
+  version: 0.20.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails