From dc9fa91aa6648b38b59565cfe13eacbfc786bf72 Mon Sep 17 00:00:00 2001 From: imnavajas Date: Wed, 17 May 2023 21:49:09 +0200 Subject: [PATCH] Select simple y multiple. Cambios en formularios de usuarios y grupos --- .idea/deployment.xml | 3 +- .idea/workspace.xml | 32 ++- ci4/.env | 8 +- ci4/app/Controllers/Home.php | 2 +- .../themes/_commonPartialsBs/select2bs5.php | 30 +-- .../themes/backend/vuexy/form/group/form.php | 166 --------------- .../themes/backend/vuexy/form/group/index.php | 118 ----------- .../vuexy/form/group/viewUserGroupForm.php | 196 ++++++++---------- .../vuexy/form/user/_userFormItems.php | 28 +-- .../backend/vuexy/form/user/viewUserForm.php | 37 ++-- .../Views/themes/backend/vuexy/main/all.php | 6 +- .../themes/backend/vuexy/main/all_selects.php | 14 +- .../backend/vuexy/main/defaultlayout.php | 9 +- 13 files changed, 173 insertions(+), 476 deletions(-) delete mode 100644 ci4/app/Views/themes/backend/vuexy/form/group/form.php delete mode 100644 ci4/app/Views/themes/backend/vuexy/form/group/index.php diff --git a/.idea/deployment.xml b/.idea/deployment.xml index 987a08cf..0bdb7590 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,7 @@ - + + + - - + + + + + + + + - + - + - @@ -83,6 +90,8 @@ + + 1682339938559 @@ -133,4 +142,15 @@ + + + + + file://$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/all.php + 372 + + + + \ No newline at end of file diff --git a/ci4/.env b/ci4/.env index f5a58fed..d00689e2 100644 --- a/ci4/.env +++ b/ci4/.env @@ -23,7 +23,7 @@ CI_ENVIRONMENT = development #-------------------------------------------------------------------- # app.baseURL = 'https://sk-imn.imnavajas.es' -app.baseURL = 'https://sk-jjo.imnavajas.es' +app.baseURL = 'https://sk-imn.imnavajas.es' # app.forceGlobalSecureRequests = false # app.sessionDriver = 'CodeIgniter\Session\Handlers\FileHandler' @@ -41,9 +41,9 @@ app.baseURL = 'https://sk-jjo.imnavajas.es' #-------------------------------------------------------------------- database.default.hostname = localhost -database.default.database = sk_jjo -database.default.username = sk_jjo -database.default.password = 61tv&G1Zf^XY +database.default.database = sk_imn +database.default.username = sk_imn +database.default.password = Uyia19_87 database.default.DBDriver = MySQLi database.default.DBPrefix = database.default.dump = diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index 16980da4..093d13a3 100644 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -32,7 +32,7 @@ class Home extends BaseController else $salutation = lang("App.dashboard_good_night"); - echo view(getenv('theme.path').'main/all'); + echo view(getenv('theme.path').'main/all_selects'); /* //echo view(getenv('theme.path').'main/header'); diff --git a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php index b88bd0bc..00be171b 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php +++ b/ci4/app/Views/themes/_commonPartialsBs/select2bs5.php @@ -1,35 +1,27 @@ section('css') ?> - - - */ ?> endSection() ?> section('additionalExternalJs') ?> - ?> - - endSection() ?> section('additionalInlineJs') ?> - 'use strict'; - const select2 = $('.select2'); + const select2 = $('.select2'); - // Select2 - // -------------------------------------------------------------------- - if (select2.length) { - select2.each(function () { - var $this = $(this); - $this.wrap('
').select2({ - placeholder: 'Select value', - dropdownParent: $this.parent() - }); + // Select2 + // -------------------------------------------------------------------- + if (select2.length) { + select2.each(function () { + var $this = $(this); + $this.wrap('
').select2({ + placeholder: 'Select value', + dropdownParent: $this.parent() }); - } + }); + } endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/form.php b/ci4/app/Views/themes/backend/vuexy/form/group/form.php deleted file mode 100644 index dd972e4e..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/group/form.php +++ /dev/null @@ -1,166 +0,0 @@ - -
-
-
-
-
-

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

