sticutils 0.4.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c5fe6d424be06ec2bc22a45cb9d04792326fcb58552bbb18dab4fc18ad5e558
-  data.tar.gz: 2f39ee3aa50363f7f7f0c722726f3bf0b86c8072d411ebdbb6c8fd789aa633d9
+  metadata.gz: 01e910a26c6c9313290cbb037e04f128954fa1d421acf662be6907bb46d7a18f
+  data.tar.gz: fb4393fd1129ad335df698f244f2082faceba2210a6a0a93b69e2f747c1f013e
 SHA512:
-  metadata.gz: b35b11cd76754c31120914dc809fc8be4adf4bba8347b8467d6069e85ab76b80dfb3d3e53ae1d6e10b9ddfef0eda11149fff0164dd7232fefb11c991f7168e22
-  data.tar.gz: 8a89f473c1cd1e72e85a5898bee430f782f32a4cc3000d5404b89a706c484cebc0c282a8485cd03d5a2da3250979e3fa57ef783a5515fbcdeee59569fb119fed
+  metadata.gz: 5bc72ee664d86e3045856ed74f821eb005eeab73eba2f3d39c482bb6879305bd02638e5a75b5b260c61cfdcd49fac5a7871bc2140f61fb9036fb97ff73603a75
+  data.tar.gz: 6463d575457efcffff72bc58b4be9d10fad601dc1be3c2481465be2d464fc5581cc46b993444387a6356394d91cb36060cd6d72e99e1faf932d561ce76f1558d

data/app/models/gestorh/folha_agrupada.rb

@@ -8,22 +8,19 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   belongs_to :cargo, foreign_key: :mvps_cargo, primary_key: :fc_codigo, class_name: 'Gestorh::Funcao'
   belongs_to :lotacao, foreign_key: :mvps_reglotacao, primary_key: :lt_registro
   belongs_to :nivel_salario, foreign_key: :mvps_nivelsalario, primary_key: :ns_registro
-  belongs_to :local_trabalho, foreign_key: :mvps_localtrab, primary_key: :lctb_codigo
 
   def liquido_total
     self.rendimento_total - self.desconto_total
   end
 
   def eventos_e_valores
-    # .where.not('cdclassificacaoverba.cv_classificacao': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
     Gestorh::MovimentoAcumulado.where(mv_regfolha: self.folhas, mv_matricula: self.matricula)
-      .joins(verba: :classificacao_verba)
+      .joins(:evento_folha_pagamento)
+      .where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
       .select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
-        'cdverba.vb_nome as nome_evento',
-        'mv_dc as status', 'mv_total as valor',
-        'cdclassificacaoverba.cv_classificacao as tipo')
+        'evento_folha_pagamentos.descricao as nome_evento',
+        'mv_dc as status', 'mv_total as valor', 'evento_folha_pagamentos.tipo')
       .to_a
-      .uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
   end
 
   def remuneracao_paradigma
@@ -75,24 +72,18 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   # diarias
   def diarias
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: [cpf, numeric_cpf], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
+      DailyRate.where(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: [cpf, numeric_cpf], 
-          pago: [0..Float::INFINITY], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
+    self.daily_rates.where(pago: [0..Float::INFINITY], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
         .sum(:pago)
-    end
   end
-  
+
   def diarias_negativas
-    if Object.const_defined?('DailyRate')
-      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])
+    self.daily_rates.where(pago: [-Float::INFINITY..0], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
         .sum(:pago)
-    end
   end
 end

data/app/models/gestorh/folha_agrupada_id_separado.rb

@@ -14,15 +14,13 @@ class Gestorh::FolhaAgrupadaIdSeparado < Gestorh::GestorhRecord
   end
 
   def eventos_e_valores
-    # .where.not('cdclassificacaoverba.cv_classificacao': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
     Gestorh::MovimentoAcumulado.where(mv_regfolha: self.folhas, mv_matricula: self.matricula)
-      .joins(verba: :classificacao_verba)
+      .joins(:evento_folha_pagamento)
+      .where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
       .select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
-        'cdverba.vb_nome as nome_evento',
-        'mv_dc as status', 'mv_total as valor',
-        'cdclassificacaoverba.cv_classificacao as tipo')
+        'evento_folha_pagamentos.descricao as nome_evento',
+        'mv_dc as status', 'mv_total as valor', 'evento_folha_pagamentos.tipo')
       .to_a
