sticutils 0.2.7 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7280e82237508364a2ad91aef05d05c834d43b50966fbe5abdd77d9b775a0702
-  data.tar.gz: 40ab0b275e5f553589cd405fd1fc4dfb55962106524a65740206e1bb7353579c
+  metadata.gz: 511be6365e33bfb108a6c25f00ba10c8bd27a5eb3ccd730613a799fc10be17f4
+  data.tar.gz: 426cff0098279af62bff9ae28957b8689c3ae3ee363a6bf3fe9ac58d1fff54d2
 SHA512:
-  metadata.gz: fd55d0d4096b72a12f4394cef765108bdcfbf89331b2dc1273b639bf98df41dcd082428075f7f6f98817568bd20ba922e274604527fa98fd3e456f958265acbb
-  data.tar.gz: c8ea0f42c1181ac9bfc8ca80b8a21093fdaf3b45d9bcfa4dfc1029dbc3e111e99d75fc82ac737e87b4a0af48363aee23cb4a4c45f23e21b34eb31a2a51faadbf
+  metadata.gz: df70871e792d292c8b041e13b4488f503a00de15dd10a48bf667ee1964da6ba6a3d16793f759eb504739eb5cca8bc3aff6292883f25a2d03d86bff49e84fefd4
+  data.tar.gz: 8c47d049e96d8e0cdd8337fc4d478486140e54e3785c4885aee42869c45617dc85b3c162162c6c1dbfbb8699d3313365b13cf6ce96d24b26e720a6c9b1eede08

data/app/models/gestorh/classificacao_verba.rb

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

@@ -14,13 +14,15 @@ class Gestorh::FolhaAgrupada < 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(:evento_folha_pagamento)
-      .where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
+      .joins(verba: :classificacao_verba)
       .select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
-        'evento_folha_pagamentos.descricao as nome_evento',
-        'mv_dc as status', 'mv_total as valor', 'evento_folha_pagamentos.tipo')
+        'cdverba.vb_nome as nome_evento',
+        'mv_dc as status', 'mv_total as valor',
+        'cdclassificacaoverba.cv_classificacao as tipo')
       .to_a
+      .uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
   end
 
   def remuneracao_paradigma
@@ -65,19 +67,31 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
       x.tipo == 'RENDIMENTO_VANTAGENS_PESSOAIS' || (x.tipo == 'RENDIMENTO_VANTAGENS_EVENTUAIS' && x.status == 'C')}
   end
 
+  def subsidio_com_gratificacao
+    self.subsidios.pluck(:valor).sum
+  end
+
   # diarias
   def diarias
-    self.daily_rates.where(date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
-      .sum(:pago)
+    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])
+        .sum(:pago)
+    end
   end
-
+  
   def diarias_positivas
-    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])
+    if Object.const_defined?('DailyRate')
+      DailyRate.where(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
   end
-
+  
   def diarias_negativas
-    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])
+    if Object.const_defined?('DailyRate')
+      DailyRate.where(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
   end
 end

data/app/models/gestorh/folha_agrupada_id_separado.rb

@@ -14,13 +14,15 @@ 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(:evento_folha_pagamento)
-      .where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
+      .joins(verba: :classificacao_verba)
       .select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
-        'evento_folha_pagamentos.descricao as nome_evento',
-        'mv_dc as status', 'mv_total as valor', 'evento_folha_pagamentos.tipo')
+        'cdverba.vb_nome as nome_evento',
+        'mv_dc as status', 'mv_total as valor',
+        'cdclassificacaoverba.cv_classificacao as 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/gestorh_record.rb

@@ -1,5 +1,4 @@
 class Gestorh::GestorhRecord < ActiveRecord::Base
   self.abstract_class = true
-  # self.establish_connection :transparencia
-  self.establish_connection(ENV['TRANSPARENCIA_DATABASE_URL'])
+  self.establish_connection :transparencia
 end

data/app/models/gestorh/movimento_acumulado.rb

@@ -4,6 +4,4 @@ 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,3 +1,5 @@
 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/intranet/intranet_record.rb

@@ -1,5 +1,4 @@
 class Intranet::IntranetRecord < ActiveRecord::Base
   self.abstract_class = true
   self.establish_connection :intranet
