From ff9bf6a000bd4b40930506c6d0de681233800e77 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Wed, 10 May 2023 15:36:02 +0200 Subject: [PATCH] IMN 10052023 morning work!! --- .idea/workspace.xml | 46 +- ci4/app/Config/Routes.php | 1 + ci4/app/Controllers/Home.php | 3 +- ci4/app/Controllers/Tarifas/Tarifaacabado.php | 2 +- ci4/app/Controllers/Usuarios/Users.php | 10 +- ci4/app/Language/en/App.php | 3 +- ci4/app/Language/es/App.php | 5 +- .../themes/_commonPartialsBs/select2bs5.php | 16 +- .../configuracion/paises/_paisFormItems.php | 66 ++ .../configuracion/paises/viewPaisForm.php | 26 + .../configuracion/paises/viewPaisList.php | 84 +++ .../vuexy/form/group/viewUserGroupForm.php | 111 ++++ .../vuexy/form/group/viewUserGroupList.php | 66 ++ .../tarifas/acabado/viewTarifaacabadoForm.php | 8 +- .../tarifas/acabado/viewTarifaacabadoList.php | 8 +- .../vuexy/form/user/_userFormItems.php | 174 +++++ .../themes/backend/vuexy/form/user/form.php | 219 ------- .../themes/backend/vuexy/form/user/index.php | 120 ---- .../backend/vuexy/form/user/viewUserForm.php | 25 + .../backend/vuexy/form/user/viewUserList.php | 135 ++++ .../Views/themes/backend/vuexy/main/all.php | 2 +- .../themes/backend/vuexy/main/crud_layout.php | 593 ++++++++++++++++++ .../backend/vuexy/main/defaultlayout.php | 53 +- .../Views/themes/backend/vuexy/main/menu.php | 6 +- 24 files changed, 1364 insertions(+), 418 deletions(-) create mode 100644 ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/_paisFormItems.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php delete mode 100644 ci4/app/Views/themes/backend/vuexy/form/user/form.php delete mode 100644 ci4/app/Views/themes/backend/vuexy/form/user/index.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php create mode 100644 ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ec0dcc9c..eaa05b94 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,17 +5,26 @@ - + + + + - - + + + + + + + + + - - { - "keyToString": { - "RunOnceActivity.OpenProjectViewOnStart": "true", - "RunOnceActivity.ShowReadmeOnStart": "true", - "WebServerToolWindowFactoryState": "false", - "last_opened_file_path": "C:/temp-sk/safekat/ci4/app/Views/themes/backend/vuexy/main", - "node.js.detected.package.eslint": "true", - "node.js.detected.package.tslint": "true", - "node.js.selected.package.eslint": "(autodetect)", - "node.js.selected.package.tslint": "(autodetect)", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + +}]]> + + @@ -76,6 +87,7 @@ + 1682339938559 diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 6c4f9795..b7722b94 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -78,6 +78,7 @@ $routes->group('', [], function($routes) { $routes->post('edit/(:num)', 'Group::edit/$1', ['as' => 'updateGroup']); $routes->get('edit/(:num)', 'Group::edit/$1', ['as' => 'editGroup']); $routes->get('delete/(:num)', 'Group::delete/$1', ['as' => 'deleteGroup']); + $routes->get('add', 'Group::add', ['as' => 'newGroup']); }); $routes->resource('group', ['namespace' => 'App\Controllers\Usuarios', 'controller' => 'UserGroups', 'except' => 'show,new,create,update']); diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index d7370939..16980da4 100644 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -18,7 +18,7 @@ class Home extends BaseController public function index() { - /* + $session = session(); $id_user = $session->get('id_user'); $name = $session->get('first_name'); @@ -34,6 +34,7 @@ class Home extends BaseController echo view(getenv('theme.path').'main/all'); + /* //echo view(getenv('theme.path').'main/header'); //echo view(getenv('theme.path').'main/menu'); //echo view(getenv('theme.path').'form/dashboard/index'); diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index 49586ebe..302d2f91 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -94,7 +94,7 @@ class Tarifaacabado extends GoBaseController { endif; // ($requestMethod === 'post') - $this->viewData['tarifaacabado_'] = isset($sanitizedData) ? new Tarifaacabado_($sanitizedData) : new Tarifaacabado_(); + $this->viewData['tarifaacabado_'] = isset($sanitizedData) ? new Tarifaacabado($sanitizedData) : new Tarifaacabado(); $this->viewData['formAction'] = route_to('createTarifaacabado'); diff --git a/ci4/app/Controllers/Usuarios/Users.php b/ci4/app/Controllers/Usuarios/Users.php index 3e68b70e..9859ca94 100644 --- a/ci4/app/Controllers/Usuarios/Users.php +++ b/ci4/app/Controllers/Usuarios/Users.php @@ -25,7 +25,7 @@ class Users extends \App\Controllers\GoBaseController { protected static $pluralObjectName = 'Users'; protected static $controllerSlug = 'users'; - protected static $viewPath = 'themes/backend/focus2/form/user/'; + protected static $viewPath = 'themes/backend/vuexy/form/user/'; protected $indexRoute = 'userList'; @@ -110,7 +110,7 @@ class Users extends \App\Controllers\GoBaseController { $this->group_user_model->insert($group_user_data); } - $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Users.user'))]).'.'; + $message = lang('Basic.global.saveSuccess', [mb_strtolower(lang('Users.user'))]) . 'Downloads'; $message .= anchor(route_to('editUser', $id), lang('Basic.global.continueEditing').'?'); $message = ucfirst(str_replace("'", "\'", $message)); @@ -134,7 +134,7 @@ class Users extends \App\Controllers\GoBaseController { $this->viewData['formAction'] = route_to('createUser'); $this->viewData['groups'] = $this->group_model->select('token,title')->findAll(); - $this->viewData['boxTitle'] = lang('Basic.global.addNew').' '.lang('Users.user').' '.lang('Basic.global.addNewSuffix'); + $this->viewData['boxTitle'] = lang('Basic.global.addNew') . ' Users.php' .lang('Users.user').' '.lang('Basic.global.addNewSuffix'); return $this->displayForm(__METHOD__); @@ -212,7 +212,7 @@ class Users extends \App\Controllers\GoBaseController { } $id = $user->id_user ?? $id; - $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Users.user'))]).'.'; + $message = lang('Basic.global.updateSuccess', [mb_strtolower(lang('Users.user'))]) . 'Downloads'; $message .= anchor(route_to('editUser', $id), lang('Basic.global.continueEditing').'?'); $message = ucfirst(str_replace("'", "\'", $message)); @@ -237,7 +237,7 @@ class Users extends \App\Controllers\GoBaseController { $this->viewData['selectedGroups'] = $this->group_user_model->select('token_group')->where('token_user', $user->token)->findAll(); $this->viewData['groups'] = $this->group_model->select('token,title')->findAll(); - $this->viewData['boxTitle'] = lang('Basic.global.edit2').' '.lang('Users.user').' '.lang('Basic.global.edit3'); + $this->viewData['boxTitle'] = lang('Basic.global.edit2') . ' Users.php' .lang('Users.user').' '.lang('Basic.global.edit3'); return $this->displayForm(__METHOD__, $id); diff --git a/ci4/app/Language/en/App.php b/ci4/app/Language/en/App.php index f689c329..aa4f8ac4 100644 --- a/ci4/app/Language/en/App.php +++ b/ci4/app/Language/en/App.php @@ -30,8 +30,7 @@ return [ "global_pdf" => "PDF", // LOGIN - Index - "login_title" => "Welcome to Safekat!", - "login_subtitle" => "Sign in to your account", + "login_title" => "Sign in to your account", "login_email" => "Email", "login_email_ph" => "Type your email", "login_password" => "Password", diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index d66011ec..23d69f82 100644 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -24,14 +24,13 @@ return [ "global_disable" => "Desactivar", "global_active" => "Activo", "global_inactive" => "Inactivo", - "global_copy" => "Copiar", + "global_copy" => "Dupdo", "global_print" => "Impresión", "global_excel" => "Excel", "global_pdf" => "PDF", // LOGIN - Index - "login_title" => "¡Bienvenido a Safekat!", - "login_subtitle" => "Iniciar sesión en su cuenta", + "login_title" => "Iniciar sesión en su cuenta", "login_email" => "Correo Electrónico", "login_email_ph" => "Escriba su correo electrónico", "login_password" => "Contraseña", diff --git a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php index c5afb660..5de3a76a 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php +++ b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php @@ -1,19 +1,31 @@ section('css') ?> + + */ ?> + endSection() ?> section('additionalExternalJs') ?> - + ?> + + + endSection() ?> section('additionalInlineJs') ?> - + + + + $('.select2').select2({ + + }); endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/_paisFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/_paisFormItems.php new file mode 100644 index 00000000..9bfc0f4c --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/_paisFormItems.php @@ -0,0 +1,66 @@ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ +
+ +
\ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php new file mode 100644 index 00000000..a8f2a01f --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisForm.php @@ -0,0 +1,26 @@ +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/focus2/main/defaultlayout') ?> + +section("content") ?> +
+
+
+
+

+
+
+ +
+ + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+
+ "btn btn-secondary float-start"]) ?> + "> +
+
+
+
+
+endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php new file mode 100644 index 00000000..d2a24027 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/paises/viewPaisList.php @@ -0,0 +1,84 @@ +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/backend/focus2/main/defaultlayout') ?> + +section('content'); ?> +
+
+ +
+
+

