Skip to content

Commit

Permalink
Quita datepicker. Closes #296
Browse files Browse the repository at this point in the history
  • Loading branch information
vtamara committed Aug 31, 2024
1 parent 4fda7cb commit faac266
Show file tree
Hide file tree
Showing 45 changed files with 944 additions and 9,306 deletions.
12 changes: 6 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -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: "v2.2"
git: "https://gitlab.com/pasosdeJesus/msip.git", branch: "main"
#path: "../msip-2.2"

gem "mr519_gen", # Motor de gestion de formularios y encuestas
git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "v2.2"
git: "https://gitlab.com/pasosdeJesus/mr519_gen.git", branch: "main"
#path: "../mr519_gen-2.2"

gem "heb412_gen", # Motor de nube y llenado de plantillas
git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "v2.2"
git: "https://gitlab.com/pasosdeJesus/heb412_gen.git", branch: "main"
#path: "../heb412_gen-2.2"

gem "sivel2_gen", # Motor para manejo de casos
git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "v2.2"
git: "https://gitlab.com/pasosdeJesus/sivel2_gen.git", branch: "main"
#path: "../sivel2_gen-2.2"

gem "cor1440_gen",
git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "v2.2"
git: "https://gitlab.com/pasosdeJesus/cor1440_gen.git", branch: "main"
#path: "../cor1440_gen-2.2"

gem "jos19",
git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "v2.2"
git: "https://gitlab.com/pasosdeJesus/jos19.git", branch: "main"
#path: "../jos19-2.2"

group :development, :test do
Expand Down
32 changes: 16 additions & 16 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/cor1440_gen.git
revision: 3c86db1af41aab9f979ac1c2bdc11fd7d6e422f7
branch: v2.2
revision: aba2fcfa68000aeccf893e5443199f3832f13b6a
branch: main
specs:
cor1440_gen (2.2.0.beta6)
devise
Expand All @@ -46,38 +46,38 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/heb412_gen.git
revision: 9021c64021e286cb2e87963a5203906adf4df813
branch: v2.2
revision: 7eea7af9fade94b84d2ea674eefdf24971815c47
branch: main
specs:
heb412_gen (2.2.0.beta6)
heb412_gen (2.3.0.alfa2)
mr519_gen
msip
redcarpet
rspreadsheet

GIT
remote: https://gitlab.com/pasosdeJesus/jos19.git
revision: 498ac87d902a517ba18ba9243904f6cf6d7e7620
branch: v2.2
revision: 6b2183d60eaf4caff5f15fd3e1da087191426dcb
branch: main
specs:
jos19 (2.2.0.beta6)
rails (>= 7.0.4)

GIT
remote: https://gitlab.com/pasosdeJesus/mr519_gen.git
revision: 4734125ead78f8c1d681822b1700c888ea0a63d6
branch: v2.2
revision: 2d58a40a419d5e8b27f0d12b61e72f4420625996
branch: main
specs:
mr519_gen (2.2.0.beta6)
mr519_gen (2.3.0.alfa2)
msip
rails

GIT
remote: https://gitlab.com/pasosdeJesus/msip.git
revision: 2889ccf5005f5f5f63ff776c1bae3dbc38f45ab5
branch: v2.2
revision: 1f9ceffd8c3e734cacb40fac050f994416d69ca4
branch: main
specs:
msip (2.2.0.beta6)
msip (2.3.0.alfa2)
cancancan (~> 3)
devise (~> 4)
devise-i18n (~> 1)
Expand All @@ -94,10 +94,10 @@ GIT

GIT
remote: https://gitlab.com/pasosdeJesus/sivel2_gen.git
revision: 4d5245008726efc3e481d6b8042316602ea84e1f
branch: v2.2
revision: 697b45ca42e51c8ed7666af30493d9dcb1a3cf7b
branch: main
specs:
sivel2_gen (2.2.0.beta6)
sivel2_gen (2.3.0.alfa2)
color
devise
rails
Expand Down
2 changes: 1 addition & 1 deletion app/assets/javascripts/recursos_sprockets.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
//= require heb412_gen/motor
//= require mr519_gen/motor
//= require sivel2_gen/motor
//= require sivel2_gen/mapaosm
//= require sivel2_gen/motor2
//= require sivel2_gen/motor_es6
//= require cor1440_gen/motor
//= require_tree .

Expand Down
4 changes: 2 additions & 2 deletions app/javascript/application.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ import 'gridstack'
var L = require('leaflet');
var mc= require('leaflet.markercluster');

import plotly_serietiempo_actos from './plotly_actos'
//import plotly_serietiempo_actos from './plotly_actos'

import {AutocompletaAjaxExpreg} from '@pasosdejesus/autocompleta_ajax'
window.AutocompletaAjaxExpreg = AutocompletaAjaxExpreg
Expand Down Expand Up @@ -95,7 +95,7 @@ promesaRecursosSprocketsYDocumento.then((mensaje) => {
}
console.log("p2ult=" + p2ult)
if (p2ult == 'graficar/actos_individuales') {
plotly_serietiempo_actos()
//plotly_serietiempo_actos()
}

document.querySelectorAll('.tom-select').forEach((el)=>{
Expand Down
9 changes: 9 additions & 0 deletions app/javascript/controllers/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,14 @@ 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)
Loading

0 comments on commit faac266

Please sign in to comment.