bookyt_salary 0.5.1 → 0.6.0

data/app/controllers/salary_templates_controller.rb

@@ -0,0 +1,11 @@
+class SalaryTemplatesController < AuthorizedController
+  def copy
+    # Duplicate original record
+    template = resource.dup
+
+    # Rebuild positions
+    set_resource_ivar template
+
+    render 'edit'
+  end
+end

data/app/helpers/salary_booking_template_helper.rb

@@ -0,0 +1,5 @@
+module SalaryBookingTemplateHelper
+  def obligation_collection
+    obligations = SalaryBookingTemplate::OBLIGATION_FLAGS.map{|obligation| [t_attr(obligation), obligation.to_s]}
+  end
+end

data/app/models/salary_booking_template.rb

@@ -1,3 +1,20 @@
 class SalaryBookingTemplate < BookingTemplate
   default_scope order(:code)
+
+  # Obligation flags
+  OBLIGATION_FLAGS = [:for_gross_income, :for_ahv, :for_uvg, :for_uvgz, :for_ktg, :for_deduction_at_source]
+  def obligation=(value)
+    OBLIGATION_FLAGS.each do |flag|
+      self[flag] = value.include?(flag.to_s)
+    end
+  end
+
+  def obligation
+    result = []
+    OBLIGATION_FLAGS.each do |flag|
+      result << flag.to_s if self[flag]
+    end
+
+    result
+  end
 end

data/app/models/salary_template.rb

@@ -0,0 +1,4 @@
+class SalaryTemplate < ActiveRecord::Base
+  belongs_to :person
+  has_and_belongs_to_many :salary_booking_template
+end

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

@@ -3,20 +3,15 @@
   = f.inputs do
     = f.input :employee_id, :as => :hidden
     = f.input :employer_id, :as => :hidden
-    = f.input :title
-    = f.input :duration_from, :as => :date_field
-    = f.input :duration_to, :as => :date_field
-    = f.input :remarks, :input_html => {:rows => 4}
+    .row
+      .span16= f.input :title, :input_html => {:class => 'span12'}
+    .row
+      .span8= f.input :duration_from, :as => :date_field
+      .span8= f.input :duration_to, :as => :date_field
+    .row
+      .span16= f.input :remarks, :input_html => {:rows => 4, :class => 'span12'}
 
-  = f.inputs t('title.line_items') do
-    %table#line_items
-      %thead
-        = render 'line_items/list_header', :invoice => resource
-      %tbody
-        = f.fields_for :line_items do |line_item|
-          = render 'line_items/form', :line_item => line_item
-      %tfoot
-        = render 'line_items/list_footer', :total_amount => resource.amount
+  = render 'line_items/list_form', :f => f, :invoice => resource
 
   = f.buttons do
     = f.commit_button

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

@@ -4,8 +4,10 @@
   = f.semantic_errors
 
   = f.inputs do
-    = f.input :employee, :as => :combobox
-    = f.input :duration_from, :discard_day => true, :start_year => Time.now.year - 2, :end_year => Time.now.year + 1, :include_blank => false
+    .row
+      .span8= f.input :employee, :as => :combobox
+    .row
+      .span8= f.input :duration_from, :as => :date_field
 
   = f.buttons do
     = f.commit_button

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

@@ -1,22 +1,23 @@
 = semantic_form_for @salary_booking_template do |f|
   = f.semantic_errors
   = f.inputs do
-    = f.input :title, :input_html => {"data-autofocus" => true}
-    = f.input :code, :input_html => {:style => 'width: 6em'}
-    = f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
-    = f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
-    = f.input :amount, :input_html => {:style => 'width: 6em'}
-    = f.input :amount_relates_to, :collection => amount_relations_as_collection
-    = f.input :comments, :input_html => {:rows => 5}
+    .row
+      .span8= f.input :title, :input_html => {"data-autofocus" => true}
+      .span8= f.input :code
+    .row
+      .span8= f.input :credit_account, :as => :combobox, :collection => accounts_as_collection
+      .span8= f.input :debit_account, :as => :combobox, :collection => accounts_as_collection
+    .row
+      .span8= f.input :amount
+      .span8= f.input :amount_relates_to, :collection => amount_relations_as_collection
+    .row
+      .span16= f.input :comments, :input_html => {:rows => 2, :class => 'span12'}
 
-  = f.inputs do
-    = f.input :for_ahv, :wrapper_html => {:class => 'col1'}
-    = f.input :for_ktg, :wrapper_html => {:class => 'col2'}
-    = f.input :for_uvg, :wrapper_html => {:class => 'col1'}
-    = f.input :for_uvgz, :wrapper_html => {:class => 'col2'}
-    = f.input :for_gross_income, :wrapper_html => {:class => 'col1'}
-    = f.input :for_deduction_at_source, :wrapper_html => {:class => 'col2'}
-    = f.input :salary_declaration_code, :wrapper_html => {:class => 'col1'}
+    .row
+      .span8= f.input :obligation, :as => :check_boxes, :collection => obligation_collection
+
+    .row
+      .span8= f.input :salary_declaration_code
 
   = f.buttons do
     = f.commit_button

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