+ 'btn btn-primary float-end']); ?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ id ?> + + nombre) || strlen($item->nombre) < 51 ? esc($item->nombre) : character_limiter(esc($item->nombre), 50) ?> + + code) ?> + + code3) ?> + + moneda) ?> + + url_erp) ?> + + user_erp) || strlen($item->user_erp) < 51 ? esc($item->user_erp) : character_limiter(esc($item->user_erp), 50) ?> + + key_erp) || strlen($item->key_erp) < 51 ? esc($item->key_erp) : character_limiter(esc($item->key_erp), 50) ?> + + + show_erp ) { ?> + + + + + + + id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id,]); ?> + 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deletePais', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> +
+
+
+ +
+
+
+
+ +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php new file mode 100644 index 00000000..2ecafcb6 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php @@ -0,0 +1,111 @@ +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> + +section("content") ?> +
+
+
+
+

+
+
+ +
+ + + +
+
+
+
+ + +
+
+
+
+ + dashboard : set_value('dashboard');?> + +
+
+
+
+
+
+ + +
+
+
+
+
+
+
+

+
+
+
+ + +
+

+ + +
+ + +
+ + +
+ + +
+
+
+ +
+
+

+
+
+
+ + +
+

+ + +
+ + +
+ + +
+ + +
+
+
+ +
+
+
+
+ "btn btn-secondary float-start"]) ?> + "> +
+
+ + +
+ +
+
+
+endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php new file mode 100644 index 00000000..d258f17e --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php @@ -0,0 +1,66 @@ +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> +section('content'); ?> +
+
+ +
+
+

