sticutils 0.3.8 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1c5769d5b66eb3ea6b6e6d9c611f30206297761a592bad78540831db2ea19f3
-  data.tar.gz: 330c9ccb0109dfa93bba6cb9c86c4a64f72a1c45732b909d9e97e701f8ef9d44
+  metadata.gz: ad5fefab023dccbe4f729aab147786ab3e3c64453b0c03c4045de5f19e4191d6
+  data.tar.gz: 2960b77f91eeaaec95eb3b1cdc1059733578e5980af163dada979aae11d84656
 SHA512:
-  metadata.gz: bac3486aff85bac718b6327af3047106b54587656d76517ee2159592c64d2eb486b1ed59bec4e8f2100a22ee49eeb55d04c04ef75390e772cee7551df2ab7670
-  data.tar.gz: f2a1058cff6d7c6318864b4f2b165f524801c91934cfc34f2b383a28aeb0ee188beb10972cf8534d26c9f6fc094558f0380631adc77a177d28c845590ba8d5f1
+  metadata.gz: c65e244da066773f3d03dfbbd37b5712417c3fc82c785b01db8fa39313329f2a052026043c7325b4ecb2bb2454adcde62502823ad15a9502efed9ac5b62c1268
+  data.tar.gz: 9a0a29ad606207c1a0fd81cc6ea7c349112bc0aa9960cf1d91dd0d7a4308acbfd2af17e977e64a3b5f6344efa847d862b172a60fb17a4e85f0b44cda1edfb96a

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/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,8 +9,12 @@ 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_vinculos, :class_name => 'TjpiVinculo', foreign_key: :cadastro_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

data/app/models/intranet/tjpi_vinculo.rb

@@ -13,29 +13,31 @@ class Intranet::TjpiVinculo < Intranet::IntranetRecord
   has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
   belongs_to :tjpi_cargo, :class_name => 'TjpiCargo', :foreign_key => :cargo_id
   belongs_to :tjpi_terceirizacao_contrato, :class_name => 'TjpiTerceirizacaoContrato', :foreign_key => :contratoTerceirizacao_id
-  belongs_to :tjpi_areaestagio, :class_name => 'TjpiAreaestagio', :foreign_key => :areaEstagio_id
   belongs_to :tjpi_categoriavinculoconfig, :class_name => 'TjpiCategoriavinculoconfig', :foreign_key => :categoria
   belongs_to :global_estado, :class_name => 'GlobalEstado', :foreign_key => :seccionalOAB_sigla
   belongs_to :tjpi_terceirizacao_postodetrabalho, :class_name => 'TjpiTerceirizacaoPostodetrabalho', :foreign_key => :postoDeTrabalho_id
   belongs_to :tjpi_contratocargotemporario, :class_name => 'TjpiContratocargotemporario', :foreign_key => :contrato_id
-  belongs_to :global_orgao_instituicao, :class_name => 'GlobalOrgao', :foreign_key => :instituicaoDeEnsino_id
   belongs_to :tjpi_nivelreferencium, :class_name => 'TjpiNivelreferencium', :foreign_key => :nivelReferenciaAtual_id
   belongs_to :tjpi_vinculo, :class_name => 'TjpiVinculo', :foreign_key => :vinculoOrigem_id
   belongs_to :tjpi_vinculado, :class_name => 'TjpiVinculado', :foreign_key => :vinculado_id
   has_one :tjpi_vinculado_principal, :class_name => 'TjpiVinculado', :foreign_key => :vinculoPrincipal_id
   belongs_to :global_orgao_atual, :class_name => 'GlobalOrgao', :foreign_key => :lotacaoAtual_id
   belongs_to :global_orgao_origem, :class_name => 'GlobalOrgao', :foreign_key => :orgaoOrigem_id
-  belongs_to :global_cidade, :class_name => 'GlobalCidade', :foreign_key => :vagaOrigem_id
   has_many :tjpi_vinculo_documentos, :class_name => 'TjpiVinculoDocumento', :foreign_key => :vinculo_id
   belongs_to :global_unidadeorganizacional, :class_name => 'GlobalUnidadeorganizacional', :foreign_key => :lotacaoAtual_id
   belongs_to :orgao_origem_cargo, :class_name => 'GlobalOrgao', :foreign_key => :origemCargo_id
   belongs_to :instituidor, class_name: 'GlobalPrepessoafisica', foreign_key: :instituidor_id
   belongs_to :procurador, class_name: 'GlobalPrepessoafisica', foreign_key: :procurador_id
   belongs_to :conta_bancaria, class_name: 'GlobalContabancaria', foreign_key: :contaBancaria_id
-
+  
   has_many :tjpi_previnculados, class_name: 'TjpiPrevinculado', foreign_key: :vinculoPrincipal_id
   belongs_to :tjpi_previnculado, class_name: 'TjpiPrevinculado', foreign_key: :cadastro_id
   
   has_many :tjpi_contrachequeagrupados, class_name: "TjpiContrachequeagrupado", foreign_key: :matricula, primary_key: :matricula
   has_many :tjpi_contrachequelegados, class_name: "TjpiContrachequelegado", foreign_key: :matricula, primary_key: :matricula
+
+  # estagio
+  belongs_to :area_estagio, :class_name => 'TjpiAreaestagio', :foreign_key => :areaEstagio_id
+  belongs_to :instituicao_ensino, :class_name => 'GlobalOrgao', :foreign_key => :instituicaoDeEnsino_id
+  belongs_to :vaga_origem, :class_name => 'GlobalCidade', :foreign_key => :vagaOrigem_id
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,4 @@
 module Sticutils
-  VERSION = "0.3.8"
+  VERSION = "0.4.2"
+  # VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.3.8
+  version: 0.4.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-07 00:00:00.000000000 Z
+date: 2022-01-31 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