sticutils 1.0.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d4df4ff63dd990c48d4022e44c7dda0c8197a974e2a354f5e7ce082c3358c227
-  data.tar.gz: 628a666fc385409e2ced846264a866b3ca4141554b2e5c1afc656e26522ce2cf
+  metadata.gz: 3407eeffb328dacf6769505456923db576f3be18b7741cb9a051504455764b40
+  data.tar.gz: 47264381861cf5477e1aa1863227b7bbb5aa223441701fded41727321a3e0a55
 SHA512:
-  metadata.gz: d74fa4ae4aceba578b589264dbdfae90a709f7075605690c82ec76170d7a3871e6cbf1a8c88ac8d90ca6d815046b068772dbd1dfe0235f84802801bcf93d6908
-  data.tar.gz: 319fe3b415864ba932ec16af5cb23f2a12010c30e1464aa90f0f7979e9ca40b65ad54c21b4c36d4e503b922cd20f607eea2e6c1a63b51b4b551b213547b6b0b8
+  metadata.gz: 9d42edd0652fae198ecb97fa7d3234ba0186ada044933df4321c85e6e5989bd111868d9f53f5b66e60ed45563e9868e0386dd1d90836a3f018dde587054fe7dd
+  data.tar.gz: 3e61304e7405208a6508baa199a716fa5473f69884f4eb8b33ffdf522ce73ccbe0aa75bf5944a5f237f84b739ea6f20f7b10ca70c2f67ab144f063dacf11814e

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

@@ -4,4 +4,5 @@ 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/app/models/intranet/global_orgao.rb

@@ -35,4 +35,6 @@ class Intranet::GlobalOrgao < Intranet::IntranetRecord
   has_many :tjpi_vinculos_ensino, :class_name => 'TjpiVinculo', foreign_key: :instituicaoDeEnsino_id
   has_many :tjpi_vinculos_atuais, :class_name => 'TjpiVinculo', foreign_key: :lotacaoAtual_id
   has_many :tjpi_vinculos_origem, :class_name => 'TjpiVinculo', foreign_key: :orgaoOrigem_id
+
+  has_many :global_contatos, through: :global_orgao_contatos
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "1.0.6"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.4.0
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2021-10-22 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