|
|
d356974178
|
terminando la consulta get resource del modelo maquinaspapelimpresion
|
2023-06-30 11:34:30 +02:00 |
|
|
|
38dd7cdadf
|
algunos cambios de nomenclatura en la bbdd de papeles impresion
|
2023-06-27 14:36:15 +02:00 |
|
|
|
a9ea464b05
|
trabajando en el formulario maquinas
|
2023-06-27 12:24:02 +02:00 |
|
|
|
ae024c5d27
|
Merge branch 'dev/mod_tarifa_manipulado' into 'main'
Dev/mod tarifa manipulado
See merge request jjimenez/safekat!25
|
2023-06-18 18:55:12 +00:00 |
|
|
|
77af1d69ce
|
tarifas manipulado actualizado
|
2023-06-18 20:49:35 +02:00 |
|
|
|
325ae2bd95
|
trabajando en el form
|
2023-06-15 21:53:01 +02:00 |
|
|
|
f5e2305a9f
|
Merge branch 'dev/mod_tarifas_rangos' into 'main'
Dev/mod tarifas rangos
See merge request jjimenez/safekat!24
|
2023-06-14 10:44:18 +00:00 |
|
|
|
e79cbb4f9c
|
terminado modulo tarifas acabado
|
2023-06-14 12:42:02 +02:00 |
|
|
|
f49e83b582
|
tarifas acabado a falta de check duplicados y guardar tarifa acabado
|
2023-06-14 11:29:28 +02:00 |
|
|
|
f814ec7e2c
|
tarifas acabado antes de meter lineas
|
2023-06-12 18:35:42 +02:00 |
|
|
|
a3ded71afe
|
modificando tarifas acabado
|
2023-06-12 18:08:25 +02:00 |
|
|
|
f8a2d8b8b3
|
Añadida la libreria datatables editor a third party
|
2023-06-12 14:27:57 +02:00 |
|
|
|
25b5231cbc
|
eliminada la lib datatables editor de httpdocs
|
2023-06-12 14:25:52 +02:00 |
|
|
|
2cfb2e30ad
|
Merge branch 'dev/papelimp_tip3' into 'main'
papel impresion terminado a falta de añadir maquinas y revisar UI
See merge request jjimenez/safekat!23
|
2023-06-12 07:43:44 +00:00 |
|
|
|
f10226606c
|
Merge branch 'main' into 'dev/papelimp_tip3'
# Conflicts:
# ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/viewPapelImpresionForm.php
|
2023-06-12 07:43:28 +00:00 |
|
|
|
4ca43ad7ef
|
papel impresion terminado a falta de añadir maquinas y revisar UI
|
2023-06-12 08:21:57 +02:00 |
|
|
|
1e228f3d67
|
Merge branch 'dev/ui' into 'main'
Dev/ui
See merge request jjimenez/safekat!22
|
2023-06-06 12:49:08 +00:00 |
|
|
|
37afc63e2e
|
Menus segun JM
|
2023-06-06 13:57:34 +02:00 |
|
|
|
7a2c4026f1
|
Menus laterales
|
2023-06-05 15:30:42 +02:00 |
|
|
|
614487f17f
|
Creando Menu_impresion
|
2023-06-02 14:47:23 +02:00 |
|
|
|
cdb0b29003
|
Creando Menu_impresion
|
2023-06-02 14:45:12 +02:00 |
|
|
|
38e9feb4c8
|
Edicion de algunos formularios
|
2023-06-02 09:10:19 +02:00 |
|
|
|
3932da5b84
|
Update Routes.php
|
2023-05-29 08:35:16 +00:00 |
|
|
|
4b8c271e87
|
Merge branch 'dev/papelimp_tip2' into 'main'
modificado .env y añadido backup de la bbdd
See merge request jjimenez/safekat!21
|
2023-05-29 08:34:17 +00:00 |
|
|
|
d0554b458a
|
modificado .env y añadido backup de la bbdd
|
2023-05-29 10:28:07 +02:00 |
|
|
|
f15c131b11
|
Update select2bs5.php para que sea compatible con Vuexy Theme
|
2023-05-29 08:26:26 +00:00 |
|
|
|
3064646922
|
añadidos en el env datos jjo y arraglado archivo de rutas
|
2023-05-28 17:23:28 +02:00 |
|
|
|
a63dc0e5ad
|
Merge branch 'dev/settings' into 'main'
Dev/settings
See merge request jjimenez/safekat!20
|
2023-05-28 14:58:54 +00:00 |
|
|
|
c4ff55654d
|
Merge branch 'main' into 'dev/settings'
# Conflicts:
# ci4/app/Config/Routes.php
|
2023-05-28 14:58:36 +00:00 |
|
|
|
b1951de661
|
Settings and UI changes
|
2023-05-28 16:50:56 +02:00 |
|
|
|
009d4f0fdb
|
Merge branch 'dev/papel' into 'main'
funcionando la vista papel generico. investiganto ruta del boton añadir. falta...
See merge request jjimenez/safekat!19
|
2023-05-28 14:49:39 +00:00 |
|
|
|
1cfa5bd60b
|
papel generico terminado. papel impresion a falta de maquinas y tipologias
|
2023-05-28 12:33:07 +02:00 |
|
|
|
0067e8fea9
|
Settings 26/5 morning
|
2023-05-26 15:38:38 +02:00 |
|
|
|
c80847062a
|
Settings 25/05 day
|
2023-05-25 22:42:44 +02:00 |
|
|
|
e8d733f39d
|
Sigo trabajando en papel generico. Problema del add resuelto. Orden de columnas mal y edit mal
|
2023-05-24 21:49:08 +02:00 |
|
|
|
6d10e4b0de
|
Settings 24/05 morning
|
2023-05-24 15:36:21 +02:00 |
|
|
|
43e9851ae8
|
Trabajando en perfil (tarde)
|
2023-05-23 22:16:01 +02:00 |
|
|
|
176f11bef0
|
Haciendo perfil
|
2023-05-23 15:34:20 +02:00 |
|
|
|
7e50c53eea
|
arraglado la tabla de PapelGenerico. Parece que el nombre del controlador es el problema. Regenerar
|
2023-05-23 14:02:36 +02:00 |
|
|
|
3774573829
|
funcionando la vista papel generico. investiganto ruta del boton añadir. falta poder quitar botones primera col
|
2023-05-22 20:47:18 +02:00 |
|
|
|
0ddd37b0c5
|
funcionando la vista papel generico. investiganto ruta del boton añadir. falta poder quitar botones primera col
|
2023-05-22 20:47:03 +02:00 |
|
|
|
aa43f9f28d
|
Merge branch 'dev/imn' into 'main'
Selector idioma
See merge request jjimenez/safekat!18
|
2023-05-19 12:34:53 +00:00 |
|
|
|
0493dddfe6
|
Selector idioma
|
2023-05-19 09:41:46 +02:00 |
|
|
|
671f196191
|
añadido ci4/app/Models/Collection.php
|
2023-05-18 20:36:22 +02:00 |
|
|
|
10a057493f
|
trabajando en papel generico. Problema al generar el datatable
|
2023-05-18 20:28:07 +02:00 |
|
|
|
2c69b6e69c
|
Merge branch 'dev/usersperrol' into 'main'
creada funcion dentro del modelo de la tabla pivote group_user para tener el...
See merge request jjimenez/safekat!17
|
2023-05-18 16:50:16 +00:00 |
|
|
|
ac76fa88a0
|
creada funcion dentro del modelo de la tabla pivote group_user para tener el numero de user de un rol
|
2023-05-18 18:48:40 +02:00 |
|
|
|
1a84536e2a
|
Merge branch 'dev/ui' into 'main'
Dev/ui
See merge request jjimenez/safekat!16
|
2023-05-18 07:11:21 +00:00 |
|
|
|
21ce38edd3
|
Merge branch 'dev/tarifas' into 'main'
Dev/tarifas
See merge request jjimenez/safekat!15
|
2023-05-18 07:09:46 +00:00 |
|
|
|
dc9fa91aa6
|
Select simple y multiple. Cambios en formularios de usuarios y grupos
|
2023-05-17 21:49:09 +02:00 |
|
