bookyt_salary 0.17.3 → 0.18.0

data/app/controllers/salaries_controller.rb

@@ -52,6 +52,7 @@ class SalariesController < InvoicesController
   def payslip
     @salary = Salary.find(params[:id])
 
+    @hours_carry = @salary.hours_carry
     @hours_due = @salary.work_days.sum(:hours_due)
     @hours_worked = @salary.work_days.sum(:hours_worked)
     @hours_saldo = @salary.work_days.last.overall_overtime

data/app/models/salary.rb

@@ -114,6 +114,15 @@ class Salary < Invoice
   end
 
   # bookyt_projects
+  def hours_carry
+    WorkDay.create_or_update_upto(employee, duration_to)
+    last_day = employee.work_days.where(:date => duration_from.ago(1.day)).last
+
+    return 0 unless last_day
+
+    return last_day.overall_overtime
+  end
+
   def work_days
     WorkDay.create_or_update_upto(employee, duration_to)
     employee.work_days.where(:date => duration_from..duration_to)

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

@@ -5,25 +5,53 @@ prawn_document(:filename => "#{resource.to_s}.pdf", :renderer => PayslipDocument
   # Letter header
   pdf.letter_header(employer, employee, resource.to_s)
   
-  # Free text with the socical security number
-  pdf.free_text(resource.text)
-
   # 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}"
+  rows = [
+    [t_attr(:social_security_nr, Employee), employee.social_security_nr],
+    [t_attr(:payment_to, Employment), resource.employment.payment_to]
+  ]
+  pdf.table rows, :width => pdf.bounds.width do
+    cells.valign  = :top
+    cells.borders = []
+    cells.padding_bottom = 2
+    cells.padding_top = 2
+
+    columns(0).padding_left = 0
+    columns(0).width = 5.cm
+  end
 
   unless resource.employment.hourly_paid
     pdf.move_down 20
     pdf.text "Stundenabrechnung", :style => :bold
-    pdf.text "#{t_attr(:hours_due, Activity)}: #{@hours_due}"
-    pdf.text "#{t_attr(:hours_worked, Activity)}: #{@hours_worked}"
-    pdf.text " "
-    pdf.text "Aktueller Stundensaldo: #{@hours_saldo}"
+
+    month_name          = t('date.month_names')[@salary.duration_from.month]
+    rows = [
+      ["Übertrag Vormonat", "%0.2f" % @hours_carry],
+      ["#{t_attr(:hours_due, Activity)} #{month_name}", "%0.2f" % @hours_due],
+      ["#{t_attr(:hours_worked, Activity)} #{month_name}", "%0.2f" % @hours_worked],
+      ["Aktueller Stundensaldo", "%0.2f" % @hours_saldo],
+    ]
+
+    pdf.table rows, :width => (pdf.bounds.width * 0.4) do
+      cells.valign  = :top
+      cells.borders = []
+      cells.padding_bottom = 2
+      cells.padding_top = 2
+
+      columns(0).padding_left = 0
+      columns(0).width = 5.cm
+      columns(1).align = :right
+
+      rows(3).font_style = :bold
+    end
   end
 
+  # Free text with the socical security number
+  pdf.free_text(resource.text)
+
   # Closing
   pdf.common_closing(employer) 
 end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.17.3'
+  VERSION = '0.18.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 93
+  hash: 87
   prerelease: 
   segments: 
   - 0
-  - 17
-  - 3
-  version: 0.17.3
+  - 18
+  - 0
+  version: 0.18.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-04 00:00:00 Z
+date: 2012-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails
@@ -185,9 +185,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.16
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
+has_rdoc: