sticutils 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9685a388dbf49b4183b5e8498f66c88637c93265c8f5e2dd4d64d1b529a2d22b
-  data.tar.gz: 410f2e22828e4169e986951bcb053119f709bb95e481fcf1ea13c983340bf78b
+  metadata.gz: 511be6365e33bfb108a6c25f00ba10c8bd27a5eb3ccd730613a799fc10be17f4
+  data.tar.gz: 426cff0098279af62bff9ae28957b8689c3ae3ee363a6bf3fe9ac58d1fff54d2
 SHA512:
-  metadata.gz: cbf2d7be030c980e7d8eee96f73754c0fb8077d2be75a45aafcb752736cd206efc7bfc68dfd3f70a2c35ce27d41510842446a2d99db7c7a050eafaeabcd3bd9a
-  data.tar.gz: f4838559e41529c83383a8a4b2c8f1fb0fb9857f58438c2fe62a75f49d84ac0a4e4cc7c0f567291741504df0b5a1c28842a4ecb92cba730145bb8508651615d2
+  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
@@ -76,14 +78,20 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
         .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/lib/sticutils/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-16 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
@@ -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