sticutils 1.0.7 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76885aaed498a28a327cf9ea2f804390ce982ae63f1d191ddcd7862f83d7ea96
-  data.tar.gz: 629308e5410aa422dfecae788f945cd0e4f186efa19095fa68a74b607c337cee
+  metadata.gz: 46a9fe2516c0cda974638b2d5761309281c00642a6d2fbbe3296a482b048e797
+  data.tar.gz: 71aceffbd5aa1f9edf644da60b229b6c8eb408683ef4d3a4f8562217e20f4a71
 SHA512:
-  metadata.gz: 8adc05e3e5e318cdab80592daef0fc544c7645b9655a32f8226202db3d31ea2d0426925b783b83bc2a7758440cb560bbd0efe5d1d3327ce61ff8093d1b08407a
-  data.tar.gz: 5be8d2f429102c37e02aa5cb190f7ae0e285f9d8a5ec98d0b6c0cdfe315e5881f85f50b6544e143bebc38c7dada23a368cfec53a404d427a1d7a00d13536db35
+  metadata.gz: e8e62b4fc05d5def3eb8d02429937b998f0ae030511a4550e118ec3e658c40953d8a21c0807f45dc7461e4eaad197480ef691f080989f969284971f6fd9ee80e
+  data.tar.gz: 83d44504eda2f709df81870df3a7800663abb81cb58dc8b34532f6dc8aada8cbb696ba55fe6b56bdc6f63e38a38379cf97f35a82d79c7e91b3cebfba5af209bb

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/app/models/intranet/global_prepessoafisica.rb

@@ -3,10 +3,15 @@ class Intranet::GlobalPrepessoafisica < Intranet::IntranetRecord
 
   belongs_to :cidade_nascimento, :class_name => 'GlobalCidade', :foreign_key => :nascimentoCidade_id
   belongs_to :global_endereco, :class_name => 'GlobalEndereco', :foreign_key => :endereco_id
-  belongs_to :global_cidade, :class_name => 'GlobalCidade', :foreign_key => :tituloEleitorCidade_id
+  belongs_to :cidade_titulo, :class_name => 'GlobalCidade', :foreign_key => :tituloEleitorCidade_id
   belongs_to :global_estado, :class_name => 'GlobalEstado', :foreign_key => :rgOrgaoExpedidorUF_sigla
-  has_many :global_prepessoafisica_contasbancarias, :class_name => 'GlobalPrepessoafisicaContasbancaria'
-  has_many :global_prepessoafisica_contatos, :class_name => 'GlobalPrepessoafisicaContato'
   has_many :tjpi_predependentes, :class_name => 'TjpiPredependente', foreign_key: :prePessoaFisica_id
-  has_many :tjpi_previnculados, :class_name => 'TjpiPrevinculado'
+  
+  has_many :global_prepessoafisica_contasbancarias, class_name: 'GlobalPrepessoafisicaContasbancaria'
+  has_many :global_prepessoafisica_contatos, class_name: 'GlobalPrepessoafisicaContato', foreign_key: :pessoaFisica_id
+  has_many :global_contatos, through: :global_prepessoafisica_contatos
+  
+  has_one :tjpi_previnculados, :class_name => 'TjpiPrevinculado', foreign_key: :prePessoaFisica_id
+  has_one :tjpi_vinculado, :class_name => 'TjpiPrevinculado', foreign_key: :prePessoaFisica_id
+  has_many :tjpi_vinculos, through: :tjpi_vinculado, source: :tjpi_vinculo_principal
 end

data/app/models/intranet/tjpi_previnculado.rb

@@ -9,11 +9,18 @@ class Intranet::TjpiPrevinculado < Intranet::IntranetRecord
   has_many :tjpi_previnculado_manifestacoes, :class_name => 'TjpiPrevinculadoManifestaco'
   has_many :tjpi_previnculadopendencia, :class_name => 'TjpiPrevinculadopendencium'
   has_many :tjpi_previnculadopendencia, :class_name => 'TjpiPrevinculadopendencium'
-  has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
-  has_many :tjpi_vinculos, :class_name => 'TjpiVinculo'
+  # has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
+  # has_many :tjpi_vinculos, :class_name => 'TjpiVinculo'
+
+  belongs_to :tjpi_vinculo_principal, :class_name => 'TjpiVinculo', foreign_key: :vinculoPrincipal_id
+  belongs_to :tjpi_vinculo, :class_name => 'TjpiVinculo', foreign_key: :vinculoPrincipal_id
   
   has_many :tjpi_previnculado_declaracoes, class_name: 'TjpiPrevinculadoDeclaracao', foreign_key: :preVinculado_id
   belongs_to :tjpi_previnculadointervencao_ultima, class_name: 'TjpiPrevinculadointervencao', foreign_key: :intervencao_id
   belongs_to :tjpi_previnculadointervencao_anterior, class_name: 'TjpiPrevinculadointervencao', foreign_key: :anterior_id
   has_many :tjpi_previnculadointervencoes, class_name: 'TjpiPrevinculadointervencao', foreign_key: :preVinculado_id
+
+  def tjpi_vinculos
+    [self.tjpi_vinculo_principal]
+  end
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "1.0.7"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.4.1
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-06-24 00:00:00.000000000 Z
+date: 2022-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,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