Skip to content

Commit

Permalink
Refina persona. Closes #226
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Sep 18, 2023
1 parent 32f4290 commit a8abce3
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 12 deletions.
14 changes: 7 additions & 7 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/cor1440_gen.git
revision: 9769baf2e0e0e1e76bf80834cf5c784a6a54ddbf
revision: e54a0ce7fccecbe020aa99d607a69badd9a9c9f5
branch: main
specs:
cor1440_gen (2.2.0.beta4)
Expand All @@ -46,7 +46,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
revision: 4a7769af5007315b1ca6a6bb1d84feb4ae79b0c9
revision: 3508d31bc0af92a43137f03cace09a142a1d511a
branch: main
specs:
heb412_gen (2.2.0.beta4)
Expand All @@ -57,15 +57,15 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/jos19.git
revision: 7f07c4d1d11e5b040eb99a583745af87f8e58421
revision: 995798ca0fd106190bb5ad25794a5023a6e7fd25
branch: main
specs:
jos19 (2.2.0.beta4)
rails (>= 7.0.4)

GIT
remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
revision: 33d94662584a9299d03d8796caf2ae7fa6e5ef5f
revision: a6270706b5f6019c34ad7e40fa31377e4e251cbc
branch: main
specs:
mr519_gen (2.2.0.beta4)
Expand All @@ -74,7 +74,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/msip.git
revision: 45386527a092f83b8b3d68feb882105b39fcd919
revision: cd8649fd776db25e83c771a03f1172e72465b1c5
branch: main
specs:
msip (2.2.0.beta4)
Expand All @@ -94,7 +94,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: 9e6da01e24c2211a295aaf42d959095ee8a11b19
revision: 2ff20852fd34c1d36d25c4449fa0b0d053f80c80
branch: main
specs:
sivel2_gen (2.2.0.beta4)
Expand Down Expand Up @@ -240,7 +240,7 @@ GEM
dotenv (= 2.8.1)
railties (>= 3.2)
erubi (1.12.0)
execjs (2.9.0)
execjs (2.9.1)
ferrum (0.13)
addressable (~> 2.5)
concurrent-ruby (~> 1.1)
Expand Down
62 changes: 57 additions & 5 deletions app/controllers/msip/personas_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,66 @@ class PersonasController < Msip::ModelosController
include Jos19::Concerns::Controllers::PersonasController

def atributos_show
atributos_show_jos19 +
[:familiarvictima_ids] -
[:proyectofinanciero_ids]
[
:id,
:nombres,
:apellidos,
:tdocumento_id,
:numerodocumento,
:anionac,
:mesnac,
:dianac,
:sexo,
:pais,
:departamento,
:municipio,
:clase,
:nacionalde,
:familiares,
:ultimo_departamento_trabajo_id,
:ultima_regionpago_id,
:ultimo_correo_trabajo,
:ultimo_celular_trabajo,
:ultima_entidad_id,
:ultimo_cargoestado_id,
:actividad_ids,
:caso_ids,
:familiarvictima_ids,
:etiqueta_ids,
]
end

def atributos_form
atributos_form_jos19 -
[:familiarvictima_ids, :proyectofinanciero_ids]
a = atributos_show - [
:actividad_ids,
:caso_ids,
:familiarvictima_ids,
]
a[a.index(:familiares)] = :persona_trelacion1
return a
end

def atributos_index
[
:id,
:nombres,
:apellidos,
:tdocumento_id,
:numerodocumento,
:anionac,
:mesnac,
:dianac,
:sexo,
:pais,
:departamento,
:municipio,
:clase,
:nacionalde,
:etiqueta_ids,
:actividad_ids,
:caso_ids,
:familiarvictima_ids,
]
end

def index_reordenar(c)
Expand Down
6 changes: 6 additions & 0 deletions config/locales/es.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ es:
Personas: Población vinculada
caso_ids: Casos en los que es Vic. Directa
familiarvictima_ids: Casos en los que es Vic. Indirecta
ultimo_cargoestado_id: Cargo con el estado más reciente
ultima_entidad_id: Entidad estatal más reciente
ultimo_celular_trabajo: Celular del trabajo más reciente
ultimo_correo_trabajo: Correo del trabajo más reciente
ultima_regionpago_id: Regional de pago más reciente
ultimo_departamento_trabajo_id: Departamento de trabajo más reciente
"msip/solicitud":
Solicitud: Observacion
Solicitudes: Observaciones
Expand Down

0 comments on commit a8abce3

Please sign in to comment.