|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
f15c131b11
|
Update select2bs5.php para que sea compatible con Vuexy Theme
|
2023-05-29 08:26:26 +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 |
|
|
|
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 |
|
|
|
10a057493f
|
trabajando en papel generico. Problema al generar el datatable
|
2023-05-18 20:28:07 +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 |
|
|
|
dc9fa91aa6
|
Select simple y multiple. Cambios en formularios de usuarios y grupos
|
2023-05-17 21:49:09 +02:00 |
|
|
|
5788d392d9
|
tarifas acabado/manipulado/preimpresion terminadas. Faltan envios
|
2023-05-17 20:38:05 +02:00 |
|
|
|
39598b697d
|
trabajando en tarifas (listas, formularios)
|
2023-05-17 19:14:00 +02:00 |
|
|
|
790e9c3111
|
Selector de bandera automatico y quitado estilo node-waves
|
2023-05-16 14:53:22 +02:00 |
|
|
|
5c5cd77bc2
|
arreglado idioma tablas tarifas. Linea 114 viewList
|
2023-05-16 14:32:19 +02:00 |
|
|
|
dd9686d966
|
Recuperando cambios peridos en el merge?
|
2023-05-16 14:13:42 +02:00 |
|
|
|
d4c86212a7
|
Merge branch 'main' into 'dev/formateando2'
# Conflicts:
# ci4/app/Filters/LoginAuthFilter.php
# ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php
# ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php
|
2023-05-16 11:09:50 +00:00 |
|
|
|
f05ec163df
|
Demo View
|
2023-05-16 13:05:33 +02:00 |
|
|
|
5a0b82dcbb
|
cambios de legacytables3
|
2023-05-16 12:59:12 +02:00 |
|
|
|
ec2835ad59
|
Igualando a rama dev/formateando
|
2023-05-16 10:49:31 +02:00 |
|
|
|
efceab14d4
|
Arreglos UI
|
2023-05-11 15:18:10 +02:00 |
|
|
|
ab9a667845
|
vuelta atras de los formularios y listas tarifaacabado
|
2023-05-11 09:48:28 +02:00 |
|
|
|
3cbf5cf8a8
|
arraglando la tabla tarifas con la forma nueva
|
2023-05-11 07:33:06 +02:00 |
|
|
|
ff9bf6a000
|
IMN 10052023 morning work!!
|
2023-05-10 15:36:02 +02:00 |
|
|
|
aa87d0325f
|
Merge branch 'main' into 'dev/vuexy'
# Conflicts:
# ci4/app/Controllers/Home.php
# ci4/app/Controllers/Test.php
|
2023-05-10 10:56:57 +00:00 |
|
|
|
95d79d1dc5
|
Primera integracion de vistas IMN. Se necesita la ultima version de Jaime para avanzar. Merge de ambas ramas para proceder
|
2023-05-10 12:54:02 +02:00 |
|
|
|
e591a50a22
|
modificada la forma de obtener la lista de grupos para el index de los usuarios
|
2023-05-09 13:11:42 +02:00 |
|
|
|
6c6b603fd7
|
falta lenguaje de user y usermodel. Repasar funcionalidades
|
2023-05-09 07:39:50 +02:00 |
|
|
|
7e62ba3924
|
Work on 08/05/2023 morning
|
2023-05-08 15:11:08 +02:00 |
|
|
|
81ef01dc01
|
Added login forms and styles initial version.
|
2023-05-07 22:10:35 +02:00 |
|
|
|
50e8cb9fd5
|
trabajando en user y groups con el nuevo formato
|
2023-05-07 21:16:35 +02:00 |
|
|
|
ab99ba508b
|
Added original Vuexy files and cloned focus2 views into vuexy views for its conversion
|
2023-05-06 13:01:53 +02:00 |
|
