sticutils 0.2.9 → 0.3.4
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/models/gestorh/classificacao_verba.rb +5 -0
- data/app/models/gestorh/folha_agrupada.rb +25 -10
- data/app/models/gestorh/folha_agrupada_id_separado.rb +6 -4
- data/app/models/gestorh/local_trabalho.rb +3 -0
- data/app/models/gestorh/movimento_acumulado.rb +0 -2
- data/app/models/gestorh/verba.rb +2 -0
- data/app/models/intranet/legislacao_documentocomprobatorio.rb +10 -11
- data/app/models/intranet/tjpi_campodeclaracaoprevinculado.rb +0 -1
- data/app/models/intranet/tjpi_declaracaoprevinculado.rb +3 -5
- data/app/models/intranet/tjpi_funcao_embasamento.rb +2 -2
- data/app/models/intranet/tjpi_previnculado.rb +1 -1
- data/app/models/intranet/{tjpi_previnculado_declaraco.rb → tjpi_previnculado_declaracao.rb} +1 -1
- data/app/models/intranet/tjpi_vinculo.rb +3 -2
- data/lib/sticutils/version.rb +1 -1
- metadata +5 -6
- data/app/models/transparencia.rb +0 -2
- data/app/models/transparencia/evento_folha_pagamento.rb +0 -3
- data/app/models/transparencia/transparencia_record.rb +0 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 3182bb4d4f35eee57a8c0b7b43b91af38bbe9aa76d83d93ad788d4cee047e6cc
|
4
|
+
data.tar.gz: 14f70d1d5b8f39762c113f162778a3edd665f53d1b973daf439da88cb055d362
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5e0efa6e028bcafce39bb7e0518ccaf80ca50b9d2351667315ad164bc5d934d24ed039054c050cd262540edcc4999ff692d3ec1864fc2bf61462b0996a8e6ec0
|
7
|
+
data.tar.gz: 88a978b03223141a1c66a6f6e2fc38731e1d6c5b76114b7c86d65829bb2ddbc235d8ab96f0e58b18fc37c248213d665e0cc6909faed62e455c48048d354e72a6
|
@@ -8,19 +8,22 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
|
|
8
8
|
belongs_to :cargo, foreign_key: :mvps_cargo, primary_key: :fc_codigo, class_name: 'Gestorh::Funcao'
|
9
9
|
belongs_to :lotacao, foreign_key: :mvps_reglotacao, primary_key: :lt_registro
|
10
10
|
belongs_to :nivel_salario, foreign_key: :mvps_nivelsalario, primary_key: :ns_registro
|
11
|
+
belongs_to :local_trabalho, foreign_key: :mvps_localtrab, primary_key: :lctb_codigo
|
11
12
|
|
12
13
|
def liquido_total
|
13
14
|
self.rendimento_total - self.desconto_total
|
14
15
|
end
|
15
16
|
|
16
17
|
def eventos_e_valores
|
18
|
+
# .where.not('cdclassificacaoverba.cv_classificacao': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
|
17
19
|
Gestorh::MovimentoAcumulado.where(mv_regfolha: self.folhas, mv_matricula: self.matricula)
|
18
|
-
.joins(:
|
19
|
-
.where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
|
20
|
+
.joins(verba: :classificacao_verba)
|
20
21
|
.select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
|
21
|
-
'
|
22
|
-
'mv_dc as status', 'mv_total as valor',
|
22
|
+
'cdverba.vb_nome as nome_evento',
|
23
|
+
'mv_dc as status', 'mv_total as valor',
|
24
|
+
'cdclassificacaoverba.cv_classificacao as tipo')
|
23
25
|
.to_a
|
26
|
+
.uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
|
24
27
|
end
|
25
28
|
|
26
29
|
def remuneracao_paradigma
|
@@ -65,19 +68,31 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
|
|
65
68
|
x.tipo == 'RENDIMENTO_VANTAGENS_PESSOAIS' || (x.tipo == 'RENDIMENTO_VANTAGENS_EVENTUAIS' && x.status == 'C')}
|
66
69
|
end
|
67
70
|
|
71
|
+
def subsidio_com_gratificacao
|
72
|
+
self.subsidios.pluck(:valor).sum
|
73
|
+
end
|
74
|
+
|
68
75
|
# diarias
|
69
76
|
def diarias
|
70
|
-
|
71
|
-
.
|
77
|
+
if Object.const_defined?('DailyRate')
|
78
|
+
DailyRate.where(cpf: numeric_cpf, date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
|
79
|
+
.sum(:pago)
|
80
|
+
end
|
72
81
|
end
|
73
|
-
|
82
|
+
|
74
83
|
def diarias_positivas
|
75
|
-
|
84
|
+
if Object.const_defined?('DailyRate')
|
85
|
+
DailyRate.where(cpf: numeric_cpf,
|
86
|
+
pago: [0..Float::INFINITY], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
|
76
87
|
.sum(:pago)
|
88
|
+
end
|
77
89
|
end
|
78
|
-
|
90
|
+
|
79
91
|
def diarias_negativas
|
80
|
-
|
92
|
+
if Object.const_defined?('DailyRate')
|
93
|
+
DailyRate.where(cpf: numeric_cpf,
|
94
|
+
pago: [-Float::INFINITY..0], date: [Date.new(self.ano, self.mes)..Date.new(self.ano, self.mes).at_end_of_month])
|
81
95
|
.sum(:pago)
|
96
|
+
end
|
82
97
|
end
|
83
98
|
end
|
@@ -14,13 +14,15 @@ class Gestorh::FolhaAgrupadaIdSeparado < Gestorh::GestorhRecord
|
|
14
14
|
end
|
15
15
|
|
16
16
|
def eventos_e_valores
|
17
|
+
# .where.not('cdclassificacaoverba.cv_classificacao': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
|
17
18
|
Gestorh::MovimentoAcumulado.where(mv_regfolha: self.folhas, mv_matricula: self.matricula)
|
18
|
-
.joins(:
|
19
|
-
.where.not('evento_folha_pagamentos.tipo': 'DESCONTO_PREVIDENCIA_PUBLICA_IAPEP')
|
19
|
+
.joins(verba: :classificacao_verba)
|
20
20
|
.select('mv_regfolha as folha_id', 'mv_verba as codigo_evento',
|
21
|
-
'
|
22
|
-
'mv_dc as status', 'mv_total as valor',
|
21
|
+
'cdverba.vb_nome as nome_evento',
|
22
|
+
'mv_dc as status', 'mv_total as valor',
|
23
|
+
'cdclassificacaoverba.cv_classificacao as tipo')
|
23
24
|
.to_a
|
25
|
+
.uniq{|x| [x.codigo_evento, x.status, x.valor] } # uniq temporario para remover verbas com 2 classificacoes
|
24
26
|
end
|
25
27
|
|
26
28
|
def remuneracao_paradigma
|
@@ -4,6 +4,4 @@ class Gestorh::MovimentoAcumulado < Gestorh::GestorhRecord
|
|
4
4
|
belongs_to :verba, foreign_key: :mv_verba, primary_key: :vb_codigo
|
5
5
|
belongs_to :funcionario, foreign_key: :mv_matricula, primary_key: :fn_matricula
|
6
6
|
belongs_to :folha, foreign_key: :mv_regfolha, primary_key: :fp_registro
|
7
|
-
|
8
|
-
belongs_to :evento_folha_pagamento, foreign_key: :mv_verba, primary_key: :codigo, class_name: 'Transparencia::EventoFolhaPagamento'
|
9
7
|
end
|
data/app/models/gestorh/verba.rb
CHANGED
@@ -1,15 +1,14 @@
|
|
1
1
|
class Intranet::LegislacaoDocumentocomprobatorio < Intranet::IntranetRecord
|
2
2
|
self.table_name = 'legislacao_documentocomprobatorio'
|
3
3
|
|
4
|
-
has_many :ferias_ferias, :
|
5
|
-
has_many :ferias_fracaos, :
|
6
|
-
belongs_to :legislacao_norma, :
|
7
|
-
has_many :tjpi_cargo_embasamentos, :
|
8
|
-
has_many :tjpi_carreiras, :
|
9
|
-
has_many :tjpi_declaracaoprevinculados, :
|
10
|
-
has_many :
|
11
|
-
has_many :tjpi_exerciciofuncaos, :
|
12
|
-
has_many :
|
13
|
-
has_many :
|
14
|
-
has_many :tjpi_vinculo_documentos, :class_name => 'TjpiVinculoDocumento', :foreign_key => :documentos_id
|
4
|
+
has_many :ferias_ferias, class_name: 'FeriasFeria', foreign_key: :documentoComprobatorio_id
|
5
|
+
has_many :ferias_fracaos, class_name: 'FeriasFracao', foreign_key: :DocumentoFerias_id
|
6
|
+
belongs_to :legislacao_norma, class_name: 'LegislacaoNorma', foreign_key: :norma_id
|
7
|
+
has_many :tjpi_cargo_embasamentos, class_name: 'TjpiCargoEmbasamento', foreign_key: :embasamento_id
|
8
|
+
has_many :tjpi_carreiras, class_name: 'TjpiCarreira', foreign_key: :documentoComprobatorio_id
|
9
|
+
has_many :tjpi_declaracaoprevinculados, class_name: 'TjpiDeclaracaoprevinculado', foreign_key: :comprovante_id
|
10
|
+
has_many :tjpi_exerciciofuncaos, class_name: 'TjpiExerciciofuncao', foreign_key: :documentoNomeacao_id
|
11
|
+
has_many :tjpi_exerciciofuncaos, class_name: 'TjpiExerciciofuncao', foreign_key: :documentoExoneracao_id
|
12
|
+
has_many :tjpi_funcao_embasamentos, class_name: 'TjpiFuncaoEmbasamento', foreign_key: :embasamento_id
|
13
|
+
has_many :tjpi_vinculo_documentos, class_name: 'TjpiVinculoDocumento', foreign_key: :documentos_id
|
15
14
|
end
|
@@ -2,5 +2,4 @@ class Intranet::TjpiCampodeclaracaoprevinculado < Intranet::IntranetRecord
|
|
2
2
|
self.table_name = 'tjpi_campodeclaracaoprevinculado'
|
3
3
|
|
4
4
|
belongs_to :tjpi_declaracaoprevinculado, :class_name => 'TjpiDeclaracaoprevinculado', :foreign_key => :declaracao_id
|
5
|
-
belongs_to :tjpi_declaracaoprevinculado, :class_name => 'TjpiDeclaracaoprevinculado', :foreign_key => :declaracao_id
|
6
5
|
end
|
@@ -1,9 +1,7 @@
|
|
1
1
|
class Intranet::TjpiDeclaracaoprevinculado < Intranet::IntranetRecord
|
2
2
|
self.table_name = 'tjpi_declaracaoprevinculado'
|
3
3
|
|
4
|
-
has_many :tjpi_campodeclaracaoprevinculados, :class_name => 'TjpiCampodeclaracaoprevinculado'
|
5
|
-
|
6
|
-
|
7
|
-
belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :foreign_key => :comprovante_id
|
8
|
-
has_many :tjpi_previnculado_declaracoes, :class_name => 'TjpiPrevinculadoDeclaraco'
|
4
|
+
has_many :tjpi_campodeclaracaoprevinculados, :class_name => 'TjpiCampodeclaracaoprevinculado', foreign_key: :declaracao_id
|
5
|
+
belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', foreign_key: :comprovante_id
|
6
|
+
has_many :tjpi_previnculado_declaracoes, :class_name => 'TjpiPrevinculadoDeclaracao', foreign_key: :declaracoes_id
|
9
7
|
end
|
@@ -1,6 +1,6 @@
|
|
1
1
|
class Intranet::TjpiFuncaoEmbasamento < Intranet::IntranetRecord
|
2
2
|
self.table_name = 'tjpi_funcao_embasamento'
|
3
3
|
|
4
|
-
belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', :
|
5
|
-
belongs_to :tjpi_funcao, :class_name => 'TjpiFuncao', :
|
4
|
+
belongs_to :legislacao_documentocomprobatorio, :class_name => 'LegislacaoDocumentocomprobatorio', foreign_key: :embasamento_id
|
5
|
+
belongs_to :tjpi_funcao, :class_name => 'TjpiFuncao', foreign_key: :funcao_id
|
6
6
|
end
|
@@ -12,7 +12,7 @@ class Intranet::TjpiPrevinculado < Intranet::IntranetRecord
|
|
12
12
|
has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
|
13
13
|
has_many :tjpi_vinculos, :class_name => 'TjpiVinculo'
|
14
14
|
|
15
|
-
has_many :tjpi_previnculado_declaracoes, class_name: '
|
15
|
+
has_many :tjpi_previnculado_declaracoes, class_name: 'TjpiPrevinculadoDeclaracao', foreign_key: :preVinculado_id
|
16
16
|
belongs_to :tjpi_previnculadointervencao_ultima, class_name: 'TjpiPrevinculadointervencao', foreign_key: :intervencao_id
|
17
17
|
belongs_to :tjpi_previnculadointervencao_anterior, class_name: 'TjpiPrevinculadointervencao', foreign_key: :anterior_id
|
18
18
|
has_many :tjpi_previnculadointervencoes, class_name: 'TjpiPrevinculadointervencao', foreign_key: :preVinculado_id
|
@@ -1,4 +1,4 @@
|
|
1
|
-
class Intranet::
|
1
|
+
class Intranet::TjpiPrevinculadoDeclaracao < Intranet::IntranetRecord
|
2
2
|
self.table_name = 'tjpi_previnculado_declaracoes'
|
3
3
|
|
4
4
|
belongs_to :tjpi_previnculado, :class_name => 'TjpiPrevinculado', :foreign_key => :preVinculado_id
|
@@ -9,10 +9,8 @@ class Intranet::TjpiVinculo < Intranet::IntranetRecord
|
|
9
9
|
has_many :tjpi_exerciciofuncaos, :class_name => 'TjpiExerciciofuncao', :foreign_key => :vinculo_id
|
10
10
|
has_many :tjpi_exerciciolotacaos, :class_name => 'TjpiExerciciolotacao'
|
11
11
|
has_many :tjpi_gestorexcepcionals, :class_name => 'TjpiGestorexcepcional'
|
12
|
-
has_many :tjpi_previnculados, :class_name => 'TjpiPrevinculado'
|
13
12
|
has_many :tjpi_progressaocarreiras, :class_name => 'TjpiProgressaocarreira'
|
14
13
|
has_many :tjpi_vinculados, :class_name => 'TjpiVinculado'
|
15
|
-
belongs_to :tjpi_previnculado, :class_name => 'TjpiPrevinculado', :foreign_key => :cadastro_id
|
16
14
|
belongs_to :tjpi_cargo, :class_name => 'TjpiCargo', :foreign_key => :cargo_id
|
17
15
|
belongs_to :tjpi_terceirizacao_contrato, :class_name => 'TjpiTerceirizacaoContrato', :foreign_key => :contratoTerceirizacao_id
|
18
16
|
belongs_to :tjpi_areaestagio, :class_name => 'TjpiAreaestagio', :foreign_key => :areaEstagio_id
|
@@ -35,6 +33,9 @@ class Intranet::TjpiVinculo < Intranet::IntranetRecord
|
|
35
33
|
belongs_to :procurador, class_name: 'GlobalPrepessoafisica', foreign_key: :procurador_id
|
36
34
|
belongs_to :conta_bancaria, class_name: 'GlobalContabancaria', foreign_key: :contaBancaria_id
|
37
35
|
|
36
|
+
has_many :tjpi_previnculados, class_name: 'TjpiPrevinculado', foreign_key: :vinculoPrincipal_id
|
37
|
+
belongs_to :tjpi_previnculado, class_name: 'TjpiPrevinculado', foreign_key: :cadastro_id
|
38
|
+
|
38
39
|
has_many :tjpi_contrachequeagrupados, class_name: "TjpiContrachequeagrupado", foreign_key: :matricula, primary_key: :matricula
|
39
40
|
has_many :tjpi_contrachequelegados, class_name: "TjpiContrachequelegado", foreign_key: :matricula, primary_key: :matricula
|
40
41
|
end
|
data/lib/sticutils/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sticutils
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.3.4
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Ricardo Viana
|
8
8
|
autorequire:
|
9
9
|
bindir: exe
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-04-28 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -67,6 +67,7 @@ files:
|
|
67
67
|
- Rakefile
|
68
68
|
- app/models/gestorh.rb
|
69
69
|
- app/models/gestorh/banco.rb
|
70
|
+
- app/models/gestorh/classificacao_verba.rb
|
70
71
|
- app/models/gestorh/folha.rb
|
71
72
|
- app/models/gestorh/folha_agrupada.rb
|
72
73
|
- app/models/gestorh/folha_agrupada_id_separado.rb
|
@@ -74,6 +75,7 @@ files:
|
|
74
75
|
- app/models/gestorh/funcao.rb
|
75
76
|
- app/models/gestorh/funcionario.rb
|
76
77
|
- app/models/gestorh/gestorh_record.rb
|
78
|
+
- app/models/gestorh/local_trabalho.rb
|
77
79
|
- app/models/gestorh/lotacao.rb
|
78
80
|
- app/models/gestorh/movimento.rb
|
79
81
|
- app/models/gestorh/movimento_acumulado.rb
|
@@ -206,7 +208,7 @@ files:
|
|
206
208
|
- app/models/intranet/tjpi_predependente.rb
|
207
209
|
- app/models/intranet/tjpi_previnculado.rb
|
208
210
|
- app/models/intranet/tjpi_previnculado_anexo.rb
|
209
|
-
- app/models/intranet/
|
211
|
+
- app/models/intranet/tjpi_previnculado_declaracao.rb
|
210
212
|
- app/models/intranet/tjpi_previnculado_manifestaco.rb
|
211
213
|
- app/models/intranet/tjpi_previnculadointervencao.rb
|
212
214
|
- app/models/intranet/tjpi_previnculadopendencium.rb
|
@@ -238,9 +240,6 @@ files:
|
|
238
240
|
- app/models/intranet/tjpi_vinculadoemfolha.rb
|
239
241
|
- app/models/intranet/tjpi_vinculo.rb
|
240
242
|
- app/models/intranet/tjpi_vinculo_documento.rb
|
241
|
-
- app/models/transparencia.rb
|
242
|
-
- app/models/transparencia/evento_folha_pagamento.rb
|
243
|
-
- app/models/transparencia/transparencia_record.rb
|
244
243
|
- bin/console
|
245
244
|
- bin/setup
|
246
245
|
- lib/sticutils.rb
|
data/app/models/transparencia.rb
DELETED