Usa rama 2.2 de motores. Closes #299

Gemfile

@@ -92,27 +92,27 @@ gem "will_paginate" # Listados en páginas
 # estas ponerse en orden de apilamiento lógico y no alfabético).
 
 gem "msip", # Motor generico
-  git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "v2.2"
   #path: "../msip-2.2"
 
 gem "mr519_gen", # Motor de gestion de formularios y encuestas
-  git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "v2.2"
   #path: "../mr519_gen-2.2"
 
 gem "heb412_gen", # Motor de nube y llenado de plantillas
-  git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "v2.2"
   #path: "../heb412_gen-2.2"
 
 gem "sivel2_gen", # Motor para manejo de casos
-  git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "v2.2"
   #path: "../sivel2_gen-2.2"
 
 gem "cor1440_gen",
-  git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "v2.2"
   #path: "../cor1440_gen-2.2"
 
 gem "jos19",
-  git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "main"
+  git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "v2.2"
   #path: "../jos19-2.2"
 
 group :development, :test do

Gemfile.lock

@@ -19,7 +19,7 @@ GIT
 
 GIT
   remote: https://github.com/styd/apexcharts.rb.git
-  revision: 3c04fbc3eecc07f2b5fd433dae03798f329b1692
+  revision: ff8643ba959fb93998b1c51fd5e6c351379f709b
   branch: master
   specs:
     apexcharts (0.2.0)
@@ -33,10 +33,10 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/cor1440_gen.git
-  revision: aba2fcfa68000aeccf893e5443199f3832f13b6a
-  branch: main
+  revision: d28e83cc588457a10eb5ba8af07adb04060fdf12
+  branch: v2.2
   specs:
-    cor1440_gen (2.2.0.beta6)
+    cor1440_gen (2.2.0.beta7)
       devise
       heb412_gen
       kt-paperclip
@@ -46,38 +46,37 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
-  revision: 7eea7af9fade94b84d2ea674eefdf24971815c47
-  branch: main
+  revision: 014767febabfd03080188e2ebbb014d94a654983
+  branch: v2.2
   specs:
-    heb412_gen (2.3.0.alfa2)
+    heb412_gen (2.2.0.beta7)
       mr519_gen
       msip
       redcarpet
       rspreadsheet
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/jos19.git
-  revision: 6b2183d60eaf4caff5f15fd3e1da087191426dcb
-  branch: main
+  revision: 6aa690977de42995452f2eb24b3c77b915a1d517
+  branch: v2.2
   specs:
     jos19 (2.2.0.beta6)
-      rails (>= 7.0.4)
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
-  revision: 2d58a40a419d5e8b27f0d12b61e72f4420625996
-  branch: main
+  revision: ab2cd1df2c879d54f7ddf6d83feb4ef32084aff9
+  branch: v2.2
   specs:
-    mr519_gen (2.3.0.alfa2)
+    mr519_gen (2.2.0.beta7)
       msip
       rails
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/msip.git
-  revision: dc7da1e51a6f00823cfb274f37d67341278fc132
-  branch: main
+  revision: 0ee4fc1a422cc210b805236e18a2753413938d3e
+  branch: v2.2
   specs:
-    msip (2.3.0.alfa2)
+    msip (2.2.0.beta7)
       cancancan (~> 3)
       devise (~> 4)
       devise-i18n (~> 1)
@@ -94,10 +93,10 @@ GIT
 
 GIT
   remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
-  revision: edaa3c5187823e98080e49fba083b6e4b0cd827b
-  branch: main
+  revision: 08f1cecc045bbe509f06921626a1ca3d545e95bd
+  branch: v2.2
   specs:
-    sivel2_gen (2.3.0.alfa2)
+    sivel2_gen (2.2.0.beta7)
       color
       devise
       rails
