|
|
1908290167
|
Terminando formulario 2
|
2023-07-12 12:53:52 +02:00 |
|
|
|
810e1c8b37
|
Terminando formulario
|
2023-07-12 12:24:55 +02:00 |
|
|
|
247f4ea485
|
añadidos los ficheros de Ozar para maquinas por defecto
|
2023-07-10 19:00:45 +02:00 |
|
|
|
a8454a191a
|
Merge branch 'dev/maquinas' into 'main'
falta funcionalidad tabla pivote. al pulsar isRotativa hay que añadir un...
See merge request jjimenez/safekat!28
|
2023-07-09 22:18:58 +00:00 |
|
|
|
411c3f3f9c
|
finalizado el controlador máquinas
|
2023-07-10 00:12:45 +02:00 |
|
|
|
370b0deb62
|
terminando el editor2 de los papeles
|
2023-07-05 11:46:00 +02:00 |
|
|
|
14b69b52ae
|
falta funcionalidad tabla pivote. al pulsar isRotativa hay que añadir un dialog. actualizar tabla papeles con tarifas
|
2023-06-30 13:22:25 +02:00 |
|
|
|
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 |
|
|
|
743c05c717
|
Merge branch 'dev/vistas' into 'main'
Aplicar estilos papel_impresion, papel_generico, tarifas_acabado,...
See merge request jjimenez/safekat!27
|
2023-06-22 19:12:05 +00:00 |
|
|
|
6ed86606d9
|
Arreglado bug busqueda tarifas preimpresion
|
2023-06-22 15:00:03 +02:00 |
|
|
|
71e349dc76
|
Aplicar estilos papel_impresion, papel_generico, tarifas_acabado, tarifas_impresion, tarifas_manipulado y arreglos varios
|
2023-06-21 14:19:08 +02:00 |
|
|
|
46271ca94d
|
Breadcrumbs
|
2023-06-21 07:09:42 +02:00 |
|
|
|
1b51dcf80b
|
Merge branch 'dev/views' into 'main'
Dev/views
See merge request jjimenez/safekat!26
|
2023-06-20 13:30:58 +00:00 |
|
|
|
976f871a48
|
Merge branch 'main' into 'dev/views'
# Conflicts:
# ci4/.env
# ci4/app/Controllers/Test.php
|
2023-06-20 13:30:37 +00:00 |
|
|
|
e65d26da9e
|
Cambios en vistas
|
2023-06-20 15:27:45 +02:00 |
|
|
|
c1f2b3f010
|
Ajustes Tarifa acabado
|
2023-06-19 22:36:09 +02:00 |
|
|
|
0bfd9d4279
|
Revisión sistema y arreglo titulos
|
2023-06-18 22:07:54 +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 |
|
|
|
39c69ddd03
|
arreglados varios fallos de la comprobación del editor (JJO)
|
2023-06-16 12:25:09 +02:00 |
|
|
|
325ae2bd95
|
trabajando en el form
|
2023-06-15 21:53:01 +02:00 |
|
|
|
51552bc594
|
Cambios en menus y correccion de error en login (consola error cambiador de estilo dark/light)
|
2023-06-14 23:46:12 +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 |
|
