sticutils 0.3.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c6760fcdc8f0c42621dcc59fad94f2e5c8408bce8fd1c1f2785a67f015f38f
-  data.tar.gz: 47e9578003b9865a83902a4038cfe5bc4731e37c4dd8287489d30c71e2048b4e
+  metadata.gz: 01e910a26c6c9313290cbb037e04f128954fa1d421acf662be6907bb46d7a18f
+  data.tar.gz: fb4393fd1129ad335df698f244f2082faceba2210a6a0a93b69e2f747c1f013e
 SHA512:
-  metadata.gz: fe418e24e6d36cfa698fa3569d4927256cf75145b02097c53a5da85134799e83d17540c213d6b3eb0608c0dc700390abd57208e472bc21c9a63fce6eab09ee2d
-  data.tar.gz: 4a6a8bca716f6108ebe1c9ae256b9107d86e1374612d406a422d2f6c602270f200e51548044af73c55dab9fa2d1192151a74a53722962d1505b9a1c51c07ba99
+  metadata.gz: 5bc72ee664d86e3045856ed74f821eb005eeab73eba2f3d39c482bb6879305bd02638e5a75b5b260c61cfdcd49fac5a7871bc2140f61fb9036fb97ff73603a75
+  data.tar.gz: 6463d575457efcffff72bc58b4be9d10fad601dc1be3c2481465be2d464fc5581cc46b993444387a6356394d91cb36060cd6d72e99e1faf932d561ce76f1558d

data/app/models/gestorh/folha_agrupada.rb

@@ -14,15 +14,13 @@ 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(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
@@ -78,20 +76,14 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
         .sum(:pago)
     end
   end
-  
+
   def diarias_positivas
-    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])
+    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: 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/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/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', 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

data/app/models/transparencia.rb

@@ -0,0 +1,2 @@
+module Transparencia
+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/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "0.3.3"
+  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.3.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 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,7 +67,6 @@ 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
@@ -239,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

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