-      .uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
   end
 
   def remuneracao_paradigma

data/app/models/gestorh/funcionario.rb

@@ -3,6 +3,4 @@ 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/movimento_acumulado.rb

@@ -4,4 +4,6 @@ class Gestorh::MovimentoAcumulado < Gestorh::GestorhRecord
   belongs_to :verba, foreign_key: :mv_verba, primary_key: :vb_codigo
   belongs_to :funcionario, foreign_key: :mv_matricula, primary_key: :fn_matricula
   belongs_to :folha, foreign_key: :mv_regfolha, primary_key: :fp_registro
+
+  belongs_to :evento_folha_pagamento, foreign_key: :mv_verba, primary_key: :codigo, class_name: 'Transparencia::EventoFolhaPagamento'
 end

data/app/models/gestorh/verba.rb

@@ -1,5 +1,3 @@
 class Gestorh::Verba < Gestorh::GestorhRecord
   self.table_name = 'gestor_rh.cdverba'
-
-  has_one :classificacao_verba, foreign_key: :cv_verba, primary_key: :vb_codigo
 end

data/app/models/gestorh/vinculo.rb

@@ -1,5 +1,3 @@
 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,6 +35,4 @@ 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_pessoafisica.rb

@@ -1,20 +1,18 @@
 class Intranet::GlobalPessoafisica < Intranet::IntranetRecord
   self.table_name = 'global_pessoafisica'
 
-  has_many :global_orgaos, class_name: 'GlobalOrgao'
-  belongs_to :cidade_nascimento, class_name: 'GlobalCidade', foreign_key: :nascimentoCidade_id
-  belongs_to :global_endereco, class_name: 'GlobalEndereco', foreign_key: :endereco_id
-  belongs_to :admin_user, class_name: 'AdminUser', foreign_key: :user_login
-  belongs_to :cidade_titulo, class_name: 'GlobalCidade', foreign_key: :tituloEleitorCidade_id
-  belongs_to :estado_rg, class_name: 'GlobalEstado', foreign_key: :rgOrgaoExpedidorUF_sigla
-  belongs_to :global_prepessoafisica, class_name: 'GlobalPrepessoafisica', foreign_key: :cpf, primary_key: :cpf
+  has_many :global_orgaos, :class_name => 'GlobalOrgao'
+  belongs_to :cidade_nascimento, :class_name => 'GlobalCidade', :foreign_key => :nascimentoCidade_id
+  belongs_to :global_endereco, :class_name => 'GlobalEndereco', :foreign_key => :endereco_id
+  belongs_to :admin_user, :class_name => 'AdminUser', :foreign_key => :user_login
+  belongs_to :cidade_titulo, :class_name => 'GlobalCidade', :foreign_key => :tituloEleitorCidade_id
+  belongs_to :estado_rg, :class_name => 'GlobalEstado', :foreign_key => :rgOrgaoExpedidorUF_sigla
+  belongs_to :global_prepessoafisica, :class_name => 'GlobalPrepessoafisica', foreign_key: :cpf, primary_key: :cpf
 
-  has_many :global_pessoafisica_contasbancarias, class_name: 'GlobalPessoafisicaContasbancaria'
-  has_many :global_pessoafisica_contatos, class_name: 'GlobalPessoafisicaContato', foreign_key: :pessoaFisica_id
+  has_many :global_pessoafisica_contasbancarias, :class_name => 'GlobalPessoafisicaContasbancaria'
+  has_many :global_pessoafisica_contatos, :class_name => 'GlobalPessoafisicaContato', foreign_key: :pessoaFisica_id
   has_many :global_contatos, through: :global_pessoafisica_contatos
