sticutils 0.2.9 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ba13dd16d46e2a0ec703f07e2e663a422c7c314797c395458d7324b0b4619ca8
-  data.tar.gz: 02aeae63260cf66db9a94a87a5fbceb5efcadccc87fc1cb5313be3768b536b1c
+  metadata.gz: 778d5218c62fb43b73f98a959aef885b679a77528a79fcc7903e527164041ff4
+  data.tar.gz: 642af963287a2d3abebe8bd180322c6ed8c0cc64b18cf4004e7c8186bbf03cf8
 SHA512:
-  metadata.gz: a698b73a85eea43cb6ade5b94284e60117ed4ee8b6e29f113f773cd0d8525e6749a21083ac884a66501d4f7460356e62f026d1704bb876e024eb7912c4b2e9ba
-  data.tar.gz: d34692200d674b65abe1fc944e491a03e0a4f4d92106c88bb7d249b156d62d28d20a555c59695fba4b1462c4101d87fff86c274b8c237a5ee87dcfd92709f3b3
+  metadata.gz: e1ed8d6d2318beef3302f748fe21b036f6f07d3ca54bde0649be30611eae49798918d1fec752baabf2425e536287c10f8d6fc34be166229d9761df1c420a06ee
+  data.tar.gz: 139e9d1d93a331e0703022a88b93a7cc253cf1daf431c13b42763a5a6b661669022dbf543436b6818395a37a1b7615a4bd1d43446cdfe8a3b91ff510fe39fd1d

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

@@ -65,19 +65,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/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/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.9"
+  VERSION = "1.0.2"
 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.2.9
+  version: 1.0.2
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-07 00:00:00.000000000 Z
+date: 2020-11-18 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
@@ -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