@@ -12,6 +12,5 @@
     %th= t_attr :for_uvgz, SalaryBookingTemplate
     %th= t_attr :for_deduction_at_source, SalaryBookingTemplate
     %th= t_attr :salary_declaration_code, SalaryBookingTemplate
-    %th.action-links
 
   = render @salary_booking_templates

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

@@ -1,6 +1,6 @@
 %tr[salary_booking_template]
   %td
-    = link_to "%s (%s)" % [salary_booking_template.title, salary_booking_template.code], salary_booking_template
+    = link_to salary_booking_template.title, salary_booking_template, 'data-href-container' => 'tr'
     - if salary_booking_template.comments.present?
       %hr{:style => "height: 1px; margin: 0"}/
       %i= salary_booking_template.comments
@@ -14,8 +14,4 @@
   %td= salary_booking_template.for_uvg
   %td= salary_booking_template.for_uvgz
   %td= salary_booking_template.for_deduction_at_source
-  %td= salary_booking_template.salary_declaration_code
-  %td.action-links
-    = list_link_for(:edit, salary_booking_template)
-    = list_link_for(:delete, salary_booking_template)
-    = link_to image_tag('16x16/copy.png', :title => 'Copy'), copy_salary_booking_template_path(salary_booking_template)
+  %td.number= salary_booking_template.salary_declaration_code

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

@@ -0,0 +1,13 @@
+= semantic_form_for @salary_template do |f|
+  = f.semantic_errors
+  = f.inputs do
+    .row
+      .span8= f.input :title, :input_html => {"data-autofocus" => true}
+      .span8= f.input :person
+    .row
+      .span16= f.input :salary_booking_template, :input_html => {:class => 'span12'}
+    .row
+      .span16= f.input :remarks, :input_html => {:rows => 2, :class => 'span12'}
+
+  = f.buttons do
+    = f.commit_button

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

@@ -0,0 +1,7 @@
+%table.salary_template_list
+  %tr
+    %th= t_attr :title, SalaryTemplate
+    %th= t_attr :person, SalaryTemplate
+    %th= t_attr :remarks, SalaryTemplate
+
+  = render @salary_templates

data/app/views/salary_templates/_salary_template.html.haml

@@ -0,0 +1,4 @@
+%tr[salary_template]
+  %td= link_to salary_template.title, salary_template, 'data-href-container' => 'tr'
+  %td= salary_template.person
+  %td= salary_template.remarks

data/config/application.rb

@@ -0,0 +1,19 @@
+require File.expand_path('../boot', __FILE__)
+
+require 'rails/all'
+
+# If you have a Gemfile, require the gems listed there, including any gems
+# you've limited to :test, :development, or :production.
+Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+
+module BookytSalary
+  class Application < Rails::Application
+    # Configure generators values. Many other options are available, be sure to check the documentation.
+    config.generators do |g|
+      g.stylesheets false
+      g.test_framework :rspec
+      g.template_engine :haml
+      g.fixture_replacement :factory_girl
+    end
+  end
+end

data/config/boot.rb

@@ -0,0 +1,6 @@
+require 'rubygems'
+
+# Set up gems listed in the Gemfile.
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+
+require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])

data/config/locales/bookyt_salary.de.yml

@@ -3,6 +3,7 @@ de:
     models:
       salary:                  Lohn
       salary_booking_template: Lohnart
+      salary_template:         Lohnvorlage
 
     attributes:
       salary:
@@ -13,17 +14,29 @@ de:
         employer:      Arbeitgeber
         employee:      Arbeitnehmer
       salary_booking_template:
-        for_ahv:                 AHV/ALV
-        for_ktg:                 KTG
+        for_ahv:                 AHV/ALV/IV/EO
+        for_ktg:                 Krankentaggeld-Versicherung (KTG)
         for_gross_income:        Bruttolohn
-        for_uvg:                 UVG
-        for_uvgz:                UVGZ
+        for_uvg:                 Unfall-Versicherung (UVG)
+        for_uvgz:                Unfallzusatz-Versicherung (UVGZ)
+        obligation:              Pflichtigkeit
         salary_declaration_code: Lohnausweis
         for_deduction_at_source: Quellensteuer
+      salary_template:
+        person:                  Person
+        salary_booking_template: Lohnarten
+        title:                   Titel
+        remarks:                 Bemerkungen
 
   salaries:
     select_employee:
       title: Arbeitnehmer auswählen
+  salary_booking_templates:
+    index:
+      title: Lohnarten
+  salary_templates:
+    index:
+      title: Lohnvorlagen
 
   bookyt:
     main_navigation:

data/config/routes.rb

@@ -6,6 +6,8 @@ Rails.application.routes.draw do
     end
   end
 
