fastforward problem

Merge branch 'mod/presupuesto_admin' of https://git.imnavajas.es/jjimenez/safekat into mod/presupuesto_admin

ci4/app/Views/themes/vuexy/form/configuracion/maquina_tareas/editMaquinaTarea.php

@@ -9,14 +9,14 @@
 
         <div class="card card-info">
             <div class="card-header">
-                <h3 class="card-title"><?= lang('ServicioCliente.cardTitle') ?></h3>
+                <h3 class="card-title"><?= $model->name ?></h3>
             </div>
             <!--//.card-header -->
             <div class="card-body" id="serviciosClienteCard">
 
                 <?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
 
-                <?= view('themes/vuexy/components/forms/servicio_cliente', ["id" => "formServicioCliente"]); ?>
+                <?= view('themes/vuexy/components/forms/maquina_tarea', ["id" => "maquina-tarea-form", "model" => $model]); ?>
 
             </div>
             <!--//.card-body -->
@@ -31,7 +31,15 @@
 </div>
 <!--//.row -->
 <?= $this->endSection() ?>
+
+<?= $this->section('css') ?>
+<link rel="stylesheet" href="<?= site_url("themes/vuexy/vendor/libs/dropzone/dropzone.css") ?>" />
+<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/spinkit/spinkit.css') ?>" />
+<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/sweetalert2/sweetalert2.css') ?>" />
+<?= $this->endSection() ?>
+
 <?= $this->section("additionalExternalJs") ?>
-<script type="module" src="<?= site_url("assets/js/safekat/pages/configuracion/servicio_cliente/edit.js") ?>">
-</script>
+<script type="module" src="<?= site_url("assets/js/safekat/pages/configuracion/maquina_tarea/edit.js") ?>"></script>
+<script src="<?= site_url('themes/vuexy/vendor/libs/sweetalert2/sweetalert2.js') ?>"></script>
+
 <?= $this->endSection() ?>

ci4/app/Views/themes/vuexy/form/configuracion/maquina_tareas/viewMaquinaTarea.php

@@ -0,0 +1,56 @@
+<?= $this->include('themes/_commonPartialsBs/select2bs5') ?>
+<?= $this->include('themes/_commonPartialsBs/datatables') ?>
+<?= $this->include('themes/_commonPartialsBs/_confirm2delete') ?>
+<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
+
+<?= $this->section('content');  ?>
+<div class="row">
+    <div class="col-md-12">
+
+        <div class="card card-info">
+            <div class="card-header">
+                <h3 class="card-title"><?= lang('MaquinaTarea.cardTitle') ?></h3>
+            </div>
+            <!--//.card-header -->
+            <div class="card-body" id="maquinaTareaCard">
+
+                <?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
+                <div class="col-md-12 d-flex justify-content-end">
+                    <button type="button" class="btn-primary btn btn-md" id="btn-maquina-tarea-new">
+                        <i class="ti ti-plus ti-xs"></i> &nbsp; <?= lang("MaquinaTarea.tarea_new") ?>
+                    </button>
+                </div>
+                <?= view('themes/vuexy/components/tables/maquina_tarea_table', ["id" => "maquina-tarea-datatable"]); ?>
+                <div class="modal fade" id="modalNewMaquinaTarea" tabindex="-1" aria-hidden="true">
+                    <div class="modal-dialog" role="document">
+                        <div class="modal-content">
+                            <div class="modal-header">
+                                <h3><?= lang("MaquinaTarea.tarea_new") ?></h3>
+                                <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+                            </div>
+                            <div class="modal-body">
+                                <?= view('themes/vuexy/components/forms/maquina_tarea', ["id" => "maquina-tarea-form", "model" => null]); ?>
+                            </div>
+                            <div class="modal-footer">
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <!--//.card-footer -->
+        </div>
+        <!--//.card -->
+    </div>
+    <!--//.col -->
+</div>
+<!--//.row -->
+<?= $this->endSection() ?>
+<?= $this->section('css') ?>
+<link rel="stylesheet" href="<?= site_url('themes/vuexy/vendor/libs/sweetalert2/sweetalert2.css') ?>" />
+<?= $this->endSection() ?>
+<?= $this->section("additionalExternalJs") ?>
+<script type="module" src="<?= site_url("assets/js/safekat/pages/configuracion/maquina_tarea/index.js") ?>"></script>
+<script src="<?= site_url('themes/vuexy/vendor/libs/sweetalert2/sweetalert2.js') ?>"></script>
+
+<?= $this->endSection() ?>

ci4/app/Views/themes/vuexy/form/configuracion/servicios_cliente/viewServicioCliente.php

@@ -1,37 +0,0 @@
-<?= $this->include('themes/_commonPartialsBs/select2bs5') ?>
-<?= $this->include('themes/_commonPartialsBs/datatables') ?>
-<?= $this->include('themes/_commonPartialsBs/_confirm2delete') ?>
-<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
-
-<?= $this->section('content');  ?>
-<div class="row">
-    <div class="col-md-12">
-
-        <div class="card card-info">
-            <div class="card-header">
-                <h3 class="card-title"><?= lang('ServicioCliente.cardTitle') ?></h3>
-            </div>
-            <!--//.card-header -->
-            <div class="card-body" id="serviciosClienteCard">
-
-                <?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
-
-                <?= view('themes/vuexy/components/tables/servicios_cliente_table', ["id" => "tableServiciosCliente"]); ?>
-
-            </div>
-            <!--//.card-body -->
-            <div class="card-footer">
-
-            </div>
-            <!--//.card-footer -->
-        </div>
-        <!--//.card -->
-    </div>
-    <!--//.col -->
-</div>
-<!--//.row -->
-<?= $this->endSection() ?>
-<?= $this->section("additionalExternalJs") ?>
-<script type="module" src="<?= site_url("assets/js/safekat/pages/configuracion/servicio_cliente/index.js") ?>">
-</script>
-<?= $this->endSection() ?>