From 6d10e4b0de01082dab2bf65e771662b7b683f8e2 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Wed, 24 May 2023 15:36:21 +0200 Subject: [PATCH] Settings 24/05 morning --- .idea/workspace.xml | 43 +- ci4/app/Controllers/Settings.php | 3 +- ci4/app/Controllers/Usuarios/Group.php | 6 + ci4/app/Models/Usuarios/GroupUserModel.php | 2 +- .../vuexy/form/group/viewUserGroupList.php | 2 +- .../backend/vuexy/form/settings/index.php | 414 +++++- .../backend/vuexy/form/settings/index_bk.php | 1173 +++++++++++++++++ .../tarifas/acabado/viewTarifaacabadoForm.php | 38 +- .../tarifas/acabado/viewTarifaacabadoList.php | 4 +- .../backend/vuexy/form/user/viewUserForm.php | 8 +- .../backend/vuexy/form/user/viewUserList.php | 4 +- 11 files changed, 1597 insertions(+), 100 deletions(-) create mode 100644 ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php diff --git a/.idea/workspace.xml b/.idea/workspace.xml index ef6d3415..efab2f96 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,9 +5,17 @@ + - - + + + + + + + + + - { - "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", - "settings.editor.selected.configurable": "preferences.pluginManager", - "vue.rearranger.settings.migration": "true" + +}]]> + - @@ -86,6 +94,7 @@ + 1682339938559 diff --git a/ci4/app/Controllers/Settings.php b/ci4/app/Controllers/Settings.php index 26f82681..cf51db9a 100644 --- a/ci4/app/Controllers/Settings.php +++ b/ci4/app/Controllers/Settings.php @@ -78,9 +78,8 @@ class Settings extends BaseController $data['tables'] = $db->listTables(); $data['user'] = $this->user_model->select('token,first_name,email')->where('status',true)->findAll(); - echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/settings/index', $data); - echo view(getenv('theme.path').'main/footer'); + } public function store() diff --git a/ci4/app/Controllers/Usuarios/Group.php b/ci4/app/Controllers/Usuarios/Group.php index 2ca3d446..572c8fcc 100644 --- a/ci4/app/Controllers/Usuarios/Group.php +++ b/ci4/app/Controllers/Usuarios/Group.php @@ -4,6 +4,7 @@ use App\Entities\Usuarios\UserGroupEntity; use App\Controllers\GoBaseResourceController; use App\Models\Usuarios\UserGroupModel; +use App\Models\Usuarios\GroupUserModel; class Group extends \App\Controllers\GoBaseController { @@ -21,6 +22,8 @@ class Group extends \App\Controllers\GoBaseController protected $indexRoute = 'userGroupList'; + private $group_user_model; + public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Group.moduleTitle'); self::$viewPath = getenv('theme.path').'form/group/'; @@ -33,6 +36,9 @@ class Group extends \App\Controllers\GoBaseController { $this->viewData['usingClientSideDataTable'] = true; $this->viewData['pageSubTitle'] = lang('Basic.global.ManageAllRecords', [lang('Groups.group')]); + // IMN + $this->group_user_model = new GroupUserModel(); + $this->viewData['model'] = $this->group_user_model; parent::index(); } diff --git a/ci4/app/Models/Usuarios/GroupUserModel.php b/ci4/app/Models/Usuarios/GroupUserModel.php index 5dc9265e..b93cf80e 100644 --- a/ci4/app/Models/Usuarios/GroupUserModel.php +++ b/ci4/app/Models/Usuarios/GroupUserModel.php @@ -12,7 +12,7 @@ class GroupUserModel extends BaseModel ]; public function getUsersWithRol($token_group){ - + $result = $this->select('token_user')->where('token_group', $token_group)->countAllResults(); return $result; } diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php index 581b5c4c..f32d8b4b 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupList.php @@ -43,7 +43,7 @@
-
Total 4 users
+
getUsersWithRol($item->token); ?> usuarios en total
diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php index 226e0ddb..abf54afe 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php @@ -1,8 +1,354 @@ - -" rel="stylesheet"> -" rel="stylesheet"> +include("themes/_commonPartialsBs/select2bs5") ?> +extend('themes/backend/vuexy/main/general_settings_layout') ?> + +section('content'); ?> -
+
+ + +
+
+
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
+
+ + + +
+
+ +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+ + " + value="" + /> +
+
+ + + +
+
+ + +
+
+
+ + +
+
+ +
+ +
+ +
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + + +
+
+ + +
+
+
+
+ + +
+
+
+ + + +
+
+

+ +

+
+
+
+
+
+ +
+
+ + + +
+
+ + " + value="" + > +
+
+ + " + value="" + > +
+
+ + " value=""> +
+
+ + " value=""> +
+
+ + " value=""> +
+
+ + + +
+
+ +
+
+ +
+ "> +
+ +
+
+ +
+ + +
+
+
+ +
+
+ + + + + + + +
@@ -104,7 +450,7 @@
@@ -667,7 +1013,7 @@
@@ -755,7 +1101,7 @@
@@ -944,56 +1290,14 @@
- - - - - - - - - - - - - - - - - - - - - - - - - - - +endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php b/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php new file mode 100644 index 00000000..69c2d05b --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index_bk.php @@ -0,0 +1,1173 @@ + +" rel="stylesheet"> +" rel="stylesheet"> + +
+
+
+
+
+

+ +
+
+
+
    + + +
    2. + +
    3. + + +
+
+
+
" method="post"> + +
+
+
+
+
+
+
+ + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+ + +
+
+
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+ +
+
+
+ +
+ "> +
+ +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ + " value=""> +
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+ +
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+ + " value=""> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + + +
+
+
+
+ + " value=""> +
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+ " class="btn btn-primary mt-2"> +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ > + +
+
+
+
+
+ + " value=""> +
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+ + " value=""> +
+
+
+
+ + + +
+
+
+ +
+
+ " class="btn btn-warning pull-right"> +
+
+
+
+

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

+
+
+ +
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ +
+ > + +
+
+
+
+
+ +
+ " value=""> +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+

+ +
+
+

+
+
+ + + + + + + + + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+ + + + +
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + 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 1aba3ba5..f52ac417 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,25 +1,27 @@ include("themes/_commonPartialsBs/select2bs5") ?> -extend('themes/backend/vuexy/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
-
-
-

-
-
- -
- - getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> - -
-
- "btn btn-secondary float-start"]) ?> - "> -
-
-
+
+
+

+
+
+ + + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> + +
+ " + > + "btn btn-secondary"]) ?> +
+
+
endSection() ?> 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 0f535112..61d8d38d 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 @@ -85,8 +85,8 @@ */ ?> - 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']); ?> + id), "", ['class'=>'text-body', 'data-id'=>$item->id,]); ?> + ", ['class'=>'text-body', 'data-href'=>route_to('deleteTarifaacabado', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php index 417ed876..9349948e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php @@ -14,8 +14,12 @@ getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
- "> + " + > "btn btn-secondary"]) ?>
diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php index 7cf110c5..beb87e71 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserList.php @@ -122,8 +122,8 @@ */ ?> - 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']); ?> + id_user), "", ['class'=>'text-body', 'data-id'=>$item->id_user,]); ?> + ", ['class'=>'text-body', 'data-href'=>route_to('deleteUser', $item->id_user), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?>