+ 'btn btn-primary float-end']); ?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ id_group ?> + + title) ?> + + dashboard) ?> + + token) ?> + + created_at) ? '' : date('d/m/Y H:m:s', strtotime($item->created_at)) ?> + + updated_at) ? '' : date('d/m/Y H:m:s', strtotime($item->updated_at)) ?> + + id_group), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id_group,]); ?> + 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteGroup', $item->id_group), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> +
+
+
+ +
+
+
+
+ +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php index 200566e6..86812937 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoForm.php @@ -1,5 +1,5 @@ -include("Themes/_commonPartialsBs/select2bs5") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -10,9 +10,9 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - +
"btn btn-secondary float-start"]) ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php index a20ee4fc..fed2ada9 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/acabado/viewTarifaacabadoList.php @@ -8,13 +8,13 @@

- 'btn btn-info float-end']); ?> + 'btn btn-primary float-end']); ?>
- - +
+ @@ -75,7 +75,7 @@ updated_at) ? '' : date('d/m/Y H:m:s', strtotime($item->updated_at)) ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php new file mode 100644 index 00000000..3551a01e --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php @@ -0,0 +1,174 @@ +
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + + +
+ +
+ + +
+ + +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + +
+
+ + +
+
+ +
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+ + language);?> + +
+
+ +
+ + +
+ +
+ + blocked);?> + +
+ +
+ + email_confirmed);?> + + +
+ + +
+ + status);?> + + +
+ + + +
+ +
\ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/form.php b/ci4/app/Views/themes/backend/vuexy/form/user/form.php deleted file mode 100644 index f3f02d6e..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/user/form.php +++ /dev/null @@ -1,219 +0,0 @@ - -" rel="stylesheet"> - -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
-
-
-
-
-

