sticutils 1.0.5 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c02f0f83de409b8403532c12f18e8fb62b0a9f65c2f1055b38bf155d78916f3f
-  data.tar.gz: a2a9d9c68d39ed22bdd8b65173cc117601d432f655706132e1518e6ed2a18ded
+  metadata.gz: 1634c12a77c48f82d0697764187c8df08a1e665f2d63201316f3027f40e07ccb
+  data.tar.gz: 9c9a8cd8b8911f0ccf3e040b6bf34c5eebaa70628f87d7da4fb9b14f66b58b60
 SHA512:
-  metadata.gz: 64002394adfc7fd342875443beedf4081d6e979768356560d4744e70d0c3593bf09e9828d802faa232ae6878206ff70e8209c157c48f167d9e7f4174f14e9402
-  data.tar.gz: 7dbe1a361f26dceae41dcb41842eccbada640cdbeecc6886ebebb041032b484599b38650a2236c960dd1652841b5a5278f93b81e2436e17ea32681dbcd2e0b8b
+  metadata.gz: a0b65803055cabf9938fd476f21ee0e0180264cb38225394f3e97493d4536af1c20bbdabbf23d99c09b2ba8155cb9c47f6605884f1d86e084029ca21cf6b3cdd
+  data.tar.gz: 70412d042c632460b61efb6c45caa973aeba58e34d5b5e34e05129c2aea31d46ce97c9b9a928a85847f17a8d3741b4c0a736da6b322387d5e8607b1bf431c422

data/app/models/gestorh/ferias.rb

@@ -0,0 +1,4 @@
+class Gestorh::Ferias < Gestorh::GestorhRecord
+  self.table_name = 'gestor_rh.cdferias'
+  belongs_to :funcionario, foreign_key: :fe_matricula, primary_key: :fn_matricula
+end

data/app/models/gestorh/folha_agrupada.rb

@@ -75,14 +75,14 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   # diarias
   def diarias
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: numeric_cpf, date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
+      DailyRate.where(cpf: [cpf, numeric_cpf], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
         .sum(:pago)
     end
   end
   
   def diarias_positivas
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: numeric_cpf, 
+      DailyRate.where(cpf: [cpf, numeric_cpf], 
           pago: [0..Float::INFINITY], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
         .sum(:pago)
     end
@@ -90,7 +90,7 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   
   def diarias_negativas
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: numeric_cpf,
+      DailyRate.where(cpf: [cpf, numeric_cpf],
         pago: [-Float::INFINITY..0], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
         .sum(:pago)
     end

data/app/models/gestorh/funcionario.rb

@@ -3,4 +3,6 @@ class Gestorh::Funcionario < Gestorh::GestorhRecord
 
   has_many :movimento_acumulados, foreign_key: :mv_matricula, primary_key: :fn_matricula
   has_many :folhas, through: :movimento_acumulados
+  has_many :ferias, foreign_key: :fe_matricula, primary_key: :fn_matricula, class_name: 'Gestorh::Ferias'
+  belongs_to :vinculo, foreign_key: :fn_vinculo
 end

data/app/models/gestorh/vinculo.rb

@@ -1,3 +1,5 @@
 class Gestorh::Vinculo < Gestorh::GestorhRecord
   self.table_name = 'gestor_rh.cdvinculo'
+
+  has_many :funcionarios, foreign_key: :fn_vinculo
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "1.0.5"
+  VERSION = "1.0.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.9
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,6 +68,7 @@ files:
 - app/models/gestorh.rb
 - app/models/gestorh/banco.rb
 - app/models/gestorh/classificacao_verba.rb
+- app/models/gestorh/ferias.rb
 - app/models/gestorh/folha.rb
 - app/models/gestorh/folha_agrupada.rb
 - app/models/gestorh/folha_agrupada_id_separado.rb
@@ -265,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Utilidades para aplicações rails da STIC