diff --git a/ci4/app/Controllers/Activity.php b/ci4/app/Controllers/Activity.php index 609f1c4d..41c49144 100644 --- a/ci4/app/Controllers/Activity.php +++ b/ci4/app/Controllers/Activity.php @@ -43,9 +43,7 @@ class Activity extends BaseController SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge, SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->where('auth_activity.user',$session->get('token'))->first(); $data['all'] = ""; - echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/activity/index',$data); - echo view(getenv('theme.path').'main/footer'); } public function all() @@ -79,8 +77,6 @@ class Activity extends BaseController SUM( IF( browser LIKE "%Edge%", 1, 0 ) ) AS edge, SUM( IF( browser LIKE "%Opera%", 1, 0 ) ) AS opera')->first(); $data['all'] = "/all"; - echo view(getenv('theme.path').'main/header'); echo view(getenv('theme.path').'form/activity/index',$data); - echo view(getenv('theme.path').'main/footer'); } } diff --git a/ci4/app/Controllers/Ajax.php b/ci4/app/Controllers/Ajax.php index bbe7cbb1..95250477 100644 --- a/ci4/app/Controllers/Ajax.php +++ b/ci4/app/Controllers/Ajax.php @@ -5,8 +5,8 @@ namespace App\Controllers; use App\Models\CronTabModel; use App\Models\NotificationModel; use App\Models\Usuarios\UserModel; -use App\Models\UserGroupModel; -use App\Models\GroupUserModel; +use App\Models\Usuarios\UserGroupModel; +use App\Models\Usuarios\GroupUserModel; use App\Models\ActivityModel; use CodeIgniter\RESTful\ResourceController; diff --git a/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php b/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php index 28c732ca..101941db 100644 --- a/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php +++ b/ci4/app/Controllers/Presupuestos/Presupuestomaquetacion.php @@ -13,8 +13,23 @@ class Presupuestomaquetacion extends BaseController public function index() { - echo 'Presupuesto maquetacion'; - } + echo 'Presupuesto maquetacion Todos'; + } + + public function nuevo() + { + echo 'Presupuesto maquetacion Nuevo'; + } + + public function borrador() + { + echo 'Presupuesto maquetacion Borrador'; + } + + public function aceptados() + { + echo 'Presupuesto maquetacion Aceptados'; + } public function delete() { diff --git a/ci4/app/Controllers/Servicioscompras/Compras.php b/ci4/app/Controllers/Servicios/Compras.php similarity index 77% rename from ci4/app/Controllers/Servicioscompras/Compras.php rename to ci4/app/Controllers/Servicios/Compras.php index 791aee00..27536b8f 100644 --- a/ci4/app/Controllers/Servicioscompras/Compras.php +++ b/ci4/app/Controllers/Servicios/Compras.php @@ -1,6 +1,6 @@ "Panel de control", "menu_clientes" => "Clientes", + "menu_clientes_nuevo" => "Nuevo", "menu_tarifacliente" => "Tarifas", "menu_configuration" => "Configuracion", @@ -694,6 +695,8 @@ return [ "menu_mensajes" => "Mensajes", + "menu_impresion" => "Impresion", + "menu_maquetacion" => "Maquetación", "menu_digitalizacion" => "Digitalización", @@ -735,7 +738,10 @@ return [ "menu_presupuestos" => "Presupuestos", "menu_presupuesto" => "Libros", - "menu_presupuestomaquetacion" => "Presupuestos maquetación", + "menu_presupuestomaquetacion_nuevo" => "Nuevo", + "menu_presupuestomaquetacion_todos" => "Todos", + "menu_presupuestomaquetacion_borrador" => "Borrador", + "menu_presupuestomaquetacion_aceptados" => "Aceptados", "menu_produccion" => "Producción", "menu_orden_trabajo" => "OTs", diff --git a/ci4/app/Views/themes/backend/vuexy/form/activity/index.php b/ci4/app/Views/themes/backend/vuexy/form/activity/index.php index b3625cf5..dcac76d0 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/activity/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/activity/index.php @@ -1,132 +1,136 @@ +include("themes/_commonPartialsBs/select2bs5") ?> +include("themes/_commonPartialsBs/datatables") ?> +extend('themes/backend/vuexy/main/activities_layout') ?> + +section('content'); ?> -
-
-
-
-
-

- -
-
-
-
    - - -
    2. - -
    3. - - -
-
-
-
-
+
+
+ +
+ +
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
+
-
-
- +
+
+
+
-
-
-
+
+ + +
-
-
+ +
@@ -135,8 +139,9 @@
get('dashboard')=='admin') : ?>
- " class="btn btn-lg btn-primary float-md-right"> - + " class="btn btn-primary float-md-right"> + +
@@ -162,31 +167,13 @@
+
- - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file +endSection() ?> \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/form/activity/index_bk.php b/ci4/app/Views/themes/backend/vuexy/form/activity/index_bk.php new file mode 100644 index 00000000..b3625cf5 --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/form/activity/index_bk.php @@ -0,0 +1,234 @@ + +
+
+
+
+
+

+ +
+
+
+
    + + +
    2. + +
    3. + + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+ get('dashboard')=='admin') : ?> +
+ " class="btn btn-lg btn-primary float-md-right"> + +
+ +
+
+ + + +
+ + + + + + + + + + + + +
+
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 0ad9d8f1..4bf37724 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/settings/index.php +++ b/ci4/app/Views/themes/backend/vuexy/form/settings/index.php @@ -1483,5 +1483,4 @@ } } } - endSection() ?> diff --git a/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php new file mode 100644 index 00000000..a0c8c2cb --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/activities_layout.php @@ -0,0 +1,342 @@ +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') ?> + + + + + + + + + + + +
+
+ + + + +
+ + + + + + +
+ + +
+

Activities / Access

+ + renderSection('content') ?> + +
+ + + + + + +
+
+ +
+ +
+ + +
+ + +
+
+ + +renderSection('footerAdditions') ?> + + + + + + + + + + + + +renderSection('additionalExternalJs') ?> + + + + + + + + + + + + + + diff --git a/ci4/app/Views/themes/backend/vuexy/main/all.php b/ci4/app/Views/themes/backend/vuexy/main/all.php index db682dd1..8b2aa3f7 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/all.php +++ b/ci4/app/Views/themes/backend/vuexy/main/all.php @@ -372,7 +372,7 @@ if (!empty($token) && $tfa == false) { - +
    • - +
  • diff --git a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php index ab97b7ae..c5cc93dd 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php +++ b/ci4/app/Views/themes/backend/vuexy/main/defaultlayout.php @@ -99,7 +99,7 @@ if (!empty($token) && $tfa == false) {
    - +
    @@ -139,6 +139,56 @@ if (!empty($token) && $tfa == false) {
    • + +
  • + +
    +
    +
    +
    Vistas
    +
    +
    + +
    + +
    +
    + + + + Vista + vista_impresion); ?>" class="stretched-link">Impresión +
    +
    + + + + Vista + vista_maquetacion); ?>" class="stretched-link">Maquetación +
    +
    +
    +
    + + + + Vista + vista_digitalizacion); ?>" class="stretched-link">Digitalización +
    +
    +
    +
    +
    • + +
  • - +
    @@ -139,6 +139,56 @@ if (!empty($token) && $tfa == false) {
    • + +
  • + +
    +
    +
    +
    Vistas
    +
    +
    + +
    + +
    +
    + + + + Vista + vista_impresion); ?>" class="stretched-link">Impresión +
    +
    + + + + Vista + vista_maquetacion); ?>" class="stretched-link">Maquetación +
    +
    +
    +
    + + + + Vista + vista_digitalizacion); ?>" class="stretched-link">Digitalización +
    +
    +
    +
    +
    • + +
    • - + diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_digitalizacion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_digitalizacion.php new file mode 100644 index 00000000..b12f782b --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_digitalizacion.php @@ -0,0 +1,373 @@ + + + + + \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php index 6c86e9df..60bed43b 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_impresion.php @@ -409,7 +409,7 @@ 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • @@ -418,7 +418,7 @@ 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • @@ -427,7 +427,7 @@ 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • @@ -436,7 +436,7 @@ 0): ?> 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
    • @@ -506,7 +506,7 @@ if (count(getArrayItem($menus, 'name', 'Mensajes')) > 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
     @@ -521,7 +521,7 @@ if (count(getArrayItem($menus, 'name', 'Maquetacion')) > 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
     @@ -536,7 +536,7 @@ if (count(getArrayItem($menus, 'name', 'Digitalizacion')) > 0): ?>
  • - " class="menu-link"> + " class="menu-link">
    ">
     diff --git a/ci4/app/Views/themes/backend/vuexy/main/menu_maquetacion.php b/ci4/app/Views/themes/backend/vuexy/main/menu_maquetacion.php new file mode 100644 index 00000000..484b8e6c --- /dev/null +++ b/ci4/app/Views/themes/backend/vuexy/main/menu_maquetacion.php @@ -0,0 +1,396 @@ + + + + + \ No newline at end of file diff --git a/ci4/app/Views/themes/backend/vuexy/main/selector_menu.php b/ci4/app/Views/themes/backend/vuexy/main/selector_menu.php index cf9c5158..307d016c 100644 --- a/ci4/app/Views/themes/backend/vuexy/main/selector_menu.php +++ b/ci4/app/Views/themes/backend/vuexy/main/selector_menu.php @@ -3,12 +3,20 @@ $session = session(); $viewMode = $session->get('view_mode'); -if ($viewMode == config("Basics")->vista_impresion) { +if ($viewMode == config("Basics")->vista_maquetacion) { + + include "menu_maquetacion.php"; + +} +else if ($viewMode == config("Basics")->vista_digitalizacion) { + + include "menu_digitalizacion.php"; + +} +else { include "menu_impresion.php"; -}else{ - include "menu.php"; }