diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 3f27da17..0f4b2cef 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -260,18 +260,19 @@ $routes->group('maquinaspapelesimpresion', ['namespace' => 'App\Controllers\Conf $routes->resource('maquinastarifasimpresion', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Maquinastarifasimpresion', 'except' => 'show,new,create,update']); -$routes->group('maquinadefecto', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { - $routes->get('', 'Maquinadefecto::index', ['as' => 'maquinaPorDefectoList']); - $routes->get('index', 'Maquinadefecto::index', ['as' => 'maquinaPorDefectoIndex']); - $routes->get('list', 'Maquinadefecto::index', ['as' => 'maquinaPorDefectoList2']); - $routes->get('add', 'Maquinadefecto::add', ['as' => 'newMaquinaPorDefecto']); - $routes->post('add', 'Maquinadefecto::add', ['as' => 'createMaquinaPorDefecto']); - $routes->get('edit/(:num)', 'Maquinadefecto::edit/$1', ['as' => 'editMaquinaPorDefecto']); - $routes->post('edit/(:num)', 'Maquinadefecto::edit/$1', ['as' => 'updateMaquinaPorDefecto']); - $routes->get('delete/(:num)', 'Maquinadefecto::delete/$1', ['as' => 'deleteMaquinaPorDefecto']); - $routes->post('allmenuitems', 'Maquinadefecto::allItemsSelect', ['as' => 'select2ItemsOfMaquinasPorDefecto']); - $routes->post('menuitems', 'Maquinadefecto::menuItems', ['as' => 'menuItemsOfMaquinasPorDefecto']); +$routes->group('maquinasdefecto', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { + $routes->get('', 'Maquinasdefecto::index', ['as' => 'maquinaPorDefectoList']); + $routes->get('add', 'Maquinasdefecto::add', ['as' => 'newMaquinaPorDefecto']); + $routes->post('add', 'Maquinasdefecto::add', ['as' => 'createMaquinaPorDefecto']); + $routes->post('create', 'Maquinasdefecto::create', ['as' => 'ajaxCreateMaquinaPorDefecto']); + $routes->put('(:num)/update', 'Maquinasdefecto::update/$1', ['as' => 'ajaxUpdateMaquinaPorDefecto']); + $routes->post('(:num)/edit', 'Maquinasdefecto::edit/$1', ['as' => 'updateMaquinaPorDefecto']); + $routes->post('datatable', 'Maquinasdefecto::datatable', ['as' => 'dataTableOfMaquinasPorDefecto']); + $routes->post('allmenuitems', 'Maquinasdefecto::allItemsSelect', ['as' => 'select2ItemsOfMaquinasPorDefecto']); + $routes->post('menuitems', 'Maquinasdefecto::menuItems', ['as' => 'menuItemsOfMaquinasPorDefecto']); }); +$routes->resource('maquinasdefecto', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Maquinasdefecto', 'except' => 'show,new,create,update']); + $routes->group('profile', ['namespace' => 'App\Controllers'], function ($routes) { $routes->get('', 'Profile::index', ['as' => 'profileList']); diff --git a/ci4/app/Entities/Configuracion/MaquinaDefectoEntity.php b/ci4/app/Entities/Configuracion/MaquinaDefectoEntity.php deleted file mode 100644 index b98c83ba..00000000 --- a/ci4/app/Entities/Configuracion/MaquinaDefectoEntity.php +++ /dev/null @@ -1,36 +0,0 @@ - null, - "tipo" => null, - "ancho_min" => 0.0, - "ancho_max" => 0.0, - "alto_min" => 0.0, - "alto_max" => 0.0, - "tirada_min" => 1, - "tirada_max" => 10000, - "maquina_id" => null, - "user_created_id" => 0, - "user_updated_id" => 0, - "is_deleted" => 0, - "created_at" => null, - "updated_at" => null, - ]; - protected $casts = [ - "ancho_min" => "float", - "ancho_max" => "float", - "alto_min" => "float", - "alto_max" => "float", - "tirada_min" => "int", - "tirada_max" => "int", - "maquina_id" => "int", - "user_created_id" => "int", - "user_updated_id" => "int", - "is_deleted" => "int", - ]; -} diff --git a/ci4/app/Models/Configuracion/MaquinaDefectoModel.php b/ci4/app/Models/Configuracion/MaquinaDefectoModel.php deleted file mode 100644 index 58e0fe12..00000000 --- a/ci4/app/Models/Configuracion/MaquinaDefectoModel.php +++ /dev/null @@ -1,118 +0,0 @@ - [ - "label" => "MaquinaPorDefectoes.altoMax", - "rules" => "required|decimal", - ], - "alto_min" => [ - "label" => "MaquinaPorDefectoes.altoMin", - "rules" => "required|decimal", - ], - "ancho_max" => [ - "label" => "MaquinaPorDefectoes.anchoMax", - "rules" => "required|decimal", - ], - "ancho_min" => [ - "label" => "MaquinaPorDefectoes.anchoMin", - "rules" => "required|decimal", - ], - "tipo" => [ - "label" => "MaquinaPorDefectoes.tipo", - "rules" => "required|in_list[bn,bnhq,color,portada,cubierta,rotativa]", - ], - "tirada_max" => [ - "label" => "MaquinaPorDefectoes.tiradaMax", - "rules" => "required|integer", - ], - "tirada_min" => [ - "label" => "MaquinaPorDefectoes.tiradaMin", - "rules" => "required|integer", - ], - ]; - - protected $validationMessages = [ - "alto_max" => [ - "decimal" => "MaquinaPorDefectoes.validation.alto_max.decimal", - "required" => "MaquinaPorDefectoes.validation.alto_max.required", - ], - "alto_min" => [ - "decimal" => "MaquinaPorDefectoes.validation.alto_min.decimal", - "required" => "MaquinaPorDefectoes.validation.alto_min.required", - ], - "ancho_max" => [ - "decimal" => "MaquinaPorDefectoes.validation.ancho_max.decimal", - "required" => "MaquinaPorDefectoes.validation.ancho_max.required", - ], - "ancho_min" => [ - "decimal" => "MaquinaPorDefectoes.validation.ancho_min.decimal", - "required" => "MaquinaPorDefectoes.validation.ancho_min.required", - ], - "tipo" => [ - "in_list" => "MaquinaPorDefectoes.validation.tipo.in_list", - "required" => "MaquinaPorDefectoes.validation.tipo.required", - ], - "tirada_max" => [ - "integer" => "MaquinaPorDefectoes.validation.tirada_max.integer", - "required" => "MaquinaPorDefectoes.validation.tirada_max.required", - ], - "tirada_min" => [ - "integer" => "MaquinaPorDefectoes.validation.tirada_min.integer", - "required" => "MaquinaPorDefectoes.validation.tirada_min.required", - ], - ]; - - public function findAllWithMaquinas(string $selcols = "*", int $limit = null, int $offset = 0) - { - $sql = - "SELECT t1." . - $selcols . - ", t2.nombre AS maquina FROM " . - $this->table . - " t1 LEFT JOIN lg_maquinas t2 ON t1.maquina_id = t2.id"; - if (!is_null($limit) && intval($limit) > 0) { - $sql .= " LIMIT " . $limit; - } - - if (!is_null($offset) && intval($offset) > 0) { - $sql .= " OFFSET " . $offset; - } - - $query = $this->db->query($sql); - $result = $query->getResultObject(); - return $result; - } -} diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php index aa62aae8..5693150f 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/_maquinaPorDefectoFormItems.php @@ -2,72 +2,72 @@
- +
- +
- +
- +
- +
- +
- $v) : ?> - include("Themes/_commonPartialsBs/select2bs5") ?> -extend("Themes/" . config("Basics")->theme["name"] . "/AdminLayout/defaultLayout") ?> +include("themes/_commonPartialsBs/select2bs5") ?> +include("themes/_commonPartialsBs/sweetalert") ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section("content") ?>
@@ -10,12 +11,12 @@
- + getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>
- "btn btn-secondary float-start", ]) ?> "> diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php index 0c2c4482..7d24705e 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaPorDefectoList.php @@ -1,84 +1,167 @@ -include('Themes/_commonPartialsBs/select2bs5') ?> -include('Themes/_commonPartialsBs/datatables') ?> -extend('Themes/'.config('Basics')->theme['name'].'/AdminLayout/defaultLayout') ?> +include('themes/_commonPartialsBs/select2bs5') ?> +include('themes/_commonPartialsBs/datatables') ?> +include('themes/_commonPartialsBs/sweetalert') ?> +extend('themes/backend/vuexy/main/defaultlayout') ?> section('content'); ?>
-