-  self.establish_connection(ENV['INTRANET_DATABASE_URL'])
 end

data/app/models/intranet/legislacao_documentocomprobatorio.rb

@@ -1,15 +1,14 @@
 class Intranet::LegislacaoDocumentocomprobatorio < Intranet::IntranetRecord
   self.table_name = 'legislacao_documentocomprobatorio'
 
-  has_many :ferias_ferias, :class_name => 'FeriasFeria'
-  has_many :ferias_fracaos, :class_name => 'FeriasFracao'
-  belongs_to :legislacao_norma, :class_name => 'LegislacaoNorma', :foreign_key => :norma_id
-  has_many :tjpi_cargo_embasamentos, :class_name => 'TjpiCargoEmbasamento'
-  has_many :tjpi_carreiras, :class_name => 'TjpiCarreira'
-  has_many :tjpi_declaracaoprevinculados, :class_name => 'TjpiDeclaracaoprevinculado'
-  has_many :tjpi_declaracaoprevinculados, :class_name => 'TjpiDeclaracaoprevinculado'
-  has_many :tjpi_exerciciofuncaos, :class_name => 'TjpiExerciciofuncao'
-  has_many :tjpi_exerciciofuncaos, :class_name => 'TjpiExerciciofuncao'
-  has_many :tjpi_funcao_embasamentos, :class_name => 'TjpiFuncaoEmbasamento'
-  has_many :tjpi_vinculo_documentos, :class_name => 'TjpiVinculoDocumento', :foreign_key => :documentos_id
+  has_many :ferias_ferias, class_name: 'FeriasFeria', foreign_key: :documentoComprobatorio_id
+  has_many :ferias_fracaos, class_name: 'FeriasFracao', foreign_key: :DocumentoFerias_id
+  belongs_to :legislacao_norma, class_name: 'LegislacaoNorma', foreign_key: :norma_id
+  has_many :tjpi_cargo_embasamentos, class_name: 'TjpiCargoEmbasamento', foreign_key: :embasamento_id
+  has_many :tjpi_carreiras, class_name: 'TjpiCarreira', foreign_key: :documentoComprobatorio_id
+  has_many :tjpi_declaracaoprevinculados, class_name: 'TjpiDeclaracaoprevinculado', foreign_key: :comprovante_id
+  has_many :tjpi_exerciciofuncaos, class_name: 'TjpiExerciciofuncao', foreign_key: :documentoNomeacao_id
+  has_many :tjpi_exerciciofuncaos, class_name: 'TjpiExerciciofuncao', foreign_key: :documentoExoneracao_id
+  has_many :tjpi_funcao_embasamentos, class_name: 'TjpiFuncaoEmbasamento', foreign_key: :embasamento_id
+  has_many :tjpi_vinculo_documentos, class_name: 'TjpiVinculoDocumento', foreign_key: :documentos_id
 end

data/app/models/intranet/tjpi_campodeclaracaoprevinculado.rb

@@ -2,5 +2,4 @@ class Intranet::TjpiCampodeclaracaoprevinculado < Intranet::IntranetRecord
   self.table_name = 'tjpi_campodeclaracaoprevinculado'
 
   belongs_to :tjpi_declaracaoprevinculado, :class_name => 'TjpiDeclaracaoprevinculado', :foreign_key => :declaracao_id
-  belongs_to :tjpi_declaracaoprevinculado, :class_name => 'TjpiDeclaracaoprevinculado', :foreign_key => :declaracao_id
 end

data/app/models/intranet/tjpi_declaracaoprevinculado.rb

@@ -1,9 +1,7 @@
 class Intranet::TjpiDeclaracaoprevinculado < Intranet::IntranetRecord
   self.table_name = 'tjpi_declaracaoprevinculado'
 
-  has_many :tjpi_campodeclaracaoprevinculados, :class_name => 'TjpiCampodeclaracaoprevinculado'
-  has_many :tjpi_campodeclaracaoprevinculados, :class_name => 'TjpiCampodeclaracaoprevinculado'
-  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :comprovante_id
-  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :comprovante_id
-  has_many :tjpi_previnculado_declaracoes, :class_name => 'TjpiPrevinculadoDeclaraco'
+  has_many :tjpi_campodeclaracaoprevinculados, :class_name => 'TjpiCampodeclaracaoprevinculado', foreign_key: :declaracao_id
+  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', foreign_key: :comprovante_id
+  has_many :tjpi_previnculado_declaracoes, :class_name => 'TjpiPrevinculadoDeclaracao', foreign_key: :declaracoes_id
 end

