next_sgad 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1378122095a5945d9c9af38759594a20673bde
-  data.tar.gz: f8414ec87ece56c23f0c5103aa5fb9abfc36b768
+  metadata.gz: 2f701333d4d9ee374df27a4da29f5f97942f3419
+  data.tar.gz: 65ae0250538628b41c0fd2f06c847c73af75c12a
 SHA512:
-  metadata.gz: 44835b93d7185177e39b7ce45e4931a228e5d81ce645e7beb2dd5e5424c1618b03869df8faf44e7309f40008d3686e5eff5428a1f7e928738ef42fce4ca6d12c
-  data.tar.gz: d7afac49b5c96ef47a851671c4e2da0f0ad29c27a7f9ae906da8417c1ec8f0570f30eeef74a631929db49d55b53e8fa64e6516a974b8e9861dbeb9f4d8d763c3
+  metadata.gz: 6264868970816b09132e7e07416b0e43488284fc9835588e802237c26f55987c4b0c4293718a399c0b54b5d9e56d77cc46455c2227ca6d1887a8b2eeff8de86b
+  data.tar.gz: 8a489d32dc9921de82dfed4e76d350a962d21a8fee6db162d3ab7e2b946e0a2cbb967cdd965bf606af5491b577022feda2632ba2c1a284e0d5f7f9b37608c389

data/app/models/next_sgad/assessment.rb

@@ -34,14 +34,14 @@ module NextSgad
 
     # check if last year assessments can be copied
     def can_copy_last_years_skills?
-      last_years_skills= get_last_assessment
+      last_years_skills = get_last_assessment
       return false if last_years_skills.nil?
       last_years_skills.goals.skill.where.not(name: goals.skill.map(&:name)).exists?
     end
 
     # get last years skills
     def dup_last_year_skills
-      last_years_skills= get_last_assessment
+      last_years_skills = get_last_assessment
       return NextSgad::Goal.none if last_years_skills.nil?
       last_years_skills.goals.skill.where.not(name: goals.skill.map(&:name)).map {|g| d = g.dup; d.function_ids = g.function_ids; d}
     end

data/app/models/next_sgad/employee.rb

@@ -7,6 +7,10 @@ module NextSgad
     has_and_belongs_to_many :positions, association_foreign_key: :next_sgad_position_id, foreign_key: :next_sgad_employee_id
     has_one :efective_position, class_name: NextSgad::Position.name, foreign_key: :efective_id
     has_many :employees_assessments, dependent: :destroy
+    has_many :employee_paygrades
+    has_many :employee_work_periods
+    has_many :salaries, through: :employee_paygrades
+    has_one :latest_paygrade, ->{where(until: nil).order(since: :asc)}, class_name: ::EmployeePaygrade.name, foreign_key: :employee_id
 
     scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(id: NextSgad::Position.where(department_id: data).map(&:efective_id))}
     scope :function_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(id: NextSgad::Position.where(function_id: data).map(&:efective_id))}

data/app/models/next_sgad/function.rb

@@ -6,6 +6,9 @@ module NextSgad
     before_save :create_number, on: :create
     has_and_belongs_to_many :goals, association_foreign_key: :next_sgad_goal_id, foreign_key: :next_sgad_function_id
     has_and_belongs_to_many :messages, association_foreign_key: :next_sgad_message_id, foreign_key: :next_sgad_function_id
+    has_and_belongs_to_many :subsidy_types, association_foreign_key: :subsidy_type_id, foreign_key: :next_sgad_function_id
+    has_and_belongs_to_many :tax_types, association_foreign_key: :tax_type_id, foreign_key: :next_sgad_function_id
+    has_many :positions
 
     def name_and_number
       "#{number} - #{name}"

data/app/models/next_sgad/position.rb

@@ -10,6 +10,8 @@ module NextSgad
     has_many :employee_goals
     has_and_belongs_to_many :goals, association_foreign_key: :next_sgad_goal_id, foreign_key: :next_sgad_position_id
     has_and_belongs_to_many :employees, association_foreign_key: :next_sgad_employee_id, foreign_key: :next_sgad_position_id
+    has_and_belongs_to_many :subsidy_types, association_foreign_key: :subsidy_type_id, foreign_key: :next_sgad_position_id
+    has_and_belongs_to_many :tax_types, association_foreign_key: :tax_type_id, foreign_key: :next_sgad_position_id
 
     scope :department_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(department_id: data)}
     scope :efective_id, -> (data) {data = [data].flatten.compact.uniq; data.blank? || data.include?('all') ? all : where(efective_id: data)}

data/lib/next_sgad/version.rb

@@ -1,3 +1,3 @@
 module NextSgad
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: next_sgad
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Sergio Maziano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -295,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: SGAD