Skip to content

Commit

Permalink
Actualiza
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Nov 28, 2024
1 parent aceba1a commit 1f44dc5
Show file tree
Hide file tree
Showing 6 changed files with 294 additions and 355 deletions.
10 changes: 10 additions & 0 deletions .env.plantilla
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,16 @@ if (test "$RAILS_ENV" = "") then {
export RAILS_ENV=development
} fi;

# Para pruebas
if (test "$PUERTOPRU" = "") then {
export PUERTOPRU=31311
} fi;
if (test "$MSIP_REPORTEREGRESION" = "") then {
# Tipicamente en aplicacines msip:reporteregresion y
# en motores app:msip:reporteregresion pero hay motores extraños
# que requieren msip:reporteregresion
export MSIP_REPORTEREGRESION="msip:reporteregresion"
} fi;

# Despliegue en modo desarrollo
if (test "$IPDES" = "") then {
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ app/javascript/controllers/heb412_gen
app/javascript/controllers/cor1440_gen
app/javascript/controllers/sal7711_gen
app/javascript/controllers/sivel2_gen
app/javascript/controllers/jos19
public/fasol/si/csv/
public/fasol/sipub
ref
Expand Down
16 changes: 8 additions & 8 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: 429921d75b14aa42474bbcab03d86258f1ee3d37
revision: 5463fed1b6bee7c48d1ec4f7772bd76efc3068a8
branch: v2.2
specs:
cor1440_gen (2.2.0.beta7)
Expand All @@ -46,7 +46,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
revision: 6386cd2262bc279ed81b852ba434ebb8748b36c3
revision: 9d124d5d52b02548368a86ada4686ec8197af69e
branch: v2.2
specs:
heb412_gen (2.2.0.beta7)
Expand All @@ -57,14 +57,14 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/jos19.git
revision: cda7c671ebde0335131f8a33102e5e85be623cba
revision: 01d8bd37d536b32f5fed16091a970f58a004a9f4
branch: v2.2
specs:
jos19 (2.2.0.beta7)

GIT
remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
revision: df224091f760587de2fd3ac5aed5b03e03ffaf53
revision: ce45f9c0636f9a99dd160fd329fa9bbec0ce4ca3
branch: v2.2
specs:
mr519_gen (2.2.0.beta7)
Expand All @@ -73,7 +73,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/msip.git
revision: 4ec173a448a8e82860b802fd17bce09f28180e3b
revision: 2d3c67b8ee6923d7acf534045e75d47117e331e8
branch: v2.2
specs:
msip (2.2.0.beta7)
Expand All @@ -93,7 +93,7 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: ede323174c7ac10cf20604eeb03682614f7b1c2c
revision: d48a152dbcc7325a31462ecac146ce838623853a
branch: v2.2
specs:
sivel2_gen (2.2.0.beta7)
Expand Down Expand Up @@ -174,7 +174,7 @@ GEM
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
acts_as_list (1.2.3)
acts_as_list (1.2.4)
activerecord (>= 6.1)
activesupport (>= 6.1)
addressable (2.8.7)
Expand Down Expand Up @@ -298,7 +298,7 @@ GEM
mime-types-data (3.2024.0820)
mini_mime (1.1.5)
mini_portile2 (2.8.7)
minitest (5.25.1)
minitest (5.25.2)
minitest-reporters (1.7.1)
ansi
builder
Expand Down
3 changes: 3 additions & 0 deletions app/javascript/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,8 @@ application.register("sivel2-gen--edad", Sivel2Gen__EdadController)
import Sivel2Gen__EnviarFichaCasoController from "./sivel2_gen/enviar_ficha_caso_controller"
application.register("sivel2-gen--enviar-ficha-caso", Sivel2Gen__EnviarFichaCasoController)

import Sivel2Gen__PlotlyActosController from "./sivel2_gen/plotly_actos_controller"
application.register("sivel2-gen--plotly-actos", Sivel2Gen__PlotlyActosController)

import UsuarioConGrupoController from "./usuario_con_grupo_controller"
application.register("usuario-con-grupo", UsuarioConGrupoController)
31 changes: 11 additions & 20 deletions db/structure.sql
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ SET xmloption = content;
SET client_min_messages = warning;
SET row_security = off;

--
-- Name: public; Type: SCHEMA; Schema: -; Owner: -
--

-- *not* creating schema, since initdb creates it


--
-- Name: es_co_utf_8; Type: COLLATION; Schema: public; Owner: -
--
Expand Down Expand Up @@ -2687,7 +2680,6 @@ CREATE TABLE public.cor1440_gen_actividad (
created_at timestamp without time zone,
updated_at timestamp without time zone,
oficina_id integer NOT NULL,
rangoedadac_id integer,
usuario_id integer NOT NULL,
lugar character varying(500)
);
Expand Down Expand Up @@ -3439,7 +3431,8 @@ CREATE TABLE public.cor1440_gen_indicadorpf (
numero character varying(15) NOT NULL,
indicador character varying(5000) NOT NULL,
tipoindicador_id integer,
objetivopf_id integer
objetivopf_id integer,
CONSTRAINT objetivo_xor_resultado CHECK ((((objetivopf_id IS NOT NULL) OR (resultadopf_id IS NOT NULL)) AND ((objetivopf_id IS NULL) OR (resultadopf_id IS NULL))))
);


Expand Down Expand Up @@ -6041,7 +6034,7 @@ CREATE TABLE public.msip_vereda (
id bigint NOT NULL,
nombre character varying(500) NOT NULL COLLATE public.es_co_utf_8,
municipio_id integer,
verlocal_id integer,
verlocal_cod integer,
observaciones character varying(5000),
latitud double precision,
longitud double precision,
Expand Down Expand Up @@ -12868,11 +12861,11 @@ ALTER TABLE ONLY public.msip_persona


--
-- Name: sivel2_gen_presponsable presponsable_papa_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
-- Name: sivel2_gen_presponsable presponsable_papa_id_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
--

ALTER TABLE ONLY public.sivel2_gen_presponsable
ADD CONSTRAINT presponsable_papa_fkey FOREIGN KEY (papa_id) REFERENCES public.sivel2_gen_presponsable(id);
ADD CONSTRAINT presponsable_papa_id_fkey FOREIGN KEY (papa_id) REFERENCES public.sivel2_gen_presponsable(id);


--
Expand All @@ -12891,14 +12884,6 @@ ALTER TABLE ONLY public.sivel2_gen_caso_presponsable
ADD CONSTRAINT presuntos_responsables_caso_id_p_responsable_fkey FOREIGN KEY (presponsable_id) REFERENCES public.sivel2_gen_presponsable(id);


--
-- Name: sivel2_gen_presponsable presuntos_responsables_id_papa_fkey; Type: FK CONSTRAINT; Schema: public; Owner: -
--

ALTER TABLE ONLY public.sivel2_gen_presponsable
ADD CONSTRAINT presuntos_responsables_id_papa_fkey FOREIGN KEY (papa_id) REFERENCES public.sivel2_gen_presponsable(id);


--
-- Name: sivel2_gen_profesion_victimacolectiva profesion_victimacolectiva_id_profesion_fkey1; Type: FK CONSTRAINT; Schema: public; Owner: -
--
Expand Down Expand Up @@ -13194,6 +13179,12 @@ ALTER TABLE ONLY public.sivel2_gen_victimacolectiva_vinculoestado
SET search_path TO "$user", public;

INSERT INTO "schema_migrations" (version) VALUES
('20241125115043'),
('20241119195733'),
('20241119195700'),
('20241119180614'),
('20241113150932'),
('20241113141404'),
('20241106114858'),
('20241104072046'),
('20241006115708'),
Expand Down
Loading

0 comments on commit 1f44dc5

Please sign in to comment.