From 6e5efc0f28fc209f37223800a551f3ee84c1fdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladimir=20T=C3=A1mara=20Pati=C3=B1o?= Date: Thu, 8 Aug 2024 14:23:48 -0500 Subject: [PATCH] Actualiza sivel2_gen que resuelve problema con rango de edad. Closes #293 --- Gemfile.lock | 225 ++++++++++++++++++++++++----------------------- db/structure.sql | 85 ++++++++++++++++++ 2 files changed, 202 insertions(+), 108 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 585d660..4258636 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,6 +1,6 @@ GIT remote: https://github.com/kreeti/kt-paperclip.git - revision: ff04ddc779102550b46aa6bb86b1632e36423574 + revision: f35ca58fad8ae4681b26240adc4eb43d2b0d767f specs: kt-paperclip (7.2.2) activemodel (>= 4.2.0) @@ -33,7 +33,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/cor1440_gen.git - revision: 882dfc9454cd9a4593530a7a1ce4976370c03d4d + revision: 43313fe57e5f88d732ff0072c55bd7a73da4ce7b branch: v2.2 specs: cor1440_gen (2.2.0.beta6) @@ -46,7 +46,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/heb412_gen.git - revision: 082a3d2a9b00aac6f96849b4dfe363fab162c945 + revision: 231c943cc19e223b5efd0c6fe1218a9c1a9c523a branch: v2.2 specs: heb412_gen (2.2.0.beta6) @@ -65,7 +65,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/mr519_gen.git - revision: 66e2052f8f6ea47be26d6bd6bb214df7aba550cd + revision: 8eefff9ced139625fd9c1dc8eb3247118be150ea branch: v2.2 specs: mr519_gen (2.2.0.beta6) @@ -74,7 +74,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/msip.git - revision: b1fbd7c3cfa74b8dfad2a7f09235325ca85cf2f5 + revision: e699bcb61b61d41cd10c5e5811de4b57a76cb80f branch: v2.2 specs: msip (2.2.0.beta6) @@ -94,7 +94,7 @@ GIT GIT remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git - revision: fe21ba4c81b0e501d08e883432e848d9f15e4f18 + revision: 80ce85cacb5b316f48f55f44fbcd0f6eb657011b branch: v2.2 specs: sivel2_gen (2.2.0.beta6) @@ -105,35 +105,35 @@ GIT GEM remote: https://rubygems.org/ specs: - actioncable (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + actioncable (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailbox (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.2) - actionpack (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionmailer (7.1.3.4) + actionpack (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activesupport (= 7.1.3.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.2) - actionview (= 7.1.3.2) - activesupport (= 7.1.3.2) + actionpack (7.1.3.4) + actionview (= 7.1.3.4) + activesupport (= 7.1.3.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -141,35 +141,35 @@ GEM rack-test (>= 0.6.3) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - actiontext (7.1.3.2) - actionpack (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + actiontext (7.1.3.4) + actionpack (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.2) - activesupport (= 7.1.3.2) + actionview (7.1.3.4) + activesupport (= 7.1.3.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.2) - activesupport (= 7.1.3.2) + activejob (7.1.3.4) + activesupport (= 7.1.3.4) globalid (>= 0.3.6) - activemodel (7.1.3.2) - activesupport (= 7.1.3.2) - activerecord (7.1.3.2) - activemodel (= 7.1.3.2) - activesupport (= 7.1.3.2) + activemodel (7.1.3.4) + activesupport (= 7.1.3.4) + activerecord (7.1.3.4) + activemodel (= 7.1.3.4) + activesupport (= 7.1.3.4) timeout (>= 0.4.0) - activestorage (7.1.3.2) - actionpack (= 7.1.3.2) - activejob (= 7.1.3.2) - activerecord (= 7.1.3.2) - activesupport (= 7.1.3.2) + activestorage (7.1.3.4) + actionpack (= 7.1.3.4) + activejob (= 7.1.3.4) + activerecord (= 7.1.3.4) + activesupport (= 7.1.3.4) marcel (~> 1.0) - activesupport (7.1.3.2) + activesupport (7.1.3.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -179,10 +179,11 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - acts_as_list (1.1.0) - activerecord (>= 4.2) - addressable (2.8.6) - public_suffix (>= 2.0.2, < 6.0) + acts_as_list (1.2.2) + activerecord (>= 6.1) + activesupport (>= 6.1) + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) andand (1.3.3) ansi (1.5.0) ast (2.4.2) @@ -194,11 +195,11 @@ GEM bcrypt (3.1.20) bigdecimal (3.1.8) bindex (0.8.1) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) brakeman (6.1.2) racc - builder (3.2.4) + builder (3.3.0) bundler-audit (0.9.1) bundler (>= 1.2.0, < 3) thor (~> 1.0) @@ -227,12 +228,12 @@ GEM coffee-script-source (1.12.2) color (1.8) colorize (1.1.0) - concurrent-ruby (1.2.3) + concurrent-ruby (1.3.3) connection_pool (2.4.1) crass (1.0.6) - cuprite (0.15) + cuprite (0.15.1) capybara (~> 3.0) - ferrum (~> 0.14.0) + ferrum (~> 0.15.0) date (3.3.4) debug (1.9.2) irb (~> 1.10) @@ -245,20 +246,26 @@ GEM warden (~> 1.2.3) devise-i18n (1.12.1) devise (>= 4.9.0) - docile (1.4.0) + docile (1.4.1) dotenv (3.1.2) dotenv-rails (3.1.2) dotenv (= 3.1.2) railties (>= 6.1) drb (2.2.1) - erubi (1.12.0) + erubi (1.13.0) execjs (2.9.1) - ferrum (0.14) + ferrum (0.15) addressable (~> 2.5) concurrent-ruby (~> 1.1) webrick (~> 1.7) - websocket-driver (>= 0.6, < 0.8) - ffi (1.16.3) + websocket-driver (~> 0.7) + ffi (1.17.0) + ffi (1.17.0-aarch64-linux-gnu) + ffi (1.17.0-arm-linux-gnu) + ffi (1.17.0-arm64-darwin) + ffi (1.17.0-x86-linux-gnu) + ffi (1.17.0-x86_64-darwin) + ffi (1.17.0-x86_64-linux-gnu) globalid (1.2.1) activesupport (>= 6.1) hotwire-rails (0.1.3) @@ -268,13 +275,13 @@ GEM i18n (1.14.5) concurrent-ruby (~> 1.0) io-console (0.7.2) - irb (1.13.1) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) jbuilder (2.12.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - jsbundling-rails (1.3.0) + jsbundling-rails (1.3.1) railties (>= 6.0.0) json (2.7.2) kgio (2.11.4) @@ -292,18 +299,18 @@ GEM matrix (0.4.2) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0507) + mime-types-data (3.2024.0806) mini_mime (1.1.5) - mini_portile2 (2.8.6) - minitest (5.23.1) - minitest-reporters (1.6.1) + mini_portile2 (2.8.7) + minitest (5.24.1) + minitest-reporters (1.7.1) ansi builder minitest (>= 5.0) ruby-progressbar msgpack (1.7.2) mutex_m (0.2.0) - net-imap (0.4.10) + net-imap (0.4.14) date net-protocol net-pop (0.1.2) @@ -312,34 +319,34 @@ GEM timeout net-smtp (0.5.0) net-protocol - nio4r (2.7.2) - nokogiri (1.16.5) + nio4r (2.7.3) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - nokogiri (1.16.5-aarch64-linux) + nokogiri (1.16.7-aarch64-linux) racc (~> 1.4) - nokogiri (1.16.5-arm-linux) + nokogiri (1.16.7-arm-linux) racc (~> 1.4) - nokogiri (1.16.5-arm64-darwin) + nokogiri (1.16.7-arm64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86-linux) + nokogiri (1.16.7-x86-linux) racc (~> 1.4) - nokogiri (1.16.5-x86_64-darwin) + nokogiri (1.16.7-x86_64-darwin) racc (~> 1.4) - nokogiri (1.16.5-x86_64-linux) + nokogiri (1.16.7-x86_64-linux) racc (~> 1.4) odf-report (0.8.1) mime-types nokogiri (>= 1.12.0) rubyzip (>= 1.3.0) orm_adapter (0.5.0) - parallel (1.24.0) - parser (3.3.1.0) + parallel (1.26.1) + parser (3.3.4.2) ast (~> 2.4.1) racc parslet (2.0.0) pdf-core (0.10.0) - pg (1.5.6) + pg (1.5.7) prawn (2.5.0) matrix (~> 0.4) pdf-core (~> 0.10.0) @@ -351,8 +358,8 @@ GEM rails (>= 3.2) psych (5.1.2) stringio - public_suffix (5.0.5) - racc (1.7.3) + public_suffix (6.0.1) + racc (1.8.1) rack (2.2.9) rack-cors (2.0.2) rack (>= 2.0.0) @@ -363,20 +370,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.2) - actioncable (= 7.1.3.2) - actionmailbox (= 7.1.3.2) - actionmailer (= 7.1.3.2) - actionpack (= 7.1.3.2) - actiontext (= 7.1.3.2) - actionview (= 7.1.3.2) - activejob (= 7.1.3.2) - activemodel (= 7.1.3.2) - activerecord (= 7.1.3.2) - activestorage (= 7.1.3.2) - activesupport (= 7.1.3.2) + rails (7.1.3.4) + actioncable (= 7.1.3.4) + actionmailbox (= 7.1.3.4) + actionmailer (= 7.1.3.4) + actionpack (= 7.1.3.4) + actiontext (= 7.1.3.4) + actionview (= 7.1.3.4) + activejob (= 7.1.3.4) + activemodel (= 7.1.3.4) + activerecord (= 7.1.3.4) + activestorage (= 7.1.3.4) + activesupport (= 7.1.3.4) bundler (>= 1.15.0) - railties (= 7.1.3.2) + railties (= 7.1.3.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -396,9 +403,9 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.3.2) - actionpack (= 7.1.3.2) - activesupport (= 7.1.3.2) + railties (7.1.3.4) + actionpack (= 7.1.3.4) + activesupport (= 7.1.3.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -407,36 +414,37 @@ GEM rainbow (3.1.1) raindrops (0.20.1) rake (13.2.1) - rdoc (6.6.3.1) + rdoc (6.7.0) psych (>= 4.0.0) redcarpet (3.6.0) - regexp_parser (2.9.0) - reline (0.5.5) + regexp_parser (2.9.2) + reline (0.5.9) io-console (~> 0.5) responders (3.1.1) actionpack (>= 5.2) railties (>= 5.2) - rexml (3.2.6) + rexml (3.3.4) + strscan rspreadsheet (0.5.3) andand (>= 1.3) rubyzip (>= 1.3) - rubocop (1.63.4) + rubocop (1.65.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) + regexp_parser (>= 2.4, < 3.0) rexml (>= 3.2.5, < 4.0) rubocop-ast (>= 1.31.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.0) parser (>= 3.3.1.0) - rubocop-minitest (0.35.0) + rubocop-minitest (0.35.1) rubocop (>= 1.61, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.0) + rubocop-rails (2.25.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.33.0, < 2.0) @@ -468,17 +476,18 @@ GEM sprockets (4.2.1) concurrent-ruby (~> 1.0) rack (>= 2.2.4, < 4) - sprockets-rails (3.4.2) - actionpack (>= 5.2) - activesupport (>= 5.2) + sprockets-rails (3.5.2) + actionpack (>= 6.1) + activesupport (>= 6.1) sprockets (>= 3.0.0) stimulus-rails (1.3.3) railties (>= 6.0.0) - stringio (3.1.0) + stringio (3.1.1) + strscan (3.1.0) terrapin (1.0.1) climate_control thor (1.3.1) - tilt (2.3.0) + tilt (2.4.0) timeout (0.4.1) ttfunk (1.8.0) bigdecimal (~> 3.1) @@ -510,7 +519,7 @@ GEM will_paginate (3.3.1) xpath (3.2.0) nokogiri (~> 1.8) - zeitwerk (2.6.13) + zeitwerk (2.6.17) PLATFORMS aarch64-linux diff --git a/db/structure.sql b/db/structure.sql index 31018ce..e447474 100644 --- a/db/structure.sql +++ b/db/structure.sql @@ -6649,6 +6649,36 @@ CREATE TABLE public.sivel2_gen_profesion ( ); +-- +-- Name: sivel2_gen_profesion_victima; Type: TABLE; Schema: public; Owner: - +-- + +CREATE TABLE public.sivel2_gen_profesion_victima ( + id bigint NOT NULL, + victima_id bigint NOT NULL, + profesion_id bigint NOT NULL +); + + +-- +-- Name: sivel2_gen_profesion_victima_id_seq; Type: SEQUENCE; Schema: public; Owner: - +-- + +CREATE SEQUENCE public.sivel2_gen_profesion_victima_id_seq + START WITH 1 + INCREMENT BY 1 + NO MINVALUE + NO MAXVALUE + CACHE 1; + + +-- +-- Name: sivel2_gen_profesion_victima_id_seq; Type: SEQUENCE OWNED BY; Schema: public; Owner: - +-- + +ALTER SEQUENCE public.sivel2_gen_profesion_victima_id_seq OWNED BY public.sivel2_gen_profesion_victima.id; + + -- -- Name: sivel2_gen_profesion_victimacolectiva; Type: TABLE; Schema: public; Owner: - -- @@ -7675,6 +7705,13 @@ ALTER TABLE ONLY public.sivel2_gen_estadocivil ALTER COLUMN id SET DEFAULT nextv ALTER TABLE ONLY public.sivel2_gen_maternidad ALTER COLUMN id SET DEFAULT nextval('public.sivel2_gen_maternidad_id_seq'::regclass); +-- +-- Name: sivel2_gen_profesion_victima id; Type: DEFAULT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_profesion_victima ALTER COLUMN id SET DEFAULT nextval('public.sivel2_gen_profesion_victima_id_seq'::regclass); + + -- -- Name: sivel2_gen_resagresion id; Type: DEFAULT; Schema: public; Owner: - -- @@ -9153,6 +9190,14 @@ ALTER TABLE ONLY public.sivel2_gen_profesion ADD CONSTRAINT sivel2_gen_profesion_pkey PRIMARY KEY (id); +-- +-- Name: sivel2_gen_profesion_victima sivel2_gen_profesion_victima_pkey; Type: CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_profesion_victima + ADD CONSTRAINT sivel2_gen_profesion_victima_pkey PRIMARY KEY (id); + + -- -- Name: sivel2_gen_profesion_victimacolectiva sivel2_gen_profesion_victimacolectiva_pkey1; Type: CONSTRAINT; Schema: public; Owner: - -- @@ -9588,6 +9633,20 @@ CREATE INDEX index_sivel2_gen_otraorga_victima_on_organizacion_id ON public.sive CREATE INDEX index_sivel2_gen_otraorga_victima_on_victima_id ON public.sivel2_gen_otraorga_victima USING btree (victima_id); +-- +-- Name: index_sivel2_gen_profesion_victima_on_profesion_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_sivel2_gen_profesion_victima_on_profesion_id ON public.sivel2_gen_profesion_victima USING btree (profesion_id); + + +-- +-- Name: index_sivel2_gen_profesion_victima_on_victima_id; Type: INDEX; Schema: public; Owner: - +-- + +CREATE INDEX index_sivel2_gen_profesion_victima_on_victima_id ON public.sivel2_gen_profesion_victima USING btree (victima_id); + + -- -- Name: index_sivel2_gen_sectorsocialsec_victima_on_sectorsocial_id; Type: INDEX; Schema: public; Owner: - -- @@ -10668,6 +10727,14 @@ ALTER TABLE ONLY public.apo214_listaanexo ADD CONSTRAINT fk_rails_15d910fc26 FOREIGN KEY (anexo_id) REFERENCES public.msip_anexo(id); +-- +-- Name: sivel2_gen_profesion_victima fk_rails_16a578e865; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_profesion_victima + ADD CONSTRAINT fk_rails_16a578e865 FOREIGN KEY (profesion_id) REFERENCES public.sivel2_gen_profesion(id); + + -- -- Name: cor1440_gen_actividadpf fk_rails_16d8cc3b46; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -10692,6 +10759,14 @@ ALTER TABLE ONLY public.mr519_gen_encuestausuario ADD CONSTRAINT fk_rails_1b24d10e82 FOREIGN KEY (usuario_id) REFERENCES public.usuario(id); +-- +-- Name: sivel2_gen_profesion_victima fk_rails_1b333ee743; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_profesion_victima + ADD CONSTRAINT fk_rails_1b333ee743 FOREIGN KEY (victima_id) REFERENCES public.sivel2_gen_victima(id); + + -- -- Name: heb412_gen_formulario_plantillahcr fk_rails_1bdf79898c; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -11260,6 +11335,14 @@ ALTER TABLE ONLY public.apo214_listasuelo ADD CONSTRAINT fk_rails_824ea49a05 FOREIGN KEY (lugarpreliminar_id) REFERENCES public.apo214_lugarpreliminar(id); +-- +-- Name: sivel2_gen_anexo_caso fk_rails_825547f886; Type: FK CONSTRAINT; Schema: public; Owner: - +-- + +ALTER TABLE ONLY public.sivel2_gen_anexo_caso + ADD CONSTRAINT fk_rails_825547f886 FOREIGN KEY (anexo_id) REFERENCES public.msip_anexo(id); + + -- -- Name: cor1440_gen_tipomoneda fk_rails_82fd06de79; Type: FK CONSTRAINT; Schema: public; Owner: - -- @@ -12539,6 +12622,8 @@ ALTER TABLE ONLY public.sivel2_gen_victimacolectiva_vinculoestado SET search_path TO "$user", public; INSERT INTO "schema_migrations" (version) VALUES +('20240806082036'), +('20240619170550'), ('20240503224340'), ('20240501121336'), ('20240423162050'),