-
-  has_one :tjpi_vinculado, class_name: 'TjpiVinculado', foreign_key: :pessoaFisica_id
+  
+  has_one :tjpi_vinculado, :class_name => 'TjpiVinculado', foreign_key: :pessoaFisica_id
   has_many :tjpi_vinculos, through: :tjpi_vinculado, source: :tjpi_vinculo_principal
-
-  belongs_to :endereco_secundario, class_name: 'GlobalEndereco', foreign_key: :enderecoSecundario_id
 end

data/app/models/intranet/global_prepessoafisica.rb

@@ -3,15 +3,10 @@ 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 :cidade_titulo, :class_name => 'GlobalCidade', :foreign_key => :tituloEleitorCidade_id
+  belongs_to :global_cidade, :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 :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
+  has_many :tjpi_previnculados, :class_name => 'TjpiPrevinculado'
 end

data/app/models/intranet/tjpi_previnculado.rb

@@ -9,12 +9,8 @@ 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'
-
-  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_vinculados, :class_name => 'TjpiVinculado'
+  has_many :tjpi_vinculos, :class_name => 'TjpiVinculo'
   
   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,31 +13,29 @@ 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
+
+  has_many :tjpi_previnculados, class_name: 'TjpiPrevinculado'
   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/app/models/transparencia/evento_folha_pagamento.rb

@@ -0,0 +1,3 @@
+class Transparencia::EventoFolhaPagamento < Transparencia::TransparenciaRecord
+  has_many :folha_pagamento_detalhadas
+end

data/app/models/transparencia/transparencia_record.rb

@@ -0,0 +1,4 @@
+class Transparencia::TransparenciaRecord < ActiveRecord::Base
+  self.abstract_class = true
+  self.establish_connection :transparencia
+end

data/app/models/transparencia.rb

@@ -0,0 +1,2 @@
+module Transparencia
+end

data/lib/sticutils/version.rb

@@ -1,4 +1,3 @@
 module Sticutils
-  VERSION = "0.4.3"
-  #VERSION = "1.4.2"
+  VERSION = "1.0.0"
 end

data/sticutils.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'rails', '~> 5.0'
+  spec.add_dependency 'rails', '~> 6.0'
 
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-10 00:00:00.000000000 Z
+date: 2020-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -67,8 +67,6 @@ files:
 - Rakefile
 - 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
@@ -76,7 +74,6 @@ files:
 - app/models/gestorh/funcao.rb
 - app/models/gestorh/funcionario.rb
 - app/models/gestorh/gestorh_record.rb
-- app/models/gestorh/local_trabalho.rb
 - app/models/gestorh/lotacao.rb
 - app/models/gestorh/movimento.rb
 - app/models/gestorh/movimento_acumulado.rb
@@ -241,6 +238,9 @@ files:
 - app/models/intranet/tjpi_vinculadoemfolha.rb
 - app/models/intranet/tjpi_vinculo.rb
 - app/models/intranet/tjpi_vinculo_documento.rb
+- app/models/transparencia.rb
+- app/models/transparencia/evento_folha_pagamento.rb
+- app/models/transparencia/transparencia_record.rb
 - bin/console
 - bin/setup
 - lib/sticutils.rb
@@ -266,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Utilidades para aplicações rails da STIC

data/app/models/gestorh/classificacao_verba.rb

@@ -1,5 +0,0 @@
-class Gestorh::ClassificacaoVerba < Gestorh::GestorhRecord
-  self.table_name = 'gestor_rh.cdclassificacaoverba'
-
-  belongs_to :verba, foreign_key: :cv_verba, primary_key: :vb_codigo
-end

data/app/models/gestorh/ferias.rb

@@ -1,4 +0,0 @@
-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/local_trabalho.rb

@@ -1,3 +0,0 @@
-class Gestorh::LocalTrabalho < Gestorh::GestorhRecord
-  self.table_name = 'gestor_rh.cdlocaistrabalho'
-end