sticutils 0.3.7 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7ad433d1ae0514f9b1c5c523734f908d6d625f9bebf39bb6afb878b1f6e2796
-  data.tar.gz: 45b8625bba7038b7bf07df0e9a0bdfaa77594959c40aa3357f10b20ccd8bb20d
+  metadata.gz: 8c30f23a34f71a55823bc0190e50c2084bc0da113cbf74d11355e0994524b124
+  data.tar.gz: 264d43e4e3592c0c18aa50eb2e26dbf46f9ec0fb89369082bd80d3ba670552ec
 SHA512:
-  metadata.gz: b6ff7007ca2eda634ffe71eccb1611f72a017ed98f480e31f06c9be92803c1fd30f9a4c615c2ed91821e7b483cf8775b7dbc1f74f8f9d9d634bf99279a12d308
-  data.tar.gz: 518bd9bc391832f7af4039013ed874998a7e56c583c4726710de9426a077f1f2eebb963b4850435703a1df2c9ff6102e625870138934008cab5f6a135a2b7120
+  metadata.gz: 628549bab03ca620c384ceddd9f640d225500da719acae8de046ef6c20d6214570c4302fc25e9c6290102a9ea4999b5cd100976ca527d4f4eecc14d92f9a6fe2
+  data.tar.gz: 6b77428d6ab2244fe5a4729e42dbc9a21bd18421ccf73595bee68f934de64c3d184f150bb3bbdf29f4158085b98ff4ae21e57597790d7f8cda93450816dea29c

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 = "0.3.7"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.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