@@ -274,7 +273,7 @@ GEM
     irb (1.14.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
-    jbuilder (2.12.0)
+    jbuilder (2.13.0)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
     jsbundling-rails (1.3.1)
@@ -342,7 +341,7 @@ GEM
       racc
     parslet (2.0.0)
     pdf-core (0.10.0)
-    pg (1.5.7)
+    pg (1.5.8)
     prawn (2.5.0)
       matrix (~> 0.4)
       pdf-core (~> 0.10.0)
@@ -439,7 +438,7 @@ GEM
     rubocop-minitest (0.36.0)
       rubocop (>= 1.61, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rails (2.26.0)
+    rubocop-rails (2.26.2)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.52.0, < 2.0)
@@ -596,4 +595,4 @@ DEPENDENCIES
   will_paginate
 
 BUNDLED WITH
-   2.5.18
+   2.5.21

app/javascript/application.js

@@ -12,14 +12,10 @@ import {Turbo} from "@hotwired/turbo-rails";
 // operaciones con turbo como añadir familiar
 
 import './jquery'
-import '../../vendor/assets/javascripts/jquery-ui.js'
 
 import 'popper.js'              // Dialogos emergentes usados por bootstrap
 import * as bootstrap from 'bootstrap'              // Maquetacion y elementos de diseño
 
-import Msip__Motor from './controllers/msip/motor.js'
-window.Msip__Motor = Msip__Motor
-
 import TomSelect from 'tom-select';
 window.TomSelect = TomSelect
 window.configuracionTomSelect = {
@@ -31,6 +27,18 @@ window.configuracionTomSelect = {
   }
 }
 
+import Msip__Motor from "./controllers/msip/motor"
+window.Msip__Motor = Msip__Motor
+Msip__Motor.iniciar()
+import Mr519Gen__Motor from "./controllers/mr519_gen/motor"
+window.Mr519Gen__Motor = Mr519Gen__Motor
+import Heb412Gen__Motor from "./controllers/heb412_gen/motor"
+window.Heb412Gen__Motor = Heb412Gen__Motor
+import Cor1440Gen__Motor from "./controllers/cor1440_gen/motor"
+window.Cor1440Gen__Motor = Cor1440Gen__Motor
+import Sivel2Gen__Motor from "./controllers/sivel2_gen/motor"
+window.Sivel2Gen__Motor = Sivel2Gen__Motor
+
 // Apexcharts
 import ApexCharts from 'apexcharts'
 window.ApexCharts = ApexCharts

app/javascript/controllers/index.js

@@ -25,14 +25,5 @@ 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__FiltroAvanzadoController from "./sivel2_gen/filtro_avanzado_controller"
-application.register("sivel2-gen--filtro-avanzado", Sivel2Gen__FiltroAvanzadoController)
-
-import Sivel2Gen__MapaosmController from "./sivel2_gen/mapaosm_controller"
-application.register("sivel2-gen--mapaosm", Sivel2Gen__MapaosmController)
-
-import Sivel2Gen__MotorController from "./sivel2_gen/motor_controller"
-application.register("sivel2-gen--motor", Sivel2Gen__MotorController)
-
 import UsuarioConGrupoController from "./usuario_con_grupo_controller"
 application.register("usuario-con-grupo", UsuarioConGrupoController)

db/structure.sql

@@ -13480,6 +13480,9 @@ ALTER TABLE ONLY public.sivel2_gen_victimacolectiva_vinculoestado
 SET search_path TO "$user", public;
 
 INSERT INTO "schema_migrations" (version) VALUES
+('20241006115708'),
+('20241005013833'),
+('20241005013800'),
 ('20240806082036'),
 ('20240723152453'),
 ('20240723140427'),
@@ -13598,6 +13601,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20221031110549'),
 ('20221030145215'),
 ('20221025025402'),
+('20221024222000'),
 ('20221024221557'),
 ('20221024000100'),
 ('20221024000000'),

package.json

@@ -8,33 +8,27 @@
   },
   "dependencies": {
     "@babel/preset-react": "^7.14.5",
-    "@fortawesome/fontawesome-free": "^6.4.2",
+    "@fortawesome/fontawesome-free": "^6.6.0",
     "@hotwired/stimulus": "^3.2.2",
-    "@hotwired/turbo-rails": "^7.3.0",
+    "@hotwired/turbo-rails": "^8.0.10",
     "@pasosdejesus/autocompleta_ajax": "https://gitlab.com/pasosdeJesus/autocompleta_ajax.git",
-    "@popperjs/core": "^2.10.1",
+    "@popperjs/core": "^2.11.8",
     "@puppeteer/replay": "^2.10.2",
-    "@rails/actioncable": "^6.0.0-alpha",
-    "@rails/actiontext": "^6.0.0",
-    "@rails/activestorage": "^6.0.0-alpha",
-    "@rails/ujs": "^7.1.1",
+    "@rails/ujs": "^7.1.3-4",
     "apexcharts": "^3.29.0",
     "babel-plugin-macros": "^3.1.0",
-    "bootstrap": "^5.3.2",
+    "bootstrap": "^5.3.3",
     "css-loader": "^5.0.0",
-    "esbuild": "^0.19.4",
+    "esbuild": "^0.24.0",
     "gridstack": "^0.6.0",
-    "is-svg": "^4.2.2",
+    "is-svg": "^5.1.0",
     "jquery": "^3.7.1",
-    "jquery-ui": "^1.12.1",
     "leaflet": "1.9.4",
     "leaflet.markercluster": "1.5.3",
     "mini-css-extract-plugin": "^2.4.3",
     "popper.js": "^2.0.0-next.4",
     "postcss": "^8.2.10",
     "puppeteer-core": "^19.7.5",
-    "sortable": "^2.0.0",
-    "sortablejs": "^1.14.0",
     "tom-select": "^2.3.1"
   },
   "devDependencies": {