sticutils 1.0.1 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d01fdfd704137c8d2f1c5f17cc6d17e8ee3ca7aa68acc265990273ee3eef841
-  data.tar.gz: 931df0d6f77a0a09c3f9f45f8d99f221391a367ed7f346d54d8dbe0a93f2ece7
+  metadata.gz: d4df4ff63dd990c48d4022e44c7dda0c8197a974e2a354f5e7ce082c3358c227
+  data.tar.gz: 628a666fc385409e2ced846264a866b3ca4141554b2e5c1afc656e26522ce2cf
 SHA512:
-  metadata.gz: 7c68d1d66eaee6457e3f6bde5e88ee55107e43a87f15c45d8b369b2d8dc05ff4305b890c60f6e76c2ef669ed52422dd986eda5d2b3fa879850ed544d1b8e3b57
-  data.tar.gz: 91b9792ca668764e8f0cd3f0f0b591d174f0037d633e79b8f013a5cbb0e6dfda293fb35affa5103fdbf1dc0bdb1e55b3be725e92b774c6038386fcb176ad3e4d
+  metadata.gz: d74fa4ae4aceba578b589264dbdfae90a709f7075605690c82ec76170d7a3871e6cbf1a8c88ac8d90ca6d815046b068772dbd1dfe0235f84802801bcf93d6908
+  data.tar.gz: 319fe3b415864ba932ec16af5cb23f2a12010c30e1464aa90f0f7979e9ca40b65ad54c21b4c36d4e503b922cd20f607eea2e6c1a63b51b4b551b213547b6b0b8

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

@@ -8,19 +8,22 @@ 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(: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/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/funcionario.rb

@@ -3,4 +3,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'
 end

data/app/models/gestorh/local_trabalho.rb

@@ -0,0 +1,3 @@
+class Gestorh::LocalTrabalho < Gestorh::GestorhRecord
+  self.table_name = 'gestor_rh.cdlocaistrabalho'
+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/tjpi_vinculo.rb

@@ -33,7 +33,7 @@ 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'
+  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

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "1.0.1"
+  VERSION = "1.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.6
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-11 00:00:00.000000000 Z
+date: 2021-06-24 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
@@ -74,6 +75,7 @@ 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
@@ -238,9 +240,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 :transparencia
-end