sticutils 0.3.0 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a140877c20d6d2895095a96b365f3b4fc1e7e209c6582702e504fc367f04784
-  data.tar.gz: f4399eb9a412b83aa059e5c8b881d319bcb86dc40d4afca3c439cc3b8e5cd1e6
+  metadata.gz: 40acdd41da3e6ce18afad2fae3733e99d2c539c4dd845a272830f0fb29f5aeb6
+  data.tar.gz: f66502769017b85070d10d2647905d8c225d5824afcefc88aa2dbbed04022fb3
 SHA512:
-  metadata.gz: 8cb9bf385e60ef4f1c6825210f95161f40c30310a1047f00655640f943e99121d54e1618dd903e5371cc2b7a6c217c86d3c8d87d73dcf7bc51e9f911913d0ffd
-  data.tar.gz: b225de798d99c4b13a26450a33a29753e7c570cd09dbf50f36a9167a642b281bae57423fc851c3c7b4bff2341b51a52cf8d3b5df5052ba4fb4e78fbf66c53c51
+  metadata.gz: 8a3cbb843827e20e182dbedb13ac50dfd39471fe490cbafe727c9646163e9fd628331881241aa97f9b0b9ae89406565b4c8c6bbf18d37bacdc79afe52faba7a8
+  data.tar.gz: 2cb50c52b31dc35705f86057634b7c5a21efa3699e7ff39826bb4364276b07484085354689a375fec13017d734d445be6930877f56ca44d0943ea3299279b533

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/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

@@ -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.3.0"
+  VERSION = "1.0.3"
 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.3.0
+  version: 1.0.3
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2020-11-19 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,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
@@ -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 :transparencia
-end