sticutils 0.3.3 → 0.3.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72c6760fcdc8f0c42621dcc59fad94f2e5c8408bce8fd1c1f2785a67f015f38f
-  data.tar.gz: 47e9578003b9865a83902a4038cfe5bc4731e37c4dd8287489d30c71e2048b4e
+  metadata.gz: 41225f441c7974574d9aa7158eb45d806e0519a6ccf403d7596cdb6172f0594e
+  data.tar.gz: 695acc88465bfb9ed2cfb2dcced891e0d23bfaf300f5df4863b2fbb8abd27569
 SHA512:
-  metadata.gz: fe418e24e6d36cfa698fa3569d4927256cf75145b02097c53a5da85134799e83d17540c213d6b3eb0608c0dc700390abd57208e472bc21c9a63fce6eab09ee2d
-  data.tar.gz: 4a6a8bca716f6108ebe1c9ae256b9107d86e1374612d406a422d2f6c602270f200e51548044af73c55dab9fa2d1192151a74a53722962d1505b9a1c51c07ba99
+  metadata.gz: 5f538e432c08acdbb92719e326742365f8f7aeb013a94236a30e518a24c9eb46b572711b51dc042a44b0eef010400b58134fe7af29e444b19c2e23314826e087
+  data.tar.gz: d684705c95e9aa77cf3fd95c0e846b15dab14c4eec73841f4560296245598eabf0e00338c70ac29db54f526ed256937f325731f32e923cce3e3e283ecd13d8c6

data/app/models/gestorh/ferias.rb

@@ -0,0 +1,4 @@
+class Gestorh::Ferias < Gestorh::GestorhRecord
+  self.table_name = 'gestor_rh.cdferias'
+  belongs_to :funcionario, foreign_key: :fe_matricula, primary_key: :fn_matricula
+end

data/app/models/gestorh/folha_agrupada.rb

@@ -8,6 +8,7 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   belongs_to :cargo, foreign_key: :mvps_cargo, primary_key: :fc_codigo, class_name: 'Gestorh::Funcao'
   belongs_to :lotacao, foreign_key: :mvps_reglotacao, primary_key: :lt_registro
   belongs_to :nivel_salario, foreign_key: :mvps_nivelsalario, primary_key: :ns_registro
+  belongs_to :local_trabalho, foreign_key: :mvps_localtrab, primary_key: :lctb_codigo
 
   def liquido_total
     self.rendimento_total - self.desconto_total
@@ -74,14 +75,14 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   # diarias
   def diarias
     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])
+      DailyRate.where(cpf: [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
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: numeric_cpf, 
+      DailyRate.where(cpf: [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
@@ -89,7 +90,7 @@ class Gestorh::FolhaAgrupada < Gestorh::GestorhRecord
   
   def diarias_negativas
     if Object.const_defined?('DailyRate')
-      DailyRate.where(cpf: numeric_cpf,
+      DailyRate.where(cpf: [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

data/app/models/gestorh/funcionario.rb

@@ -3,4 +3,6 @@ class Gestorh::Funcionario < Gestorh::GestorhRecord
 
   has_many :movimento_acumulados, foreign_key: :mv_matricula, primary_key: :fn_matricula
   has_many :folhas, through: :movimento_acumulados
+  has_many :ferias, foreign_key: :fe_matricula, primary_key: :fn_matricula, class_name: 'Gestorh::Ferias'
+  belongs_to :vinculo, foreign_key: :fn_vinculo
 end

data/app/models/gestorh/local_trabalho.rb

@@ -0,0 +1,3 @@
+class Gestorh::LocalTrabalho < Gestorh::GestorhRecord
+  self.table_name = 'gestor_rh.cdlocaistrabalho'
+end

data/app/models/gestorh/vinculo.rb

@@ -1,3 +1,5 @@
 class Gestorh::Vinculo < Gestorh::GestorhRecord
   self.table_name = 'gestor_rh.cdvinculo'
+
+  has_many :funcionarios, foreign_key: :fn_vinculo
 end

data/lib/sticutils/version.rb

@@ -1,3 +1,3 @@
 module Sticutils
-  VERSION = "0.3.3"
+  VERSION = "0.3.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sticutils
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.9
 platform: ruby
 authors:
 - Ricardo Viana
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-12-09 00:00:00.000000000 Z
+date: 2021-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -68,6 +68,7 @@ files:
 - app/models/gestorh.rb
 - app/models/gestorh/banco.rb
 - app/models/gestorh/classificacao_verba.rb
+- app/models/gestorh/ferias.rb
 - app/models/gestorh/folha.rb
 - app/models/gestorh/folha_agrupada.rb
 - app/models/gestorh/folha_agrupada_id_separado.rb
@@ -75,6 +76,7 @@ files:
 - app/models/gestorh/funcao.rb
 - app/models/gestorh/funcionario.rb
 - app/models/gestorh/gestorh_record.rb
+- app/models/gestorh/local_trabalho.rb
 - app/models/gestorh/lotacao.rb
 - app/models/gestorh/movimento.rb
 - app/models/gestorh/movimento_acumulado.rb
@@ -264,7 +266,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: Utilidades para aplicações rails da STIC