bookyt_salary 0.2.4 → 0.3.0

data/app/controllers/salaries_controller.rb

@@ -1,10 +1,9 @@
 class SalariesController < InvoicesController
-  
   respond_to :html, :pdf
   
   # Filter/Search
   # =============
-  has_scope :by_state
+  has_scope :by_state, :default => nil
   has_scope :by_value_period, :using => [:from, :to], :default => proc { |c| c.session[:has_scope] }
   has_scope :by_employee_id
 
@@ -14,7 +13,7 @@ class SalariesController < InvoicesController
     index!
   end
 
-  def new
+  def select_employee
     # Allow pre-seeding some parameters
     salary_params = {
       :customer_id    => current_tenant.company.id,
@@ -27,13 +26,16 @@ class SalariesController < InvoicesController
     salary_params.merge!(params[:salary]) if params[:salary]
 
     @salary = Salary.new(salary_params)
+  end
+
+  def new
+    @salary = Salary.new(params[:salary])
+
+    employment = @salary.employee.employments.current
+
+    @salary.amount = employment.salary_amount
 
     # Line Items
-    line_item = @salary.line_items.build(
-      :times         => 1,
-      :quantity      => 'x'
-    )
-    line_item.assign_booking_template = BookingTemplate.find_by_code('salary:employee:ahv_iv_eo')
 
     # Prebuild an empty attachment instance
     @salary.attachments.build

data/app/models/salary.rb

@@ -1,6 +1,6 @@
 class Salary < Invoice
   # Association customizing
-  belongs_to :employee, :foreign_key => :company_id, :class_name => 'Person'
+  belongs_to :employee, :foreign_key => :company_id, :class_name => 'Employee'
   belongs_to :employer, :foreign_key => :customer_id, :class_name => 'Person'
 
   validates :employee, :employer, :presence => true
@@ -13,6 +13,13 @@ class Salary < Invoice
     company_id = value
   end
       
+  # States
+  # ======
+  STATES = ['booked', 'canceled', 'paid']
+  scope :by_state, lambda {|value|
+    where(:state => value) unless value == 'all'
+  }
+
   # String
   def to_s(format = :default)
     "%s (%s / %s - %s)" % [title, company, duration_from ? I18n::localize(duration_from) : '', duration_to ? I18n::localize(duration_to) : '']

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

@@ -1,9 +1,6 @@
 = semantic_form_for @salary do |f|
   = f.semantic_errors
   = f.inputs do
-    = f.input :state, :collection => invoice_states_as_collection
-    = f.input :employer, :as => :combobox
-    = f.input :employee, :as => :combobox
     = f.input :title
     = f.input :duration_from, :as => :date_field
     = f.input :duration_to, :as => :date_field

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

@@ -1,3 +1,5 @@
+= render 'salaries/sidebar'
+
 %table.list#salaries_list
   %tr
     %th= t_attr :value_date, Invoice

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

@@ -0,0 +1,11 @@
+- unless @salary_sidebar
+  - @salary_sidebar = true
+
+  - content_for :sidebar do
+    .sub-tabs
+      %h3 Filter
+      %ul
+        %li= link_to t('bookyt.all'), url_for(params.merge(:by_state => 'all', :overdue => nil))
+        - for state in Salary::STATES
+          %li= link_to t(state, :scope => 'invoice.state'), url_for(params.merge(:by_state => state, :overdue => nil))
+        %li= link_to t(:overdue, :scope => 'invoice.state'), url_for(params.merge(:by_state => nil, :overdue => true))

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

@@ -0,0 +1 @@
+= render :template => 'application/index'

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

@@ -0,0 +1,10 @@
+%h2 Arbeitnehmer auswählen
+
+= semantic_form_for @salary, :url => new_salary_path, :method => :get do |f|
+  = f.semantic_errors
+
+  = f.inputs do
+    = f.input :employee, :as => :combobox
+
+  = f.buttons do
+    = f.commit_button

data/config/routes.rb

@@ -2,6 +2,7 @@ Rails.application.routes.draw do
   # Salaries
   resources :salaries do
     collection do
+      get :select_employee
       get :statistics
     end
 

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 4
-  version: 0.2.4
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-11 00:00:00 +01:00
+date: 2011-11-16 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -35,7 +35,10 @@ files:
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
 - app/views/salaries/_salary_certificate.html.haml
+- app/views/salaries/_sidebar.html.haml
+- app/views/salaries/index.html.haml
 - app/views/salaries/payslip.pdf.prawn
+- app/views/salaries/select_employee.html.haml
 - app/views/salaries/show.html.haml
 - app/views/salaries/statistics.html.haml
 - config/locales/de.yml