sticutils 2.0.4 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19556d4e9a40f2670a737e5685a515f441e2a37f563f4fa416d6d38c7db0d6fa
-  data.tar.gz: 3d669e9b31bad0474efebb3c2572d549b8f9c2cf68a16689c972a3d817067aef
+  metadata.gz: eea1dbfb5e466f1d453a03c0c30ab81cfea4c3250c69f6067c0f76a61b41da92
+  data.tar.gz: e272144a7608c7fb74d5617fb8db8e2976e13e424b4794e5e2004ee3ca619bf8
 SHA512:
-  metadata.gz: c866271d1dd81928abaaba044e2678c7b5394e35f04928909353970d7e34f51ce91900c874efb2bcbfd7f6d4a4e479b3aa962c86b1e4da36e39346e8e320b7e5
-  data.tar.gz: 2a7c74c176817da93d0d1114a6e218598719c96c2f2f6c1dd7d9f3f7b6f08a9ef0128e4f700dd565bd51703e432ce5dab1900674bba380c3ce1c0962f8c3f5a6
+  metadata.gz: eb39f02ea93c6d9f45f186e4ddf9f2511b82a76b4472ec27d47f5d8044241ba78fffc043511412231a20d2938c8464779da97c9429b2e4f48838685ce41131e7
+  data.tar.gz: dcb890f174d0a4a5386adfdcc3a386a981d61f9d36e35d46e6f8be28de5c4c6b112c6d0d6989c7efa49d79ccab2f0b761ad978e8e7baedd43555a2cdd93d770e

data/app/models/gestorh/folha_agrupada_id_separado.rb

@@ -15,16 +15,19 @@ class Gestorh::FolhaAgrupadaIdSeparado < Gestorh::GestorhRecord
 
   def eventos_e_valores
     # .where.not('cdclassificacaoverba.cv_classificacao': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
-    Gestorh::MovimentoAcumulado.where(mv_regfolha: self.folhas, mv_matricula: self.matricula)
+    Gestorh::MovimentoAcumulado.where(mv_regfolha: folhas, mv_matricula: matricula)
       .joins(verba: :classificacao_verba)
-      .select('mv_regfolha as folha_id',
-        'mv_verba as codigo_evento',
-        'mv_referencia as fator',
-        'cdverba.vb_nome as nome_evento',
-        'mv_dc as status', 'mv_total as valor',
-        'cdclassificacaoverba.cv_classificacao as tipo')
+      .select("mv_regfolha as folha_id",
+        "mv_verba as codigo_evento",
+        "mv_referencia as fator",
+        "cdverba.vb_nome as nome_evento",
+        "mv_dc as status",
+        "mv_total as valor",
+        "cdclassificacaoverba.cv_classificacao as tipo",
+        "mv_competencia as competencia_inicio",
+        "mv_competencia_final as competencia_fim")
       .to_a
-      .uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
+      .uniq { |x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
   end
 
   def remuneracao_paradigma

data/app/models/intranet/ferias.rb

@@ -0,0 +1,8 @@
+class Intranet::Ferias < Intranet::IntranetRecord
+  self.table_name = 'ferias_ferias'
+
+  belongs_to :documentocomprobatorio, class_name: 'LegislacaoDocumentocomprobatorio', foreign_key: :documentocomprobatorio_id
+  belongs_to :vinculo, class_name: 'TjpiVinculo', foreign_key: :vinculo_id
+  belongs_to :escala, class_name: 'FeriasEscala', foreign_key: :escala_id
+  has_many :fracoes, class_name: 'FeriasFracao', foreign_key: :ferias_id
+end

data/app/models/intranet/ferias_escala.rb

@@ -0,0 +1,5 @@
+class Intranet::FeriasEscala < Intranet::IntranetRecord
+  self.table_name = 'ferias_escala'
+
+  has_many :ferias, class_name: 'Ferias', foreign_key: :escala_id
+end

data/app/models/intranet/ferias_fracao.rb

@@ -1,7 +1,7 @@
 class Intranet::FeriasFracao < Intranet::IntranetRecord
   self.table_name = 'ferias_fracao'
 
-  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :DocumentoFerias_id
-  belongs_to :ferias_registromudancafraco, :class_name => 'FeriasRegistromudancafraco', :foreign_key => :registroMudanca_id
-  belongs_to :ferias_feria, :class_name => 'FeriasFeria', :foreign_key => :ferias_id
+  belongs_to :documentocomprobatorio, class_name: 'LegislacaoDocumentocomprobatorio', foreign_key: :documentoferias_id
+  belongs_to :registromudanca, class_name: 'FeriasMudancaFracao', foreign_key: :registromudanca_id
+  belongs_to :ferias
 end

data/app/models/intranet/ferias_mudanca_fracao.rb

@@ -0,0 +1,6 @@
+class Intranet::FeriasMudancaFracao < Intranet::IntranetRecord
+  self.table_name = 'ferias_registromudancafracoes'
+
+  has_many :fracoes, class_name: 'FeriasFracao', foreign_key: :registromudanca_id
+  belongs_to :ferias
+end

data/app/models/intranet/ferias_temp.rb

@@ -1,6 +1,6 @@
 class Intranet::FeriasTemp < Intranet::IntranetRecord
   self.table_name = 'ferias_temp'
 
-  belongs_to :global_orgao, :class_name => 'GlobalOrgao', :foreign_key => :lotacao_id
-  belongs_to :tjpi_vinculo, :class_name => 'TjpiVinculo', :foreign_key => :vinculo_id
+  belongs_to :orgao, class_name: 'GlobalOrgao', foreign_key: :lotacao_id
+  belongs_to :vinculo, class_name: 'TjpiVinculo', foreign_key: :vinculo_id
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "2.0.4"
+  VERSION = "2.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Ricardo Viana
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-02 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -118,9 +118,10 @@ files:
 - app/models/intranet/ejud_formacaoacademica.rb
 - app/models/intranet/ejud_linguaestrangeira.rb
 - app/models/intranet/ejud_perfileducacional.rb
-- app/models/intranet/ferias_feria.rb
+- app/models/intranet/ferias.rb
+- app/models/intranet/ferias_escala.rb
 - app/models/intranet/ferias_fracao.rb
-- app/models/intranet/ferias_registromudancafraco.rb
+- app/models/intranet/ferias_mudanca_fracao.rb
 - app/models/intranet/ferias_temp.rb
 - app/models/intranet/ferias_terco.rb
 - app/models/intranet/global_banco.rb
@@ -258,7 +259,7 @@ homepage: http://gitlab.tjpi.jus.br/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -273,8 +274,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Utilidades para aplicações rails da STIC
 test_files: []

data/app/models/intranet/ferias_feria.rb

@@ -1,8 +0,0 @@
-class Intranet::FeriasFeria < Intranet::IntranetRecord
-  self.table_name = 'ferias_ferias'
-
-  belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :documentoComprobatorio_id
-  belongs_to :tjpi_vinculo, :class_name => 'TjpiVinculo', :foreign_key => :vinculo_id
-  has_many :ferias_fracaos, :class_name => 'FeriasFracao'
-  has_many :ferias_registromudancafracoes, :class_name => 'FeriasRegistromudancafraco'
-end

data/app/models/intranet/ferias_registromudancafraco.rb

@@ -1,4 +0,0 @@
-class Intranet::FeriasRegistromudancafraco < Intranet::IntranetRecord
-  has_many :ferias_fracaos, :class_name => 'FeriasFracao'
-  belongs_to :ferias_feria, :class_name => 'FeriasFeria', :foreign_key => :ferias_id
-end