+  resources :salary_templates
+
   resources :salaries do
     collection do
       get :select_employee

data/db/migrate/20120117112030_create_salary_templates.rb

@@ -0,0 +1,9 @@
+class CreateSalaryTemplates < ActiveRecord::Migration
+  def change
+    create_table :salary_templates do |t|
+      t.integer :person_id
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20120117113315_create_salary_template_habtm_table.rb

@@ -0,0 +1,12 @@
+class CreateSalaryTemplateHabtmTable < ActiveRecord::Migration
+  def up
+    create_table "salary_templates_salary_booking_templates", :id => false do |t|
+      t.integer "salary_template_id"
+      t.integer "salary_booking_template_id"
+    end
+  end
+
+  def down
+    drop_table "salary_templates_salary_booking_templates"
+  end
+end

data/db/migrate/20120117120044_rename_salary_booking_template_habtm_table.rb

@@ -0,0 +1,5 @@
+class RenameSalaryBookingTemplateHabtmTable < ActiveRecord::Migration
+  def up
+    rename_table :salary_templates_salary_booking_templates, :salary_booking_templates_salary_templates
+  end
+end

data/db/migrate/20120117122025_add_title_and_remarks_to_salary_templates.rb

@@ -0,0 +1,6 @@
+class AddTitleAndRemarksToSalaryTemplates < ActiveRecord::Migration
+  def change
+    add_column :salary_templates, :title, :string
+    add_column :salary_templates, :remarks, :text
+  end
+end

data/lib/bookyt_salary/navigation.rb

@@ -5,10 +5,11 @@ module BookytSalary
                    :if => Proc.new { user_signed_in? } do |salaries|
         salaries.item :salaries, t('bookyt.main_navigation.salaries'), salaries_path, :highlights_on => /\/salaries($|\/[0-9]*($|\/.*))/
         salaries.item :new_salary, t_title(:new, Salary), select_employee_salaries_path
-        salaries.item :employees, t_title(:index, Employee), employees_path
-        salaries.item :employments, t_title(:index, Employment), employments_path, :highlights_on => /\/employments($|\/[0-9]*($|\/.*))/
-        salaries.item :salary_statistics, t_title(:statistics, Salary), statistics_salaries_path, :highlights_on => /\/salaries\/statistics($|\?)/
-        account_item(salaries, '5000')
+        salaries.item :divider, "", :class => 'divider'
+        salaries.item :salary_statistics, t_title(:statistics, Salary), statistics_salaries_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
       end
     end
   end

data/lib/bookyt_salary/version.rb

@@ -1,3 +1,3 @@
 module BookytSalary
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: bookyt_salary
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 7
   prerelease: 
   segments: 
   - 0
-  - 5
-  - 1
-  version: 0.5.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - "Simon H\xC3\xBCrlimann (CyT)"
@@ -15,9 +15,80 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-13 00:00:00 Z
-dependencies: []
-
+date: 2012-01-17 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 3
+        - 1
+        - 0
+        version: 3.1.0
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: recurrence
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: shoulda
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rcov
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
 description: This plugin extends bookyt with Salary functionality.
 email: simon.huerlimann@cyt.ch
 executables: []
@@ -30,8 +101,11 @@ files:
 - app/assets/stylesheets/bookyt_salary.sass
 - app/controllers/salaries_controller.rb
 - app/controllers/salary_booking_templates_controller.rb
+- app/controllers/salary_templates_controller.rb
+- app/helpers/salary_booking_template_helper.rb
 - app/models/salary.rb
 - app/models/salary_booking_template.rb
+- app/models/salary_template.rb
 - app/views/salaries/_form.html.haml
 - app/views/salaries/_list.html.haml
 - app/views/salaries/_salary.html.haml
@@ -45,18 +119,27 @@ 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_templates/_form.html.haml
+- app/views/salary_templates/_list.html.haml
+- app/views/salary_templates/_salary_template.html.haml
+- config/application.rb
+- config/boot.rb
 - config/locales/bookyt_salary.de.yml
 - config/routes.rb
 - db/migrate/20111223162759_add_salary_specific_flags_to_booking_templates.rb
 - db/migrate/20111227093619_use_string_for_salary_declaration_code.rb
+- db/migrate/20120117112030_create_salary_templates.rb
+- db/migrate/20120117113315_create_salary_template_habtm_table.rb
+- db/migrate/20120117120044_rename_salary_booking_template_habtm_table.rb
+- db/migrate/20120117122025_add_title_and_remarks_to_salary_templates.rb
 - db/seeds.rb
 - lib/bookyt_salary.rb
 - lib/bookyt_salary/navigation.rb
 - lib/bookyt_salary/railtie.rb
 - lib/bookyt_salary/version.rb
 homepage: https://github.com/huerlisi/bookyt_salary
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: []
 
@@ -83,9 +166,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Salary plugin for bookyt
 test_files: []
 
+has_rdoc: