From 95d79d1dc559ffe035270e620e8d477472e92a7c Mon Sep 17 00:00:00 2001 From: imnavajas Date: Wed, 10 May 2023 12:54:02 +0200 Subject: [PATCH] Primera integracion de vistas IMN. Se necesita la ultima version de Jaime para avanzar. Merge de ambas ramas para proceder --- .idea/deployment.xml | 15 + .idea/php.xml | 20 + .idea/vcs.xml | 6 + .idea/webServers.xml | 14 + .idea/workspace.xml | 53 +- ci4/app/Controllers/Home.php | 4 + ci4/app/Controllers/Tarifas/Tarifaacabado.php | 1 + ci4/app/Controllers/Test.php | 4 +- .../themes/_commonPartialsBs/datatables.php | 2 +- .../tarifas/acabado/viewTarifaacabadoList.php | 10 +- .../Views/themes/backend/vuexy/main/all.php | 39 - .../themes/backend/vuexy/main/crud_layout.php | 1 + .../backend/vuexy/main/defaultlayout.php | 700 +++++++++++++---- .../Views/themes/backend/vuexy/main/menu.php | 729 ++++++++++++------ datos web.txt | 2 + 15 files changed, 1116 insertions(+), 484 deletions(-) create mode 100644 .idea/deployment.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/webServers.xml create mode 100644 ci4/app/Views/themes/backend/vuexy/main/crud_layout.php diff --git a/.idea/deployment.xml b/.idea/deployment.xml new file mode 100644 index 00000000..326a3499 --- /dev/null +++ b/.idea/deployment.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 00000000..89778155 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/webServers.xml b/.idea/webServers.xml new file mode 100644 index 00000000..60c0bb4b --- /dev/null +++ b/.idea/webServers.xml @@ -0,0 +1,14 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index b03736c5..ec0dcc9c 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -5,12 +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", + "vue.rearranger.settings.migration": "true" } -}]]> +} @@ -68,6 +73,9 @@ + + + 1682339938559 @@ -118,15 +126,4 @@ - - - - - file://$PROJECT_DIR$/ci4/app/Views/themes/backend/vuexy/main/menu.php - 64 - - - - \ No newline at end of file diff --git a/ci4/app/Controllers/Home.php b/ci4/app/Controllers/Home.php index 5c7a6607..3e2da513 100644 --- a/ci4/app/Controllers/Home.php +++ b/ci4/app/Controllers/Home.php @@ -156,5 +156,9 @@ class Home extends BaseController echo view(getenv('theme.path').'main/footer'); endswitch; */ + } + } + + diff --git a/ci4/app/Controllers/Tarifas/Tarifaacabado.php b/ci4/app/Controllers/Tarifas/Tarifaacabado.php index cc85a1f6..49586ebe 100644 --- a/ci4/app/Controllers/Tarifas/Tarifaacabado.php +++ b/ci4/app/Controllers/Tarifas/Tarifaacabado.php @@ -24,6 +24,7 @@ class Tarifaacabado extends GoBaseController { public function initController(\CodeIgniter\HTTP\RequestInterface $request, \CodeIgniter\HTTP\ResponseInterface $response, \Psr\Log\LoggerInterface $logger) { $this->viewData['pageTitle'] = lang('Tarifaacabado.moduleTitle'); self::$viewPath = getenv('theme.path').'form/tarifas/acabado/'; + parent::initController($request, $response, $logger); diff --git a/ci4/app/Controllers/Test.php b/ci4/app/Controllers/Test.php index 8762bfd9..7977ee44 100644 --- a/ci4/app/Controllers/Test.php +++ b/ci4/app/Controllers/Test.php @@ -13,9 +13,7 @@ class Test extends BaseController public function index() { - echo '
';
-        var_dump($this->validateControllerAccess());
-        echo '
'; + echo languages[$currentLocale] ?? config('Basics')->i18n; } public function validateControllerAccess(){ diff --git a/ci4/app/Views/themes/_commonPartialsBs/datatables.php b/ci4/app/Views/themes/_commonPartialsBs/datatables.php index 5f847e33..fee4d44b 100644 --- a/ci4/app/Views/themes/_commonPartialsBs/datatables.php +++ b/ci4/app/Views/themes/_commonPartialsBs/datatables.php @@ -160,7 +160,7 @@ "scrollX": true, "stateSave": true, "language": { - url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + //url: "//cdn.datatables.net/plug-ins/1.10.25/i18n/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" }, "columnDefs": [ { 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 5be01606..a20ee4fc 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 @@ -1,5 +1,5 @@ include('themes/_commonPartialsBs/datatables') ?> -extend('themes/backend/focus2/main/defaultlayout') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section('content'); ?>
@@ -8,13 +8,13 @@

- 'btn btn-primary float-end']); ?> + 'btn btn-info 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/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index 2ecb6a67..f1b621ec 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -99,45 +99,6 @@ 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 new file mode 100644 index 00000000..b3d9bbc7 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/crud_layout.php @@ -0,0 +1 @@ +get('settings'); +$session = session(); +$token = $session->get('token') ?? ''; +$tfa = $session->get('tfa') ?? false; +$settings = $session->get('settings'); + $picture = session()->get('picture'); $pulse = session()->get('pulse'); $notification = session()->get('notification'); -?> -window.location.href = '/'; "; +} ?> - + + + - - - - <?= lang("App.dashboard_title") ?> - <?= $settings['title']??'' ?> - - - - - - - - - - - - + + + + <?= lang("App.dashboard_title") ?> - <?= $settings['title'] ?? '' ?> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + renderSection('css') ?> + + + + + -
-
-
-
-
-
-
-
- -
-
-
-
- -
-
-
- -
-
-
+ + +renderSection('footerAdditions') ?> + + + + + + + + + + + + + +"> + + + + */ +?> + +renderSection('additionalExternalJs') ?> - - - - - - - - - - - - - - - - - - - - + + + + - - - - renderSection('additionalExternalJs') ?> - - + $(window).resize(function () { + adjustSidebar4ContentWrapper(); + }); + + renderSection('additionalInlineJs') ?> + + }); + + \ 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 7fe9b430..1a7b576d 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu.php @@ -25,31 +25,492 @@ - -
  • - - -
    Page 1
    -     -
    • -
  • - - -
    Page 2
    -     -
    • - - - 0): ?> + +
  • - " class="menu-link"> + + +
    ">
    +     + +
    • + + + +
  • + + +
    ">
    +     + +
    • + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + 0): ?> + +
  • + " class="menu-link"> + +
    ">
    +     +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + + +
  • + + +
    ">
    +     + +
    • + + + + 0): ?> + +
  • + " class="menu-link">
    ">
    • - @@ -62,233 +523,6 @@
    diff --git a/datos web.txt b/datos web.txt index 0e3c9608..f16259d1 100644 --- a/datos web.txt +++ b/datos web.txt @@ -6,3 +6,5 @@ datos web guard: email admin: jajaime.jim@gmail.com password: 1234 +FTP SK-IMN: Kqd1s#917 +
    - id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-warning btn-edit me-1', 'data-id'=>$item->id,]); ?> + id), lang('Basic.global.edit'), ['class'=>'btn btn-sm btn-primary 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']); ?>