-
-
- - " method="post"> - - -
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " id="date_birth" name="date_birth" value=""> -
-
-
-
- - " value=""> -
-
-
-
- - "> -
-
-
-
- - "> -
-
- -
-
- - - -
-
- -
-
- - - -
-
- -
-
- - - -
-
-
-
-
- -
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - " value=""> -
-
-
-
- - - -
-
-
-
- - - -
-
-
- -
-
- - - - -
- -
-
-
-
-
-
- - - - - - - - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/index.php b/ci4/app/Views/themes/backend/vuexy/form/user/index.php deleted file mode 100644 index c29315e5..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/user/index.php +++ /dev/null @@ -1,120 +0,0 @@ - -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
-
-
-
-
-
-

-
-
- - - -
-
-
- - - -
-
- id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-primary btn-edit me-1', 'data-id'=>$item->id,]); ?> + id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id,]); ?> 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteTarifaacabado', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>
- - - - - - - - - - - - -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php new file mode 100644 index 00000000..fe4d02ae --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php @@ -0,0 +1,25 @@ +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> +section("content") ?> +
+
+
+
+

+
+
+ +
+ + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+
+ "btn btn-secondary float-start"]) ?> + "> +
+
+
+
+
+endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php new file mode 100644 index 00000000..a30adec6 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php @@ -0,0 +1,135 @@ +include('themes/_commonPartialsBs/datatables') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> +section('content'); ?> +
+
+ +
+
+

