bookyt_salary 0.20.4 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 434b8765f6dc4e5a564b4a0063029c4e3fe81296
-  data.tar.gz: 54e94c02a15ca3e2abd6afde428df4fe9f202159
+  metadata.gz: 3deb668d13d35a6fd748f57b475037b07bc8b33b
+  data.tar.gz: 5b96723ac942ffd73e800e0a809c7e9659aec329
 SHA512:
-  metadata.gz: e3ca91d036347c080ce9ccb83c70edf0b45e7a2da38ff838fef21ee2df75368e800a37ec8cc87355eae917212eb87d79d40e5e27cd009f40b89fa9d2b8163541
-  data.tar.gz: ff88adf1622ecb81e22b8ec461989be441de18f7455b37585062fcae5939203a3a319537c718023891b67acee24061c24b4769f04d9d6d2b7794fcc53e6f1211
+  metadata.gz: bb54ed03025868ecc32fc0f0b00c90035b3da46e8116b537f76efdc3467031e0cd5d2fa6e4eef40c4d6d004e6b1e79204506ce9760ba8ab919383c97c1754447
+  data.tar.gz: 204c8b96120b3bb4819b6f6ce92394d649c7a069ff23b14a35919ef8efb1cb0f783126eb890897e3678a86bcc1c0e08278de45b956db32b000bac5be9d828f9a

data/app/controllers/salary_booking_templates_controller.rb

@@ -10,15 +10,4 @@ class SalaryBookingTemplatesController < BookingTemplatesController
 
     render 'edit'
   end
-
-  def statistics
-    if params['date']
-      date = Date.parse(params['date'])
-    else
-      date = Date.today
-    end
-
-    @duration = date.beginning_of_month..date.end_of_month
-    @salary_booking_templates = SalaryBookingTemplate.all
-  end
 end

data/app/controllers/salary_reports_controller.rb

@@ -1,24 +1,30 @@
 class SalaryReportsController < ApplicationController
   respond_to :html, :pdf
-  
-  # Actions
-  # =======
-  def yearly_ahv_statement
+
+  before_filter do
     @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
 
+    if employee_id = params[:by_employee]
+      @employee = Employee.find(employee_id)
+    end
+  end
+
+  def yearly_ahv_statement
     @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
+
+  def statistics
+    @year = @value_period.first.year
+
+    @salary_booking_templates = SalaryBookingTemplate.all
+  end
 end

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

@@ -1,5 +1,5 @@
 %h3= t_title(:list, SalaryItem)
-%table.table.table-striped.salary_items.collection.nested-form-container
+%table.table.salary_items.collection.nested-form-container
   %thead
     = render 'salary_items/list_header', :template => f.object
   %tbody.sortable

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

@@ -5,3 +5,6 @@
     %tr
       %th= code
       %td.currency= @line_items.select{|li| li.booking_template.salary_declaration_code == code}.sum(&:total_amount).floor
+
+= render 'filters/by_calendar_year'
+= render 'filters/by_employee'

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

@@ -0,0 +1,31 @@
+= contextual_links
+
+= boot_page_title
+
+%table.table.table-striped.collection
+  %thead
+    %tr
+      %th= t_attr :code, SalaryBookingTemplate
+      %th= t_attr :title, SalaryBookingTemplate
+      - (1..12).each do |month|
+        %th.currency= '%02i/%i' % [month, @year]
+      %th.right= t_attr :amount, SalaryBookingTemplate
+  %tbody
+    - @salary_booking_templates.each do |template|
+      - line_items = template.line_items.where(:date => @value_period)
+      - line_items = line_items.includes(:invoice).where(invoices: {company_id: @employee.id}) if @employee
+      - total_amount = line_items.sum(&:accounted_amount)
+      - next if total_amount == 0
+      %tr
+        %td= template.code
+        %td= template.title
+        - (1..12).each do |month|
+          - duration_from = Date.new(@year, month, 1)
+          - duration_to = duration_from.end_of_month
+          - duration = duration_from..duration_to
+          - amount = line_items.where(:date => duration).sum(&:accounted_amount)
+          %td.currency= currency_fmt(amount)
+        %td.currency= currency_fmt(total_amount)
+
+= render 'filters/by_calendar_year'
+= render 'filters/by_employee'

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

