bookyt_salary 0.14.4 → 0.14.5

data/app/controllers/salary_booking_templates_controller.rb

@@ -10,4 +10,15 @@ 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/models/salary.rb

@@ -20,7 +20,7 @@ class Salary < Invoice
   end
       
   def employment
-    employee.employments.current
+    employee.employments.valid_at(value_date).last
   end
 
   # States

data/app/prawn/payslip_document.rb

@@ -1,26 +1,16 @@
 class PayslipDocument < LetterDocument
   def salary_table(salary)
-    head = [
-      t_attr(:code, LineItem),
-      t_attr(:title, LineItem),
-      t_attr(:times, LineItem),
-      t_attr(:price, LineItem),
-      t_attr(:accounted_amount, LineItem)
-    ]
-
     rows = []
     saldo_rows = []
     salary.line_items.each_with_index do |item, index|
       if item.quantity == "saldo_of"
-        saldo_rows << index + 1
-        rows << [item.code, item.title, nil, nil, currency_fmt(item.price)]
+        saldo_rows << index
+        rows << [item.title, nil, nil, currency_fmt(item.price)]
       else
-        rows << [item.code, item.title, item.times_to_s, currency_fmt(item.price), currency_fmt(item.accounted_amount)]
+        rows << [item.title, item.times_to_s, currency_fmt(item.price), currency_fmt(item.accounted_amount)]
       end
     end
 
-    rows = [head] + rows
-
     table(rows, :width => bounds.width) do
       # General cell styling
       cells.valign  = :top
@@ -30,16 +20,13 @@ class PayslipDocument < LetterDocument
       columns(0).padding_left = 0
 
       # Columns
-      columns(2..4).align = :right
+      columns(1..3).align = :right
 
       # Saldo styling
       saldo_rows.each do |index|
         row(index).font_style = :bold
         row(index).padding_bottom = 10
       end
-
-      # Header styling
-      row(0).font_style  = :bold
     end
   end
 end

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

@@ -4,7 +4,7 @@
   %table.list
     %tr
       %th= t_attr :company, Invoice
-      %th.currency= t_attr :amount, Salary
+      %th.currency= t_attr :gross_amount, Salary
       %th.currency= t_attr :social_amount, Salary
       %th.currency= t_attr :bvg_amount, Salary
       %th.currency= t_attr :net_amount, Salary

data/app/views/salaries/payslip.pdf.prawn

@@ -6,11 +6,14 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
   pdf.letter_header(employer, employee, resource.to_s)
   
   # Free text with the socical security number
-  pdf.free_text "#{t_attr(:social_security_nr, Employee)}: #{employee.social_security_nr}"
   
   # Line Items
   pdf.salary_table(resource)
-  
+
+  pdf.move_down 20
+  pdf.text "#{t_attr(:social_security_nr, Employee)}: #{employee.social_security_nr}"
+  pdf.text "#{t_attr(:payment_to, Employment)}: #{resource.employment.payment_to}"
+
   # Closing
   pdf.common_closing(employer) 
-end
+end

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

@@ -0,0 +1,23 @@
+= contextual_links
+
+.page-header
+  %h1= t_title
+
+  %table.list
+    %tr
+      %th= t_attr :code
+      %th= t_attr :title
+      %th.right= t_attr :amount
+
+    - for template in @salary_booking_templates
+      %tr
+        %td= template.code
+        %td= template.title
+        %td.currency= currency_fmt(template.line_items.where(:date => @duration).sum(&:total_amount))
+
+- content_for :sidebar do
+  .sub-tabs
+    %ul
+      - 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))

data/config/routes.rb

@@ -4,6 +4,9 @@ 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,7 +6,7 @@ module BookytSalary
         salaries.item :salaries, 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_statistics, t_title(:statistics, Salary), statistics_salaries_path
+        salaries.item :salary_booking_template_statistics, t_title(:statistics, Salary), statistics_salary_booking_templates_path
         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.14.4'
+  VERSION = '0.14.5'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 47
+  hash: 45
   prerelease: 
   segments: 
   - 0
   - 14
-  - 4
-  version: 0.14.4
+  - 5
+  version: 0.14.5
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -122,6 +122,7 @@ 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