data/app/models/intranet/tjpi_funcao_embasamento.rb

@@ -1,6 +1,6 @@
 class Intranet::TjpiFuncaoEmbasamento < Intranet::IntranetRecord
   self.table_name = 'tjpi_funcao_embasamento'
 
-  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :embasamento_id
-  belongs_to :tjpi_funcao, :class_name => 'TjpiFuncao', :foreign_key => :funcao_id
+  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', foreign_key: :embasamento_id
+  belongs_to :tjpi_funcao, :class_name => 'TjpiFuncao', foreign_key: :funcao_id
 end

data/app/models/intranet/tjpi_previnculado.rb

@@ -12,7 +12,7 @@ class Intranet::TjpiPrevinculado < Intranet::IntranetRecord
   has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
   has_many :tjpi_vinculos, :class_name => 'TjpiVinculo'
   
-  has_many :tjpi_previnculado_declaracoes, class_name: 'TjpiPrevinculadoDeclaraco', foreign_key: :preVinculado_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

data/app/models/intranet/{tjpi_previnculado_declaraco.rb → tjpi_previnculado_declaracao.rb}

@@ -1,4 +1,4 @@
-class Intranet::TjpiPrevinculadoDeclaraco < Intranet::IntranetRecord
+class Intranet::TjpiPrevinculadoDeclaracao < Intranet::IntranetRecord
   self.table_name = 'tjpi_previnculado_declaracoes'
 
   belongs_to :tjpi_previnculado, :class_name => 'TjpiPrevinculado', :foreign_key => :preVinculado_id

data/app/models/intranet/tjpi_vinculo.rb

@@ -9,10 +9,8 @@ class Intranet::TjpiVinculo < Intranet::IntranetRecord
   has_many :tjpi_exerciciofuncaos, :class_name => 'TjpiExerciciofuncao', :foreign_key => :vinculo_id
   has_many :tjpi_exerciciolotacaos, :class_name => 'TjpiExerciciolotacao'
   has_many :tjpi_gestorexcepcionals, :class_name => 'TjpiGestorexcepcional'
-  has_many :tjpi_previnculados, :class_name => 'TjpiPrevinculado'
   has_many :tjpi_progressaocarreiras, :class_name => 'TjpiProgressaocarreira'
   has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
-  belongs_to :tjpi_previnculado, :class_name => 'TjpiPrevinculado', :foreign_key => :cadastro_id
   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
@@ -35,6 +33,9 @@ class Intranet::TjpiVinculo < Intranet::IntranetRecord
   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'
+  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
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "0.2.7"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.3.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -67,6 +67,7 @@ files:
 - Rakefile
 - app/models/gestorh.rb
 - app/models/gestorh/banco.rb
+- app/models/gestorh/classificacao_verba.rb
 - app/models/gestorh/folha.rb
 - app/models/gestorh/folha_agrupada.rb
 - app/models/gestorh/folha_agrupada_id_separado.rb
@@ -206,7 +207,7 @@ files:
 - app/models/intranet/tjpi_predependente.rb
 - app/models/intranet/tjpi_previnculado.rb
 - app/models/intranet/tjpi_previnculado_anexo.rb
-- app/models/intranet/tjpi_previnculado_declaraco.rb
+- app/models/intranet/tjpi_previnculado_declaracao.rb
 - app/models/intranet/tjpi_previnculado_manifestaco.rb
 - app/models/intranet/tjpi_previnculadointervencao.rb
 - app/models/intranet/tjpi_previnculadopendencium.rb
@@ -238,9 +239,6 @@ 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

data/app/models/transparencia.rb

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

data/app/models/transparencia/evento_folha_pagamento.rb

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

data/app/models/transparencia/transparencia_record.rb

@@ -1,4 +0,0 @@
-class Transparencia::TransparenciaRecord < ActiveRecord::Base
-  self.abstract_class = true
-  self.establish_connection(ENV['TRANSPARENCIA_DATABASE_URL'])
-end