@@ -28,7 +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])
+        %td.action-links= link_to t_action(:salary_declaration), salary_declaration_path(:by_employee => employment.employee, :by_value_period => params[:by_value_period])
 
   %tfoot
     %tr
@@ -40,10 +40,4 @@
       %th
       %th.action-links
 
-- content_for :sidebar do
-  .sub-tabs
-    %h3 Filter
-    %ul
-      - years = current_tenant.incorporated_on.year..Date.today.year
-      - for year in years
-        %li= link_to year, url_for(params.merge({:by_value_period => {:from => Date.new(year, 1, 1).to_s(:db), :to => Date.new(year, 12, 31).to_s(:db)}}))
+= render 'filters/by_calendar_year'

data/config/locales/bookyt_salary.de.yml

@@ -18,6 +18,8 @@ de:
       salary_booking_template:
         include_in_saldo_list:   Pflichtigkeit
         salary_declaration_code: Lohnausweis
+        code:                    Lohnart
+        title:                   Buchungstext
       salary_template:
         person:                   Person
         salary_booking_templates: Lohnarten
@@ -38,7 +40,6 @@ de:
   salary_booking_templates:
     index:
       title:      Lohnarten
-      statistics: Rekapitulation
   salary_templates:
     index:
       title: Lohnvorlagen
@@ -50,6 +51,8 @@ de:
       title: AHV Lohnbescheinigung
     salary_declaration:
       title: Lohnausweis
+    statistics:
+      title:      Rekapitulation
 
   overview:
     bookyt:

data/config/routes.rb

@@ -4,9 +4,6 @@ Rails.application.routes.draw do
     member do
       get :copy
     end
-    collection do
-      get :statistics
-    end
   end
 
   resources :salary_templates do

data/lib/bookyt_salary/navigation.rb

@@ -6,8 +6,8 @@ module BookytSalary
         salaries.item :salary_list, t_title(:index, Salary), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
         salaries.item :new_salary, t_title(:new, Salary), select_employee_salaries_path
         salaries.item :divider, "", :class => 'divider'
-        salaries.item :salary_booking_template_statistics, t_title(:statistics, SalaryBookingTemplate), statistics_salary_booking_templates_path
-        salaries.item :yearly_ahv_statement, "AHV Lohnbescheinigung", url_for("/salary_reports/yearly_ahv_statement")
+        salaries.item :statistics, t('salary_reports.statistics.title'), url_for('/salary_reports/statistics')
+        salaries.item :yearly_ahv_statement, t('salary_reports.yearly_ahv_statement.title'), url_for("/salary_reports/yearly_ahv_statement")
         salaries.item :divider, "", :class => 'divider'
         salaries.item :salary_booking_templates, t_title(:index, SalaryBookingTemplate), salary_booking_templates_path
         salaries.item :salary_templates, t_title(:index, SalaryTemplate), salary_templates_path

data/lib/bookyt_salary/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bookyt_salary
 version: !ruby/object:Gem::Version
-  version: 0.20.4
+  version: 0.21.0
 platform: ruby
 authors:
 - Simon Hürlimann (CyT)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-26 00:00:00.000000000 Z
+date: 2014-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -112,12 +112,12 @@ 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_booking_templates/statistics.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_reports/salary_declaration.html.haml
+- app/views/salary_reports/statistics.html.haml
 - app/views/salary_reports/yearly_ahv_statement.html.haml
 - app/views/salary_templates/_form.html.haml
 - app/views/salary_templates/_list.html.haml

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

@@ -1,25 +0,0 @@
-= contextual_links
-
-= boot_page_title
-
-%table.table.table-striped.collection
-  %thead
-    %tr
-      %th= t_attr :code
-      %th= t_attr :title
-      %th.right= t_attr :amount
-  %tbody
-    - for template in @salary_booking_templates
-      - amount = template.line_items.where(:date => @duration).sum(&:accounted_amount)
-      - next if amount == 0
-      %tr
-        %td= template.code
-        %td= template.title
-        %td.currency= currency_fmt(amount)
-
-- content_for :sidebar do
-  .sub-tabs
-    %ul.pager
-      - for month in 1..12
-        - date = Date.new(Date.today.year, month, 1)
-        %li= link_to t('date.month_names')[date.month], url_for(:date => date.to_s(:db))