+

+ 'btn btn-primary float-end']); ?>
- + - +
- - - - - - - - - + + + + + + + - - - - - - - - - - - - - - -
- 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('deleteMaquinaPorDefecto', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> - - id ?> - - tipo) ?> - - ancho_min) ?> - - ancho_max) ?> - - alto_min) ?> - - alto_max) ?> - - tirada_min) ?> - - tirada_max) ?> - - maquina) ?> - - 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('deleteMaquinaPorDefecto', $item->id), 'data-bs-toggle'=>'modal', 'data-bs-target'=>'#confirm2delete']); ?> -
- 'btn btn-primary float-end']); ?> +
+endSection() ?> + + +section('additionalInlineJs') ?> + + const lastColNr = $('#tableOfMaquinaspordefecto').find("tr:first th").length - 1; + const actionBtns = function(data) { + return ` +
+ + +
+ `; + }; + theTable = $('#tableOfMaquinaspordefecto').DataTable({ + processing: true, + serverSide: true, + autoWidth: true, + responsive: true, + scrollX: true, + lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], + pageLength: 10, + lengthChange: true, + "dom": 'lfBrtip', + "buttons": [ + 'copy', 'csv', 'excel', 'print', { + extend: 'pdfHtml5', + orientation: 'landscape', + pageSize: 'A4' + } + ], + stateSave: true, + order: [[1, 'asc']], + language: { + url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" + }, + ajax : $.fn.dataTable.pipeline( { + url: '', + method: 'POST', + headers: {'X-Requested-With': 'XMLHttpRequest'}, + async: true, + }), + columnDefs: [ + { + orderable: false, + searchable: false, + targets: [lastColNr] + } + ], + columns : [ + { 'data': 'tipo', "render": function ( data, type, row, meta ) { + if(data=='bn') + return ''; + else if(data=='bnhq') + return ''; + else if(data=='color') + return ''; + else if(data=='cubierta') + return ''; + else if(data=='portada') + return ''; + else if(data=='rotativa') + return ''; + } + }, + { 'data': 'maquina' }, + { 'data': 'ancho_min' }, + { 'data': 'ancho_max' }, + { 'data': 'alto_min' }, + { 'data': 'alto_max' }, + { 'data': 'tirada_min' }, + { 'data': 'tirada_max' }, + { 'data': actionBtns } + ] + }); + + + + +$(document).on('click', '.btn-edit', function(e) { + window.location.href = `configuracion/maquinasdefecto/edit/${$(this).attr('data-id')}`; + }); + +$(document).on('click', '.btn-delete', function(e) { + Swal.fire({ + title: '', + text: '', + icon: 'warning', + showCancelButton: true, + confirmButtonColor: '#3085d6', + confirmButtonText: '', + cancelButtonText: '', + cancelButtonColor: '#d33' + }) + .then((result) => { + const dataId = $(this).data('id'); + const row = $(this).closest('tr'); + if (result.value) { + $.ajax({ + url: `/${dataId}`, + method: 'DELETE', + }).done((data, textStatus, jqXHR) => { + Toast.fire({ + icon: 'success', + title: data.msg ?? jqXHR.statusText, + }); + + theTable.clearPipeline(); + theTable.row($(row)).invalidate().draw(); + }).fail((jqXHR, textStatus, errorThrown) => { + Toast.fire({ + icon: 'error', + title: jqXHR.responseJSON.messages.error, + }); + }) + } + }); + }); + + + + endSection() ?> @@ -100,39 +183,3 @@ endSection() ?> -section('additionalInlineJs') ?> - - const lastColNr2 = $(".using-exportable-data-table").find("tr:first th").length - 1; - theTable = $('.using-exportable-data-table').DataTable({ - "responsive": true, - "paging": true, - "lengthMenu": [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - "pageLength": 10, - "lengthChange": true, - "searching": true, - "ordering": true, - "info": true, - "dom": 'lfrtipB', // 'lfBrtip', // you can try different layout combinations by uncommenting one or the other - // "dom": '<"top"lf><"clear">rt<"bottom"ipB><"clear">', // remember to comment this line if you uncomment the above - "buttons": [ - 'copy', 'csv', 'excel', 'print', { - extend: 'pdfHtml5', - orientation: 'landscape', - pageSize: 'A4' - } - ], - "autoWidth": true, - "scrollX": true, - "stateSave": true, - "language": { - url: "/assets/dt/languages[$currentLocale] ?? config('Basics')->i18n ?>.json" - }, - "columnDefs": [ - { - orderable: false, - searchable: false, - targets: [0,lastColNr2] - } - ] - }); -endSection() ?> \ No newline at end of file