+ 'btn btn-primary float-end']); ?> +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ id_user ?> + + first_name) || strlen($item->first_name) < 51 ? esc($item->first_name) : character_limiter(esc($item->first_name), 50) ?> + + last_name) || strlen($item->last_name) < 51 ? esc($item->last_name) : character_limiter(esc($item->last_name), 50) ?> + + getGroupsTitles($item->token)) || strlen($user_model->getGroupsTitles($item->token)) < 51 ? esc($user_model->getGroupsTitles($item->token)) : character_limiter($user_model->getGroupsTitles($item->token), 50) ?> + + mobile) || strlen($item->mobile) < 51 ? esc($item->mobile) : character_limiter(esc($item->mobile), 50) ?> + + email) ?> + + address) || strlen($item->address) < 51 ? esc($item->address) : character_limiter(esc($item->address), 50) ?> + + city) || strlen($item->city) < 51 ? esc($item->city) : character_limiter(esc($item->city), 50) ?> + + state) || strlen($item->state) < 51 ? esc($item->state) : character_limiter(esc($item->state), 50) ?> + + country) ?> + + zip_code) || strlen($item->zip_code) < 51 ? esc($item->zip_code) : character_limiter(esc($item->zip_code), 50) ?> + + last_ip) || strlen($item->last_ip) < 51 ? esc($item->last_ip) : character_limiter(esc($item->last_ip), 50) ?> + + last_access) ? '' : date('d/m/Y H:m:s', strtotime($item->last_access)) ?> + + picture) || strlen($item->picture) < 51 ? esc($item->picture) : character_limiter(esc($item->picture), 50) ?> + + language) ?> + + blocked) ? '' : date('d/m/Y H:m:s', strtotime($item->blocked)) ?> + + email_confirmed) ?> + + token) ?> + + + status ) { ?> + + + + + + + created_at) ? '' : date('d/m/Y H:m:s', strtotime($item->created_at)) ?> + + updated_at) ? '' : date('d/m/Y H:m:s', strtotime($item->updated_at)) ?> + + id_user), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id_user,]); ?> + 'btn btn-sm btn-danger btn-delete ms-1', 'data-href'=>route_to('deleteUser', $item->id_user), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> +
+
+
+ +
+
+
+
+ +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index f1b621ec..eccd0c1c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -75,7 +75,7 @@ if (!empty($token) && $tfa == false) { - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php b/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php index b3d9bbc7..34b1c2f4 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php @@ -1 +1,594 @@ get('token') ?? ''; +$tfa = $session->get('tfa') ?? false; +$settings = $session->get('settings'); + +$picture = session()->get('picture'); +$pulse = session()->get('pulse'); +$notification = session()->get('notification'); + +if (!empty($token) && $tfa == false) { +//echo ""; +} +?> + + + + + + + + + <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + renderSection('css') ?> + + + + + + + + + + +
+
+ + + + + +
+ + + + + + +
+ +
+

Page 1

+ renderSection('content') ?> +
+ + + + + + +
+
+ +
+ + +
+ + +
+ + +
+
+ + +renderSection('footerAdditions') ?> + + + + + + + + + + + + + + + + +"> + + + + */ +?> + +renderSection('additionalExternalJs') ?> + + + + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index 8b52687f..e79c4059 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -9,7 +9,7 @@ $pulse = session()->get('pulse'); $notification = session()->get('notification'); if (!empty($token) && $tfa == false) { -//echo ""; + //echo ""; } ?> @@ -86,19 +86,18 @@ if (!empty($token) && $tfa == false) { renderSection('css') ?> - +
- @@ -156,8 +155,7 @@ if (!empty($token) && $tfa == false) {
- +
@@ -201,8 +199,7 @@ if (!empty($token) && $tfa == false) {
- +
@@ -248,8 +245,7 @@ if (!empty($token) && $tfa == false) {
- +
@@ -295,8 +291,7 @@ if (!empty($token) && $tfa == false) {
- +
@@ -318,8 +313,7 @@ if (!empty($token) && $tfa == false) {
- +
@@ -377,8 +371,7 @@ if (!empty($token) && $tfa == false) {
  • - +
      @@ -458,9 +451,12 @@ if (!empty($token) && $tfa == false) {
      +

      Page 1

      - renderSection('content') ?> +

      + renderSection('content') ?> +

      @@ -481,7 +477,6 @@ if (!empty($token) && $tfa == false) {
      -
    • @@ -494,7 +489,6 @@ if (!empty($token) && $tfa == false) { renderSection('footerAdditions') ?> - @@ -509,28 +503,14 @@ if (!empty($token) && $tfa == false) { -"> - - - - */ -?> - renderSection('additionalExternalJs') ?> - - - - + + + - - - - \ No newline at end of file + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu.php b/ci4/app/Views/themes/backend/vuexy/main/menu.php index 1a7b576d..94d0ec57 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu.php @@ -466,7 +466,7 @@ /** * MENU USUARIOS */ - if (allowMenuSection($menus, ['User', 'Group'], 'index')): ?> + if (allowMenuSection($menus, ['Users', 'Group'], 'index')): ?>
  • @@ -474,10 +474,10 @@
    ">