-
-
- -
" method="post"> - - - -
-
-
-
- - -
-
-
-
- - - -
-
-
-
-
-
- - -
-
-
-
-
-
-
-

-
-
-
- - -
-

- - -
- - -
- - -
- - -
-
-
- -
-
-

-
-
-
- - -
-

- - -
- - -
- - -
- - -
-
-
- -
-
-
-
- - - - -
-
-
-
-
-
-
-
- - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/index.php b/ci4/app/Views/themes/backend/vuexy/form/group/index.php deleted file mode 100644 index 4d233d31..00000000 --- a/ci4/app/Views/themes/backend/vuexy/form/group/index.php +++ /dev/null @@ -1,118 +0,0 @@ - -
-
-
-
-
-

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

-
-
- - - -
-
-
- - - -
- - - - - - - - - - -
-
-
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - - diff --git a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php index a66b6690..c664c8dd 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/group/viewUserGroupForm.php @@ -6,107 +6,65 @@
-
-

-
+

-
+ - - -
-
-
-
- - -
-
-
-
- - dashboard : set_value('dashboard'); ?> - -
-
+ + +
+
+ +
-
-
-
- - -
-
+
+ + dashboard : set_value('dashboard'); ?> +
-
-
-
Role Permissions
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ + +
+ +
+
+
Role Permissions
+ +
+
>> -
- rules, $item['name'], $subitem)?'checked':''?> - > - -
-
+ + - + - + + - -
+ + >> + @@ -115,7 +73,7 @@ id="" name="" class="form-check-input" - rules, $item['name'], $subitem)?'checked':''?> + rules, $item['name'], $subitem) ? 'checked' : '' ?> > @@ -126,17 +84,41 @@
-
+ + + + + + + +
+ rules, $item['name'], $subitem) ? 'checked' : '' ?> + > + +
+ + + + + + + +
-
- "btn btn-secondary float-start"]) ?> - + "> + "btn btn-secondary"]) ?>
@@ -150,14 +132,14 @@ section('additionalInlineJs') ?> $('#select_all').on('click', function () { - $(':checkbox').each(function() { - this.checked = true; - }); + $(':checkbox').each(function() { + this.checked = true; + }); }); $('#remove_all').on('click', function () { - $(':checkbox').each(function() { - this.checked = false; - }); + $(':checkbox').each(function() { + this.checked = false; + }); }); endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php index 0f58c828..af23de5e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/_userFormItems.php @@ -26,7 +26,7 @@ - +
- +
- +
- +
- +
- - + +
status);?> - - +
- -
+ +
\ 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 index fe4d02ae..417ed876 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php +++ b/ci4/app/Views/themes/backend/vuexy/form/user/viewUserForm.php @@ -1,25 +1,26 @@ 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/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index 7bd0da6b..8b7f76a6 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -62,8 +62,8 @@ if (!empty($token) && $tfa == false) { - - + + - @@ -492,7 +491,6 @@ if (!empty($token) && $tfa == false) { - diff --git a/ci4/app/Views/themes/backend/vuexy/main/all_selects.php b/ci4/app/Views/themes/backend/vuexy/main/all_selects.php index 5a130e55..9c4a779c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all_selects.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all_selects.php @@ -80,7 +80,7 @@ if (!empty($token) && $tfa == false) { - + @@ -398,7 +398,6 @@ if (!empty($token) && $tfa == false) { - @@ -414,19 +413,10 @@ if (!empty($token) && $tfa == false) { 'use strict'; $(function () { - const selectPicker = $('.selectpicker'), - select2 = $('.select2'); - - // Bootstrap Select - // -------------------------------------------------------------------- - if (selectPicker.length) { - selectPicker.selectpicker(); - } + const select2 = $('.select2'); // Select2 // -------------------------------------------------------------------- - - // Default if (select2.length) { select2.each(function () { var $this = $(this); diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index d0102412..f28f070e 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -16,8 +16,7 @@ if (!empty($token) && $tfa == false) { - - + + - -