From 9d6e3822e88ab952b9aed354e358ad1f9747979f Mon Sep 17 00:00:00 2001 From: Jaime Jimenez Date: Fri, 28 Jul 2023 17:26:16 +0200 Subject: [PATCH] rehecho papeles impresion. Lista de tarifas a 50 elementos por defecto --- ci4/app/Config/Routes.php | 5 +- .../Maquinaspapelesimpresion.php | 36 + .../Configuracion/Papelesimpresion.php | 128 ++-- .../Papelimpresiontipologias.php | 96 +++ ci4/app/Filters/LoginAuthFilter.php | 3 +- ci4/app/Language/en/ImpresionTipologias.php | 28 +- ci4/app/Language/en/PapelImpresion.php | 3 + ci4/app/Language/es/ImpresionTipologias.php | 28 +- ci4/app/Language/es/PapelImpresion.php | 3 + ci4/app/Models/Configuracion/MaquinaModel.php | 13 + .../MaquinasPapelesImpresionModel.php | 74 +++ .../MaquinasTarifasImpresionModel.php | 1 + .../Configuracion/PapelImpresionModel.php | 4 +- .../PapelImpresionTipologiaModel.php | 27 + .../papel/_papelImpresionFormItems.php | 43 +- .../papel/viewPapelImpresionForm.php | 626 +++++++++--------- .../tarifas/acabado/viewTarifaAcabadoList.php | 2 +- .../viewTarifaEncuadernacionList.php | 2 +- .../manipulado/viewTarifaManipuladoList.php | 2 +- .../viewTarifapreimpresionList.php | 2 +- .../vuexy/vendor/editor.bootstrap5.min.css | 1 + 21 files changed, 678 insertions(+), 449 deletions(-) create mode 100644 httpdocs/themes/vuexy/vendor/editor.bootstrap5.min.css diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index 015360fc..5f34cb4b 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -184,8 +184,6 @@ $routes->group('papelesimpresion', ['namespace' => 'App\Controllers\Configuracio $routes->put('(:num)/update', 'Papelesimpresion::update/$1', ['as' => 'ajaxUpdatePapelImpresion']); $routes->post('edit/(:num)', 'Papelesimpresion::edit/$1', ['as' => 'updatePapelImpresion']); $routes->post('datatable', 'Papelesimpresion::datatable', ['as' => 'dataTableOfPapelesImpresion']); - $routes->post('datatable_editor', 'Papelesimpresion::datatable_editor', ['as' => 'dataTableEditor']); - $routes->post('fetch_single_data', 'Papelesimpresion::fetch_single_data', ['as' => 'fetchTipologia']); $routes->post('allmenuitems', 'Papelesimpresion::allItemsSelect', ['as' => 'select2ItemsOfPapelesImpresion']); $routes->post('menuitems', 'Papelesimpresion::menuItems', ['as' => 'menuItemsOfPapelesImpresion']); }); @@ -194,6 +192,7 @@ $routes->resource('papelesimpresion', ['namespace' => 'App\Controllers\Configur $routes->group('papelimpresiontipologias', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { $routes->get('add', 'Papelimpresiontipologias::add', ['as' => 'newPapelImpresionTipologia']); $routes->post('add', 'Papelimpresiontipologias::add', ['as' => 'createPapelImpresionTipologia']); + $routes->post('datatable_editor', 'Papelimpresiontipologias::datatable_editor', ['as' => 'editorOfConsumoTintas']); $routes->get('edit/(:num)', 'Papelimpresiontipologias::edit/$1', ['as' => 'editPapelImpresionTipologia']); $routes->post('edit/(:num)', 'Papelimpresiontipologias::edit/$1', ['as' => 'updatePapelImpresionTipologia']); $routes->get('delete/(:num)', 'Papelimpresiontipologias::delete/$1', ['as' => 'deletePapelImpresionTipologia']); @@ -245,7 +244,9 @@ $routes->resource('maquinastarifasimpresion', ['namespace' => 'App\Controllers\ $routes->group('maquinaspapelesimpresion', ['namespace' => 'App\Controllers\Configuracion'], function ($routes) { $routes->post('datatable', 'Maquinaspapelesimpresion::datatable', ['as' => 'dataTableOfMaquinasPapelesImpresion']); + $routes->post('datatable_2', 'Maquinaspapelesimpresion::datatable_2', ['as' => 'dataTableOfPapelesImpresionMaquinas']); $routes->post('datatable_editor', 'Maquinaspapelesimpresion::datatable_editor', ['as' => 'editorOfMaquinasPapelImpresion']); + $routes->post('datatable_editor_2', 'Maquinaspapelesimpresion::datatable_editor_2', ['as' => 'editorOfPapelImpresionMaquinas']); $routes->post('updateTableOnChange', 'Maquinaspapelesimpresion::updateTableOnChange', ['as' => 'updateMaquinaPapelOnTarifasChange']); }); $routes->resource('maquinastarifasimpresion', ['namespace' => 'App\Controllers\Configuracion', 'controller' => 'Maquinastarifasimpresion', 'except' => 'show,new,create,update']); diff --git a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php index c7202768..c4997434 100644 --- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php @@ -100,6 +100,42 @@ class Maquinaspapelesimpresion extends \App\Controllers\GoBaseResourceController } } + public function datatable_2() { + if ($this->request->isAJAX()) { + + // modelos usados + $tarifa_model = new MaquinasTarifasImpresionModel(); + + $reqData = $this->request->getPost(); + if (!isset($reqData['draw']) || !isset($reqData['columns']) ) { + $errstr = 'No data available in response to this specific request.'; + $response = $this->respond(Collection::datatable( [], 0, 0, $errstr ), 400, $errstr); + return $response; + } + $start = $reqData['start'] ?? 0; + $length = $reqData['length'] ?? 5; + $search = $reqData['search']['value']; + $requestedOrder = $reqData['order']['0']['column'] ?? 1; + $order = MaquinasPapelesImpresionModel::SORTABLE_2[$requestedOrder >= 0 ? $requestedOrder : 1]; + $dir = $reqData['order']['0']['dir'] ?? 'asc'; + + $papel_id = $reqData['papel_id'] ?? -1; + $ancho = $reqData['ancho'] ?? -1; + $alto = $reqData['alto'] ?? -1; + $isRotativa = $reqData['isRotativa'] ?? -1; + + $resourceData = $this->model->getResource_maquinas($search, $papel_id, $isRotativa, $ancho, $alto)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); + + return $this->respond(Collection::datatable( + $resourceData, + $this->model->getResource_maquinas()->countAllResults(), + $this->model->getResource_maquinas($search, $papel_id, $isRotativa, $ancho, $alto)->countAllResults() + )); + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + public function updateTableOnChange(){ if ($this->request->isAJAX()) { diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 05143b21..7c0477ec 100644 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -32,6 +32,8 @@ use App\Models\Configuracion\PapelImpresionModel; use App\Models\Configuracion\PapelGenericoModel; use App\Models\Configuracion\PapelImpresionTipologiaModel; +use App\Models\Configuracion\MaquinasPapelesImpresionModel; +use App\Models\Configuracion\MaquinaModel; class Papelesimpresion extends \App\Controllers\GoBaseResourceController @@ -56,6 +58,8 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController $this->viewData['pageTitle'] = lang('PapelImpresion.moduleTitle'); $this->viewData['usingSweetAlert'] = true; + $this->viewData = ['usingServerSideDataTable' => true]; // JJO + // Se indica que este controlador trabaja con soft_delete $this->soft_delete = true; // Se indica el flag para los ficheros borrados @@ -92,14 +96,11 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController public function add() { - - - $requestMethod = $this->request->getMethod(); if ($requestMethod === 'post') : - $nullIfEmpty = true; // !(phpversion() >= '8.1'); + $nullIfEmpty = false; // !(phpversion() >= '8.1'); $postData = $this->request->getPost(); @@ -134,7 +135,8 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController if ($thenRedirect) : if (!empty($this->indexRoute)) : - return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message); + return redirect()->to(site_url('/configuracion/papelesimpresion/edit/' . $id))->with('sweet-success', $message); + //return redirect()->to(route_to($this->indexRoute))->with('sweet-success', $message); else : return $this->redirect2listView('sweet-success', $message); endif; @@ -206,8 +208,18 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController $sanitizedData['rotativa'] = false; } + // Hay que asegurarse de que se quitan los consumos de tintas de rotativa + // en caso de que se haya deseleccionado la opción rotativa + if(!$sanitizedData['rotativa']){ + $this->tpModel->removeForPapelImpresion($id); + } + // Si hay máquinas seleccionadas, hay que guardar las que cumplan las nuevas condiciones + // y borrar el resto + $this->updateMaquinas($id, $sanitizedData); + + $noException = true; if ($successfulResult = $this->canValidate()) : // if ($successfulResult = $this->validate($this->formValidationRules) ) : @@ -228,7 +240,7 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController $papelImpresion->fill($sanitizedData); - $thenRedirect = true; + $thenRedirect = false; endif; if ($noException && $successfulResult) : $id = $papelImpresion->id ?? $id; @@ -297,12 +309,22 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController $length = $reqData['length'] ?? 5; $search = $reqData['search']['value']; $requestedOrder = $reqData['order']['0']['column'] ?? 1; - $order = PapelImpresionModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1]; + $requestedOrder2 = $reqData['order']['1']['column'] ?? $requestedOrder; + $requestedOrder3 = $reqData['order']['2']['column'] ?? $requestedOrder; + $requestedOrder4 = $reqData['order']['3']['column'] ?? $requestedOrder; + $order = PapelImpresionModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0]; + $order2 = PapelImpresionModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : 0]; + $order3 = PapelImpresionModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : 0]; + $order4 = PapelImpresionModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder4 : 0]; $dir = $reqData['order']['0']['dir'] ?? 'asc'; + $dir2 = $reqData['order']['1']['dir'] ?? $dir; + $dir3 = $reqData['order']['2']['dir'] ?? $dir; + $dir4 = $reqData['order']['3']['dir'] ?? $dir; if($id_PG<0){ - $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); + $resourceData = $this->model->getResource($search)->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3) + ->orderBy($order4, $dir4)->limit($length, $start)->get()->getResultObject(); return $this->respond(Collection::datatable( $resourceData, @@ -325,58 +347,6 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController } - public function datatable_editor(){ - /*if ($this->request->isAJAX()) { - - $reqData = $this->request->getPost(); - $rows_id = array_keys($reqData['data']); - echo '
' ;
-            var_dump($reqData['data'][$keys[0]])  ;
-            echo '
'; - }*/ - - if ($this->request->isAJAX()) { - - $sql_details = array( - "type" => "Mysql", // Database type: "Mysql", "Postgres", "Sqlserver", "Sqlite" or "Oracle" - "user" => "sk_jjo", // Database user name - "pass" => "61tv&G1Zf^XY", // Database password - "host" => "localhost", // Database host - "port" => "", // Database connection port (can be left empty for default) - "db" => "sk_jjo", // Database name - "dsn" => "", // PHP DSN extra information. Set as `charset=utf8mb4` if you are using MySQL - "pdoAttr" => array() // PHP PDO attributes array. See the PHP documentation for all options - ); - - $db = new Database( array( - "type" => "Mysql", - "pdo" => $sql_details - ) ); - - - // Build our Editor instance and process the data coming from _POST - Editor::inst( $db, 'lg_papel_impresion_tipologias' ) - ->fields( - Field::inst( 'tipo' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ),//->validator( Validate::values( array('negro', 'color', 'bicolor') ) ), - Field::inst( 'negro' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - Field::inst( 'cyan' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - Field::inst( 'magenta' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - Field::inst( 'amarillo' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - Field::inst( 'gota_negro' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - Field::inst( 'got_color' ), - //->validator( Validate::notEmpty( ValidateOptions::inst()) ), - ) - ->process( $_POST ) - ->json(); - } - } - public function allItemsSelect() { @@ -428,24 +398,7 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController } } - function fetch_single_data() - { - if ($this->request->isAJAX()) { - $reqData = $this->request->getPost(); - if(isset($reqData['id'])) - { - $newTokenHash = csrf_hash(); - $csrfTokenName = csrf_token(); - - $data = [ - 'data' => $this->tpModel->getResource($reqData['id'])->get()->getResultObject()[0], - $csrfTokenName => $newTokenHash - ]; - echo json_encode($data); - } - } - } - + protected function getPapelGenericoListItems($selId = null) { @@ -460,4 +413,23 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController endif; return $data; } + + private function updateMaquinas($id, $data){ + + $ma_model = new MaquinaModel(); + $ma_pa_model = new MaquinasPapelesImpresionModel(); + + $active_values = $ma_pa_model->getInitSelectedMachines($id, $data['rotativa'], $data['ancho'], $data['alto'])->get()->getResult('array'); + + $ma_pa_model->deleteForPapelImpresion($id); + + // Se obtienen las máquinas que cumplen las condiciones + $rows = $ma_model->getIdMaquinasForPapelImpresion($id, $data['rotativa'], $data['ancho'], $data['alto'])->get()->getResult('array'); + $ma_pa_model->insertRows($rows); + + // Se actualizan los activos que había en caso de que los hubiera + if(count($active_values)>0){ + $ma_pa_model->updateRows($active_values); + } + } } diff --git a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php index b9163562..2f2d87fe 100644 --- a/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php +++ b/ci4/app/Controllers/Configuracion/Papelimpresiontipologias.php @@ -11,6 +11,18 @@ use App\Models\Configuracion\PapelImpresionTipologiaModel; use App\Models\Configuracion\PapelImpresionModel; +use + DataTables\Editor, + DataTables\Database, + DataTables\Editor\Field, + DataTables\Editor\Format, + DataTables\Editor\Mjoin, + DataTables\Editor\Options, + DataTables\Editor\Upload, + DataTables\Editor\Validate, + DataTables\Editor\ValidateOptions; + + class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController { protected $modelName = PapelImpresionTipologiaModel::class; @@ -221,6 +233,90 @@ class Papelimpresiontipologias extends \App\Controllers\GoBaseResourceController } // end function edit(...) + public function datatable_editor() { + if ($this->request->isAJAX()) { + + include(APPPATH . "ThirdParty/DatatablesEditor/DataTables.php"); + + // Build our Editor instance and process the data coming from _POST + $response = Editor::inst( $db, 'lg_papel_impresion_tipologias' ) + ->fields( + Field::inst( 'tipo' ) + ->validator( Validate::values( array('negro', 'color', 'bicolor') ) ), + Field::inst( 'negro' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.negro.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.negro.required') ) + ), + Field::inst( 'cyan' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.cyan.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.cyan.required') ) + ), + Field::inst( 'magenta' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.magenta.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.magenta.required') ) + ), + Field::inst( 'amarillo' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.amarillo.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.amarillo.required') ) + ), + Field::inst( 'gota_negro' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.gota_negro.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.gota_negro.required') ) + ), + Field::inst( 'gota_color' ) + ->validator( 'Validate::numeric', array( + 'message' => lang('ImpresionTipologias.validation.gota_color.decimal') ) + ) + ->validator( 'Validate::notEmpty',array( + 'message' => lang('ImpresionTipologias.validation.gota_color.required') ) + ), + Field::inst( 'papel_impresion_id' ), + + ) + ->validator( function($editor, $action, $data){ + if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){ + foreach ($data['data'] as $pkey => $values ){ + $process_data['tipo'] = $data['data'][$pkey]['tipo']; + $process_data['papel_impresion_id'] = $data['data'][$pkey]['papel_impresion_id']; + $response = $this->model->checkTipo($process_data, $pkey); + // No se pueden duplicar valores al crear o al editar + if (!empty($response)){ + return $response; + } + } + } + }) + ->debug(true) + ->process( $_POST ) + ->data(); + + $newTokenHash = csrf_hash(); + $csrfTokenName = csrf_token(); + + $response[$csrfTokenName] = $newTokenHash; + + echo json_encode($response); + + } else { + return $this->failUnauthorized('Invalid request', 403); + } + } + public function datatable() { if ($this->request->isAJAX()) { diff --git a/ci4/app/Filters/LoginAuthFilter.php b/ci4/app/Filters/LoginAuthFilter.php index a5be0f94..9be92731 100644 --- a/ci4/app/Filters/LoginAuthFilter.php +++ b/ci4/app/Filters/LoginAuthFilter.php @@ -182,7 +182,8 @@ class LoginAuthFilter implements FilterInterface 'menuItems', 'datatable', 'datatable_editor', - 'fetch_single_data', + 'datatable_2', + 'datatable_editor_2', 'collect', 'cast', ]; diff --git a/ci4/app/Language/en/ImpresionTipologias.php b/ci4/app/Language/en/ImpresionTipologias.php index 44c14d23..79a0b197 100644 --- a/ci4/app/Language/en/ImpresionTipologias.php +++ b/ci4/app/Language/en/ImpresionTipologias.php @@ -14,45 +14,45 @@ return [ 'tipo' => 'Type', 'errorTipo' => 'Typology type already exists', 'validation' => [ + 'error_tipo_duplicado' => 'The \'Type\' selected already exists', 'amarillo' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'cyan' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'gota_color' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'gota_negro' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'magenta' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'negro' => [ - 'decimal' => 'The {field} field must contain a decimal number.', - 'required' => 'The {field} field is required.', + 'decimal' => 'The field must contain a decimal number.', + 'required' => 'The field is required.', ], 'tipo' => [ - 'in_list' => 'The {field} field must be one of: {param}.', - 'required' => 'The {field} field is required.', + 'required' => 'The field is required.', ], diff --git a/ci4/app/Language/en/PapelImpresion.php b/ci4/app/Language/en/PapelImpresion.php index 605450be..40e9a97d 100644 --- a/ci4/app/Language/en/PapelImpresion.php +++ b/ci4/app/Language/en/PapelImpresion.php @@ -35,6 +35,9 @@ return [ 'userUpdateId' => 'User Update ID', 'consumo_tintas_rotativas' => 'Rotary ink consumption', + 'maquinas_papel' => 'Selected machines', + 'sureToChangeRotativaTitle' => 'Are you sure to change this option?', + 'sureToChangeRotativaText' => 'This operation can\'t undone, the machines list and the rotary ink consumption will change.', 'validation' => [ 'espesor_update' => [ diff --git a/ci4/app/Language/es/ImpresionTipologias.php b/ci4/app/Language/es/ImpresionTipologias.php index 851b4ef9..57a37faa 100644 --- a/ci4/app/Language/es/ImpresionTipologias.php +++ b/ci4/app/Language/es/ImpresionTipologias.php @@ -15,45 +15,45 @@ return [ 'tipo' => 'Tipo', 'errorTipo' => 'El tipo de tipología ya existe', 'validation' => [ + 'error_tipo_duplicado' => 'El \'Tipo\' seleccionado ya existe', 'amarillo' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'cyan' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'gota_color' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'gota_negro' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'magenta' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'negro' => [ - 'decimal' => 'El campo {field} debe ser un número entero.', - 'required' => 'El campo {field} es obligatorio.', + 'decimal' => 'El campo debe ser un número entero.', + 'required' => 'El campo es obligatorio.', ], 'tipo' => [ - 'in_list' => 'El campo {field} debe ser uno de: {param}.', - 'required' => 'El campo {field} es obligatorio.', + 'required' => 'El campo es obligatorio.', ], diff --git a/ci4/app/Language/es/PapelImpresion.php b/ci4/app/Language/es/PapelImpresion.php index 3dedc346..42bb8ad0 100644 --- a/ci4/app/Language/es/PapelImpresion.php +++ b/ci4/app/Language/es/PapelImpresion.php @@ -35,6 +35,9 @@ return [ 'userUpdateId' => 'ID usuario actualización', 'consumo_tintas_rotativas' => 'Consumo tintas rotativas', + 'maquinas_papel' => 'Máquinas seleccionadas', + 'sureToChangeRotativaTitle' => 'Está seguro de cambiar esta opción?', + 'sureToChangeRotativaText' => 'Está operación no se puede deshacer, cambiará la lista de máquinas y el consumo de tintas.', 'validation' => [ 'espesor_update' => [ diff --git a/ci4/app/Models/Configuracion/MaquinaModel.php b/ci4/app/Models/Configuracion/MaquinaModel.php index fb17d42e..863225f3 100644 --- a/ci4/app/Models/Configuracion/MaquinaModel.php +++ b/ci4/app/Models/Configuracion/MaquinaModel.php @@ -252,6 +252,19 @@ class MaquinaModel extends \App\Models\GoBaseModel return $result; } + public function getIdMaquinasForPapelImpresion($papel_impresion_id, $rotativa, $ancho, $alto){ + $builder = $this->db + ->table($this->table . " t1") + ->select( + "'".$papel_impresion_id."'". " as papel_impresion_id, t1.id AS maquina_id, '0' as active" + ); + $builder->where("t1.is_rotativa", $rotativa); + $builder->where("t1.ancho >", $ancho); + $builder->where("t1.alto >", $alto); + + return $builder; + } + /** * Get resource data. * diff --git a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php index 81b5e042..1b4c6b7b 100644 --- a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php @@ -26,6 +26,12 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel 8 => "t3.rotativa", ]; + const SORTABLE_2 = [ + 0 => "t1.active", + 1 => "t2.nombre", + + ]; + protected $allowedFields = ["maquina_id", "papel_impresion_id", "active"]; protected $returnType = "App\Entities\Configuracion\MaquinasPapelesImpresionEntity"; @@ -99,6 +105,42 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel ->groupEnd(); } + /** + * Get resource data for Papeles impresion. + * + * @param string $search + * + * @return \CodeIgniter\Database\BaseBuilder + */ + public function getResource_maquinas(string $search = "", $papel_id = -1, $isRotativa = -1, $ancho =-1, $alto = -1) + { + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.maquina_id AS maquina_id, t1.papel_impresion_id AS papel_impresion_id, t1.active AS active, t2.nombre AS maquina, + t2.ancho AS ancho, t2.alto AS alto, t2.ancho_impresion AS anchoimpresion, t2.alto_impresion AS altoimpresion" + ) + ->join("lg_maquinas t2", "t1.maquina_id = t2.id", "left") + ->join("lg_papel_impresion t3", "t1.papel_impresion_id = t3.id", "left"); + + $builder->where("t1.papel_impresion_id", $papel_id); + $builder->where("t2.is_deleted", 0); + $builder->where("t2.is_rotativa", $isRotativa); + $builder->where("t2.ancho >", $ancho); + $builder->where("t2.alto >", $alto); + $builder->where("t3.is_deleted", 0); + $builder->where("t3.isActivo", 1); + + + return empty($search) + ? $builder + : $builder + ->groupStart() + ->like("t2.nombre", $search) + ->groupEnd(); + } + + public function getInitData($isRotativa = 0, $tarifas = [], $maquina_id = -1) { $builder = $this->db @@ -148,6 +190,38 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel return $builder; } + + // Funcion para obtener todas las máquinas seleccionadas para un papel + public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa, $ancho, $alto) + { + $builder = $this->db + ->table($this->table . " t1") + ->select( + "t1.*" + ); + + $builder->join("lg_maquinas t2", "t1.maquina_id = t2.id", "left"); + + $builder->where("t1.papel_impresion_id", $papel_impresion_id); + $builder->where("t1.active", 1); + + // Se aplican las condiciones que tienen que cumplir + $builder->where("t2.is_rotativa", $isRotativa); + $builder->where("t2.ancho >", $ancho); + $builder->where("t2.alto >", $alto); + + return $builder; + } + + // Borrar todas las filas para un papel impresion determinado + public function deleteForPapelImpresion($papel_impresion_id= -1){ + $this->db + ->table($this->table . " t1") + ->where("papel_impresion_id", $papel_impresion_id) + ->delete(); + } + + // Funcion para consultar los papeles activos con un gramaje // determinado seleccionados para una máquina public function getPapelActivo($maquina_id=-1, $gramaje=-1){ diff --git a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php index baa68e59..f95608f9 100644 --- a/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasTarifasImpresionModel.php @@ -59,6 +59,7 @@ class MaquinasTarifasImpresionModel extends \App\Models\GoBaseModel ], ]; + public function findAllWithMaquinas(string $selcols = "*", int $limit = null, int $offset = 0) { $sql = diff --git a/ci4/app/Models/Configuracion/PapelImpresionModel.php b/ci4/app/Models/Configuracion/PapelImpresionModel.php index f1ec4025..b145d8f5 100644 --- a/ci4/app/Models/Configuracion/PapelImpresionModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionModel.php @@ -15,8 +15,8 @@ class PapelImpresionModel extends \App\Models\GoBaseModel const SORTABLE = [ 0 => "t1.nombre", 1 => "t2.nombre", - 2 => "t1.bn", - 3 => "t1.gramaje", + 2 => "t1.gramaje", + 3 => "t1.bn", 4 => "t1.color", 5 => "t1.cubierta", 6 => "t1.sobrecubierta", diff --git a/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php b/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php index 857ac5a1..9b58dfe8 100644 --- a/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php +++ b/ci4/app/Models/Configuracion/PapelImpresionTipologiaModel.php @@ -121,6 +121,14 @@ class PapelImpresionTipologiaModel extends \App\Models\GoBaseModel } + public function removeForPapelImpresion($papel_impresion_id){ + $builder = $this->db + ->table($this->table . " t1") + ->where('papel_impresion_id', $papel_impresion_id) + ->delete(); + + } + public function getResource($id) { $builder = $this->db @@ -131,4 +139,23 @@ class PapelImpresionTipologiaModel extends \App\Models\GoBaseModel return $builder; } + + public function checkTipo($data, $id){ + + $builder = $this->db + ->table($this->table) + ->select("id") + ->where("papel_impresion_id", $data["papel_impresion_id"]) + ->where("tipo", $data["tipo"]); + + + if ($builder->countAllResults() > 0){ + if($builder->get()->getResultObject()[0]->id!=$id){ + return lang('ImpresionTipologias.validation.error_tipo_duplicado'); + } + } + + + return ""; + } } diff --git a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php index 9b8d71cb..e15d47aa 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php +++ b/ci4/app/Views/themes/backend/vuexy/form/configuracion/papel/_papelImpresionFormItems.php @@ -30,18 +30,21 @@
-
+ +
+ +
-
- - -
+ +
@@ -86,6 +89,8 @@
+ +
-
-
- -
+ +
+ + - endSection() ?> @@ -206,15 +126,84 @@ const lastColNr = $('#tableOfPapelimpresiontipologias').find("tr:first th").length - 1; const actionBtns = function(data) { - return `
- - -
`; + return ` + + + + `; }; if(url_parts[url_parts.length-2] == 'edit'){ + tipoTypes = [ + {label:'', value:'negro'}, + {label:'', value: 'color'}, + {label:'', value: 'bicolor'} + ]; + editor = new $.fn.dataTable.Editor( { + ajax: { + url: "", + headers: { + : v, + }, + }, + table : "#tableOfPapelimpresiontipologias", + idSrc: 'id', + fields: [ { + name: "tipo", + type: "select", + options: tipoTypes + }, { + name: "negro", + attr: { + type: "number" + } + },{ + name: "cyan", + attr: { + type: "number" + } + },{ + name: "magenta", + attr: { + type: "number" + } + },{ + name: "amarillo", + attr: { + type: "number" + } + },{ + name: "gota_negro", + attr: { + type: "number" + } + },{ + name: "gota_color", + attr: { + type: "number" + } + }, { + "name": "papel_impresion_id", + "type": "hidden" + } + ] + } ); + + + editor.on( 'initCreate', function () { + if ($('#tableOfPapelimpresiontipologias').DataTable().data().count() >= 3){ + Swal.fire({ + title: '', + icon: 'info', + confirmButtonColor: '#3085d6', + confirmButtonText: '', + + }); + } + } ); + theTable = $('#tableOfPapelimpresiontipologias').DataTable({ processing: true, serverSide: true, @@ -224,10 +213,9 @@ lengthMenu: [ 5], pageLength: 5, lengthChange: false, - searching: false, - //paging: false, + searching: false, info: false, - "dom": 'lrt', + "dom": '<"mt-4"><"float-end"B><"float-start"l><"mt-4 mb-3"p>', stateSave: true, language: { url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" @@ -242,237 +230,96 @@ async: true, }), columns : [ - { 'data': 'tipo' }, + { 'data': 'tipo', "render": function ( data, type, row, meta ) { + if(data=='negro') + return ''; + else if (data=='color') + return ''; + else if (data=='bicolor') + return ''; + } + }, { 'data': 'negro' }, { 'data': 'cyan' }, { 'data': 'magenta' }, { 'data': 'amarillo' }, { 'data': 'gota_negro' }, { 'data': 'gota_color' }, - { data: actionBtns} - ] + { data: actionBtns, + className: 'row-edit dt-center'} + ], + buttons: [ { + className: 'btn btn-primary float-end me-sm-3 me-1', + extend: "createInline", + editor: editor, + formOptions: { + submitTrigger: -1, + submitHtml: '' + } + } ] }); + // Activate an inline edit on click of a table cell + $(document).on('click', '.btn-edit', function(e) { + editor.inline( + theTable.cells(this.parentNode.parentNode.parentNode, '*').nodes(), + { + cancelHtml: '', + cancelTrigger: 'span.cancel', + submitHtml: '', + submitTrigger: 'span.edit', + submit: 'allIfChanged' + } + ); + } ); - } - // Add new tipología - $('#newTipologia').on("click", function(e) { - if ($('#tableOfPapelimpresiontipologias').DataTable().data().count() >= 3){ - Swal.fire({ - title: '', - icon: 'info', - confirmButtonColor: '#3085d6', - confirmButtonText: '', - - }); - } - else{ - $('#tipologiaTipo').attr('disabled', false); - $('#tipologiaTipo').val(""); - $('#negro').val("0.00"); - $('#cyan').val("0.00"); - $('#magenta').val("0.00"); - $('#amarillo').val("0.00"); - $('#gotaNegro').val("0.00"); - $('#gotaColor').val("0.00"); - - $('#action').val('add'); - $('.modal-title').text('' + ' ' + ''); - $('#submit_button').val(''); - - - $('#tipologiaModal').modal('show'); - - $('#hidden_id').val(""); - } - - }); - - $('#rotativa').on("click",function(el){ - if(!$(this).is(':checked')){ - Swal.fire({ - title: '', - text: '', - icon: 'warning', - showCancelButton: true, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - cancelButtonText: '', - cancelButtonColor: '#d33' - }) - .then((result) => { - if (result.value) { - if($(this).is(':checked')){ - $("#accordionTipologias").show(); - }else{ - $("#accordionTipologias").hide(); - } + + editor.on( 'preSubmit', function ( e, d, type ) { + if ( type === 'create'){ + d.data[0]['papel_impresion_id'] = id; + } + else if(type === 'edit' ) { + for (v in d.data){ + d.data[v]['papel_impresion_id'] = id; } - else{ - $(this).prop('checked', true) ; - - } - }); - } - else{ - $("#accordionTipologias").show(); - } - }); + } + }); - $('#tipologiaModal').on('submit', function(event){ + editor.on( 'postSubmit', function ( e, json, data, action ) { - event.preventDefault(); - - const tipo_values = $('#tableOfPapelimpresiontipologias').DataTable().column().data().toArray(); - - if(tipo_values.includes($('#tipologiaTipo').val()) && $('#action').val() == 'add'){ - $('#tipologiaModal').modal('hide'); - Swal.fire({ - title: '', - text: '', - icon: 'error', - showCancelButton: false, - confirmButtonColor: '#3085d6', - confirmButtonText: '', - }) - } - else - { - var formData = { - : v, - papel_impresion_id: id, - tipo: $('#tipologiaTipo').val(), - negro: $('#negro').val(), - cyan: $('#cyan').val(), - magenta: $('#magenta').val(), - amarillo: $('#amarillo').val(), - gota_negro: $('#gotaNegro').val(), - gota_color: $('#gotaColor').val() - } + yeniden(json.); + }); - if( $('#action').val() == 'edit') - { - var url_to_go = "/configuracion/papelimpresiontipologias/edit/" + $('#hidden_id').val(); - formData['id']= $('#hidden_id').val(); - } - else - { - var url_to_go = ""; - } + editor.on( 'submitSuccess', function ( e, json, data, action ) { + theTable.clearPipeline(); + theTable.draw(); + }); - $.ajax({ - url: url_to_go, - method:"POST", - data: formData, - dataType:"JSON", - encode: true, + $(document).on('click', '.btn-delete', function(e) { + $(".btn-remove").attr('data-id', $(this).attr('data-id')); + }); - }).done((data, textStatus, jqXHR) => { - $('#tipologiaModal').modal('hide') ; - yeniden(data.); - - theTable.clearPipeline(); - theTable.draw(); - Toast.fire({ - icon: 'success', - title: data.msg ?? jqXHR.statusText, - }); - - - }).fail((jqXHR, textStatus, errorThrown) => { - $('#tipologiaModal').modal('hide') ; - - Toast.fire({ - icon: 'error', - title: jqXHR.responseJSON.messages.error, - }); - }) - } - }); - - // Activate an inline edit on click of a table cell - $(document).on('click', '.btn-edit', function(e) { - - var id = $(this).attr('data-id'); - - $.ajax({ - - url:"", - - - method:"POST", - - data:{id:id, - : v}, - - dataType:'JSON', - - success:function(response) - { - yeniden(response.); - $('#tipologiaTipo').val(response.data.tipo); - $('#negro').val(response.data.negro); - $('#cyan').val(response.data.cyan); - $('#magenta').val(response.data.magenta); - $('#amarillo').val(response.data.amarillo); - $('#gotaNegro').val(response.data.gota_negro); - $('#gotaColor').val(response.data.gota_color); - - $('#tipologiaTipo').attr('disabled', 'disabled'); - $('#action').val('edit'); - $('.modal-title').text('' + ' ' + ''); - $('#submit_button').val(''); - - - $('#tipologiaModal').modal('show'); - - $('#hidden_id').val(id); - - }, - cache: true - }) - - }); - - $(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'); + $(document).on('click', '.btn-remove', function(e) { + const dataId = $(this).attr('data-id'); const row = $(this).closest('tr'); - if (result.value) { + if ($.isNumeric(dataId)) { $.ajax({ url: `/configuracion/papelimpresiontipologias/delete/${dataId}`, method: 'GET', - dataType: "json", }).done((data, textStatus, jqXHR) => { - - Toast.fire({ - icon: 'success', - title: data.msg ?? jqXHR.statusText, - }); - - + $('#confirm2delete').modal('toggle'); theTable.clearPipeline(); theTable.row($(row)).invalidate().draw(); + popSuccessAlert(data.msg ?? jqXHR.statusText); }).fail((jqXHR, textStatus, errorThrown) => { - Toast.fire({ - icon: 'error', - title: jqXHR.responseJSON.messages.error, - }); + popErrorAlert(jqXHR.responseJSON.messages.error) }) } }); - }); + } + + $('#papelGenericoId').select2({ @@ -504,13 +351,153 @@ } }); + var theTable2 = $('#tableOfMaquinas').DataTable( { + serverSide: true, + processing: true, + autoWidth: true, + responsive: true, + lengthMenu: [ 5, 10, 25], + order: [[ 1, "asc" ]], + pageLength: 10, + lengthChange: true, + searching: true, + paging: true, + info: true, + dom: "lftp", + ajax : $.fn.dataTable.pipeline( { + url: '', + data: function (d) { + d.papel_id = id; + d.isRotativa = $('#rotativa').is(':checked')?1:0; + d.ancho = document.getElementById("ancho").value; + d.alto = document.getElementById("alto").value; + d.webguard_token = ''; + }, + method: 'POST', + headers: {'X-Requested-With': 'XMLHttpRequest'}, + async: true, + }), + columns: [ + { 'data': 'active', + render: function (data, type, row) { + if (type === 'display') { + return ''; + } + return data; + }, + className: 'dt-body-center' + }, + { 'data': 'maquina'}, + { 'data': 'ancho'}, + { 'data': 'alto'}, + { 'data': 'anchoimpresion'}, + { 'data': 'altoimpresion'}, + ], + rowCallback: function (row, data) { + // Set the checked state of the checkbox in the table + $('input.editor-active', row).prop('checked', data.active == 1); + }, + language: { + url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/i18n ?>.json" + }, + columnDefs: [ + { + searchable: false, + targets: [0,2,3,4,5] + } + ], + } ); + editor2 = new $.fn.dataTable.Editor( { + ajax: { + url: "", + headers: { + : v, + }, + }, + table : "#tableOfMaquinas", + idSrc: 'papel_impresion_id', + fields: [ + { + name: "active", + type: "checkbox", + separator: "|", + ipOpts: [ + { label: '', value: 1 } + ] + },{ + "name": "papel_impresion_id", + "type": "hidden" + },{ + "name": "gramaje", + "type": "hidden" + },{ + "name": "maquina_id", + "type": "hidden" + } + ] + } ); + + editor2.on( 'postSubmit', function ( e, json, data, action ) { + yeniden(json.); + if(json.error){ + document.getElementById("check_" + json.data.papel_impresion_id).checked = false; + Swal.fire({ + icon: 'error', + title: '', + text: json.error, + }); + } + }); + + // Cuando se clica en un checkbox hacer submit en el editor + theTable2.on( 'change', 'input.editor-active', function () { + editor2 + .edit( $(this).closest('tr'), false ) + .set( 'active', $(this).prop( 'checked' ) ? 1 : 0 ) + .submit(); + } ); + + + // Para los calculos del precio + $("#ancho").on('input', function () { + updateValue(); + }); + + $("#alto").on('input', function () { + updateValue(); + }); + + $("#gramaje").on('input', function () { + updateValue(); + }); + + $("#precioTonelada").on('input', function () { + updateValue(); + }); + + function updateValue() { + let value = parseFloat($("#gramaje").val()) * parseFloat($("#ancho").val())*parseFloat($("#alto").val())/1E6; + value = value.toFixed(2); + $('#pesoPorPliego').val(value); + let value2 = parseFloat($("#precioTonelada").val()) *value/1E6; + value2 = value2.toFixed(6); + $('#precioPliego').val(value2); + } endSection() ?> section('css') ?> + + "> + -*/ ?> + + + + endSection() ?> @@ -522,5 +509,8 @@ + + + endSection() ?> 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 42a379aa..38186b11 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 @@ -58,7 +58,7 @@ const lastColNr = $('#tableOfTarifasacabado').find("tr:first th").length - 1; responsive: true, scrollX: true, lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - pageLength: 10, + pageLength: 50, lengthChange: true, "dom": 'lfBrtip', "buttons": [ diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php index 320178ce..a9445187 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionList.php @@ -56,7 +56,7 @@ responsive: true, scrollX: true, lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - pageLength: 10, + pageLength: 50, lengthChange: true, "dom": 'lfBrtip', "buttons": [ diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php index ddf71ed1..0f6212c1 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/manipulado/viewTarifaManipuladoList.php @@ -56,7 +56,7 @@ responsive: true, scrollX: true, lengthMenu: [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - pageLength: 10, + pageLength: 50, lengthChange: true, "dom": 'lfBrtip', "buttons": [ diff --git a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php index ab1220dc..02247ff0 100644 --- a/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php +++ b/ci4/app/Views/themes/backend/vuexy/form/tarifas/preimpresion/viewTarifapreimpresionList.php @@ -85,7 +85,7 @@ "responsive": true, "paging": true, "lengthMenu": [ 5, 10, 25, 50, 75, 100, 250, 500, 1000, 2500 ], - "pageLength": 10, + "pageLength": 50, "lengthChange": true, "searching": true, "ordering": true, diff --git a/httpdocs/themes/vuexy/vendor/editor.bootstrap5.min.css b/httpdocs/themes/vuexy/vendor/editor.bootstrap5.min.css new file mode 100644 index 00000000..37c4eed4 --- /dev/null +++ b/httpdocs/themes/vuexy/vendor/editor.bootstrap5.min.css @@ -0,0 +1 @@ +div.DTE div.DTE_Form_Error{color:#b11f1f}div.DTE div.DTE_Form_Buttons{display:flex;flex-direction:row-reverse}div.DTE div.DTE_Form_Buttons button{margin-left:.5em}div.modal div.DTE div.DTE_Form_Error{display:none;float:left;padding-top:7px}div.DTE_Field{position:relative}div.DTE_Field div.multi-value,div.DTE_Field div.multi-restore{display:none;cursor:pointer}div.DTE_Field div.multi-value span,div.DTE_Field div.multi-restore span{display:block;color:#666}div.DTE_Field div.multi-value:hover,div.DTE_Field div.multi-restore:hover{background-color:#f1f1f1}div.DTE_Field div.multi-restore{margin-top:.5em;font-size:.8em;line-height:1.25em}div.DTE_Field:after{display:block;content:".";height:0;line-height:0;clear:both;visibility:hidden}div.DTE_Field div:not([data-dte-e=msg-error]){color:inherit}div.DTE_Inline{position:relative;display:table;width:100%}div.DTE_Inline div.DTE_Inline_Field,div.DTE_Inline div.DTE_Inline_Buttons{display:table-cell;vertical-align:middle}div.DTE_Inline div.DTE_Inline_Field div.DTE_Field,div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field{padding:0}div.DTE_Inline div.DTE_Inline_Field div.DTE_Field>label,div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field>label{display:none}div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=color],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=date],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=datetime],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=datetime-local],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=email],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=month],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=number],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=password],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=search],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=tel],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=text],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=time],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=url],div.DTE_Inline div.DTE_Inline_Field div.DTE_Field input[type=week],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=color],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=date],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=datetime],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=datetime-local],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=email],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=month],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=number],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=password],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=search],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=tel],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=text],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=time],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=url],div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Field input[type=week]{width:100%}div.DTE_Inline div.DTE_Inline_Field div.DTE_Form_Buttons button,div.DTE_Inline div.DTE_Inline_Buttons div.DTE_Form_Buttons button{margin:-6px 0 -6px 4px;padding:5px}div.DTE_Inline div.DTE_Field input[type=color],div.DTE_Inline div.DTE_Field input[type=date],div.DTE_Inline div.DTE_Field input[type=datetime],div.DTE_Inline div.DTE_Field input[type=datetime-local],div.DTE_Inline div.DTE_Field input[type=email],div.DTE_Inline div.DTE_Field input[type=month],div.DTE_Inline div.DTE_Field input[type=number],div.DTE_Inline div.DTE_Field input[type=password],div.DTE_Inline div.DTE_Field input[type=search],div.DTE_Inline div.DTE_Field input[type=tel],div.DTE_Inline div.DTE_Field input[type=text],div.DTE_Inline div.DTE_Field input[type=time],div.DTE_Inline div.DTE_Field input[type=url],div.DTE_Inline div.DTE_Field input[type=week]{margin:-6px 0}div.DTE_Inline div.DTE_Field_Error,div.DTE_Inline div.DTE_Form_Error{font-size:11px;line-height:1.2em;padding:0;margin-top:10px}div.DTE_Inline div.DTE_Field_Error:empty,div.DTE_Inline div.DTE_Form_Error:empty{margin-top:0}span.dtr-data div.DTE_Inline{display:inline-table}div.DTE_Inline div.DTE_Field{width:100%}div.DTE_Inline div.DTE_Field>div{width:100%;padding:0}div.DTE_Inline div.DTE_Field input.form-control{height:30px}div.DTE_Inline div.DTE_Field div.help-block{display:none;margin-top:10px;margin-bottom:0}div.DTE_Inline.DTE_Processing:after{top:5px}div.DTE_Field_Type_checkbox div.controls,div.DTE_Field_Type_radio div.controls{margin-top:.4em}div.DTE_Field_Type_checkbox div.controls label,div.DTE_Field_Type_radio div.controls label{margin-left:.75em;margin-bottom:0;vertical-align:middle;font-weight:normal}div.DTE_Bubble{position:absolute;z-index:11;margin-top:-6px;opacity:0;transition:top .5s ease-in-out 0s}div.DTE_Bubble div.DTE_Bubble_Liner{position:absolute;bottom:0;border:1px solid black;width:300px;margin-left:-150px;background-color:white;box-shadow:0 12px 30px 0 rgba(0, 0, 0, 0.5);border-radius:6px;border:1px solid #666;padding:1em;background:#fcfcfc;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table{width:100%}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content{padding:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field{position:relative;margin-bottom:.5em}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field:last-child{margin-bottom:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field>label{padding-top:0;margin-bottom:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field>div{padding:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field>div input{margin:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table div.DTE_Form_Buttons{text-align:right;margin-top:1em}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table div.DTE_Form_Buttons button{margin-bottom:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Header{border-top-left-radius:5px;border-top-right-radius:5px}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Header+div.DTE_Form_Info,div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Header+div.DTE_Bubble_Table{padding-top:42px}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Form_Error{float:none;display:none;padding:0;margin-bottom:.5em}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Close{position:absolute;top:19px;right:19px;cursor:pointer;z-index:12}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Close:after{content:"×";color:rgba(0, 0, 0, 0.5);font-weight:bold;font-size:22px;font-family:"Courier New",Courier,monospace}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Close:hover:after{color:black}div.DTE_Bubble div.DTE_Bubble_Triangle{position:absolute;height:10px;width:10px;top:-6px;background-color:white;border:1px solid #666;border-top:none;border-right:none;-webkit-transform:rotate(-45deg);-moz-transform:rotate(-45deg);-ms-transform:rotate(-45deg);-o-transform:rotate(-45deg);transform:rotate(-45deg)}div.DTE_Bubble.below div.DTE_Bubble_Liner{top:10px;bottom:auto}div.DTE_Bubble.below div.DTE_Bubble_Triangle{top:4px;-webkit-transform:rotate(135deg);-moz-transform:rotate(135deg);-ms-transform:rotate(135deg);-o-transform:rotate(135deg);transform:rotate(135deg)}div.DTE_Bubble_Background{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0, 0, 0, 0.7);background:-ms-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-moz-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-o-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-webkit-gradient(radial, center center, 0, center center, 497, color-stop(0, rgba(0, 0, 0, 0.3)), color-stop(1, rgba(0, 0, 0, 0.7)));background:-webkit-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:radial-gradient(ellipse farthest-corner at center, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);z-index:10}div.DTE_Bubble_Background>div{position:absolute;top:0;right:0;left:0;bottom:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)"}div.DTE_Bubble_Background>div:not([dummy]){filter:progid:DXImageTransform.Microsoft.gradient(enabled="false")}div.DTE_Bubble div.DTE_Bubble_Liner{box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);border-radius:6px;padding:1em;border:1px solid rgba(0, 0, 0, 0.2)}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field label,div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field>div{width:100%;max-width:100%;float:none;clear:both;text-align:left;flex:none}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content div.DTE_Field label{padding:0 0 4px 0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table div.DTE_Form_Buttons{text-align:right;margin-top:0}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Header{background-color:#f7f7f7;border-bottom:1px solid #ebebeb;font-size:14px;width:100%}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Close:after{margin-top:-2px;display:block}div.DTE_Bubble div.DTE_Bubble_Triangle{border-bottom:1px solid rgba(0, 0, 0, 0.2);border-left:1px solid rgba(0, 0, 0, 0.2)}div.DTE_Bubble_Background{position:fixed;top:0;left:0;right:0;bottom:0;z-index:10;background-color:rgba(0, 0, 0, 0.05)}div.DTE div.editor_upload{padding-top:4px}div.DTE div.editor_upload div.eu_table{display:table;width:100%}div.DTE div.editor_upload div.row{display:table-row}div.DTE div.editor_upload div.cell{display:table-cell;position:relative;width:50%;vertical-align:top}div.DTE div.editor_upload div.cell+div.cell{padding-left:10px}div.DTE div.editor_upload div.row+div.row div.cell{padding-top:10px}div.DTE div.editor_upload button.btn,div.DTE div.editor_upload input[type=file]{width:100%;height:2.3em;font-size:.8em;text-align:center;line-height:1em;margin:0}div.DTE div.editor_upload input[type=file]{position:absolute;top:0;left:0;width:100%;opacity:0}div.DTE div.editor_upload div.drop{position:relative;box-sizing:border-box;width:100%;height:100%;border:3px dashed #ccc;border-radius:6px;min-height:4em;color:#999;text-align:center;padding:1em 2em;line-height:1.1em}div.DTE div.editor_upload div.drop.over{border:3px dashed #111;color:#111}div.DTE div.editor_upload div.drop span{max-width:75%;font-size:.85em;line-height:1em}div.DTE div.editor_upload div.rendered img{max-width:8em;margin:0 auto}div.DTE div.editor_upload.noDrop div.drop{display:none}div.DTE div.editor_upload.noDrop div.row.second{display:none}div.DTE div.editor_upload.noDrop div.rendered{margin-top:10px}div.DTE div.editor_upload.noClear div.clearValue button{display:none}div.DTE div.editor_upload.multi div.cell{display:block;width:100%}div.DTE div.editor_upload.multi div.cell div.drop{min-height:0}div.DTE div.editor_upload.multi div.clearValue{display:none}div.DTE div.editor_upload.multi ul{list-style-type:none;margin:0;padding:0}div.DTE div.editor_upload.multi ul li{position:relative;margin-top:.5em}div.DTE div.editor_upload.multi ul li:first-child{margin-top:0}div.DTE div.editor_upload.multi ul li img{vertical-align:middle}div.DTE div.editor_upload.multi ul li button{position:absolute;width:40px;right:0;top:50%;margin-top:-1.5em}div.DTE div.editor_upload button.btn,div.DTE div.editor_upload input[type=file]{height:auto}div.DTE div.editor_upload ul li button{padding-bottom:8px}div.DTE_Field_Type_datatable div.dataTables_info{font-size:.8em;line-height:1.3em;padding-right:1em;font-weight:normal}div.DTE_Field_Type_datatable div.dataTables_info span.select-info{display:block}div.DTE_Field_Type_datatable div.dt-buttons{padding-bottom:.5em;width:100%}div.DTE_Field_Type_datatable div.dt-buttons:empty{display:none}div.DTE_Field_Type_datatable div.dataTables_wrapper div.dataTables_paginate{text-align:center}@media(min-width: 1200px){div.DTE_Field_Type_datatable label.control-label{text-align:left}}div.DTE div.DTE_Processing_Indicator{position:absolute;top:17px;right:42px;height:2em;width:2em;z-index:20;font-size:12px;display:none;-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0)}div.DTE.processing div.DTE_Processing_Indicator{display:block}div.DTE.processing div.DTE_Field div.DTE_Processing_Indicator{display:none}div.DTE div.DTE_Field div.DTE_Processing_Indicator{top:13px;right:0;font-size:8px}div.DTE.DTE_Inline div.DTE_Processing_Indicator{top:5px;right:6px;font-size:6px}div.DTE.DTE_Bubble div.DTE_Processing_Indicator{top:10px;right:14px;font-size:8px}div.DTE div.DTE_Processing_Indicator span,div.DTE div.DTE_Processing_Indicator:before,div.DTE div.DTE_Processing_Indicator:after{display:block;background:black;width:.5em;height:1.5em;border:1px solid rgba(0, 0, 0, 0.4);background-color:rgba(0, 0, 0, 0.1);-webkit-animation:editorProcessing .9s infinite ease-in-out;animation:editorProcessing .9s infinite ease-in-out}div.DTE div.DTE_Processing_Indicator:before,div.DTE div.DTE_Processing_Indicator:after{position:absolute;top:0;content:""}div.DTE div.DTE_Processing_Indicator:before{left:-1em;-webkit-animation-delay:-0.3s;animation-delay:-0.3s}div.DTE div.DTE_Processing_Indicator span{-webkit-animation-delay:-0.15s;animation-delay:-0.15s}div.DTE div.DTE_Processing_Indicator:after{left:1em}@-webkit-keyframes editorProcessing{0%,80%,100%{transform:scale(1, 1)}40%{transform:scale(1, 1.5)}}@keyframes editorProcessing{0%,80%,100%{transform:scale(1, 1)}40%{transform:scale(1, 1.5)}}table.dataTable tbody tr.highlight{background-color:#39f !important}table.dataTable tbody tr.highlight,table.dataTable tbody tr.noHighlight,table.dataTable tbody tr.highlight td,table.dataTable tbody tr.noHighlight td{-webkit-transition:background-color 500ms linear;-moz-transition:background-color 500ms linear;-ms-transition:background-color 500ms linear;-o-transition:background-color 500ms linear;transition:background-color 500ms linear}div.DTE div.DTE_Field div.DTE_Processing_Indicator{top:13px;right:20px}div.DTE div.DTE_Processing_Indicator{top:52px;right:12px}div.DTED_Envelope_Wrapper{position:absolute;top:0;bottom:0;left:50%;height:100%;z-index:11;display:none;overflow:hidden}div.DTED_Envelope_Wrapper div.DTED_Envelope_Shadow{position:absolute;top:-10px;left:10px;right:10px;height:10px;z-index:10;box-shadow:0 0 20px black}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container{position:absolute;top:0;left:5%;width:90%;border-left:1px solid #777;border-right:1px solid #777;border-bottom:1px solid #777;box-shadow:3px 3px 10px #555;border-bottom-left-radius:5px;border-bottom-right-radius:5px;background-color:white}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTE_Processing_Indicator{right:36px}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTE_Footer{border-bottom-left-radius:5px;border-bottom-right-radius:5px}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTED_Envelope_Close{position:absolute;top:19px;right:19px;cursor:pointer;z-index:12}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTED_Envelope_Close:after{content:"×";color:rgba(0, 0, 0, 0.5);font-weight:bold;font-size:22px;font-family:"Courier New",Courier,monospace}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTED_Envelope_Close:hover:after{color:black}div.DTED_Envelope_Background{position:fixed;top:0;left:0;width:100%;height:100%;background:rgba(0, 0, 0, 0.7);background:-ms-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-moz-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-o-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:-webkit-gradient(radial, center center, 0, center center, 497, color-stop(0, rgba(0, 0, 0, 0.3)), color-stop(1, rgba(0, 0, 0, 0.7)));background:-webkit-radial-gradient(center, ellipse farthest-corner, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);background:radial-gradient(ellipse farthest-corner at center, rgba(0, 0, 0, 0.3) 0%, rgba(0, 0, 0, 0.7) 100%);z-index:10}div.DTED_Envelope_Background>div{position:absolute;top:0;right:0;left:0;bottom:0;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000);-ms-filter:"progid:DXImageTransform.Microsoft.gradient(startColorstr=#99000000, endColorstr=#99000000)"}div.DTED_Envelope_Background>div:not([dummy]){filter:progid:DXImageTransform.Microsoft.gradient(enabled="false")}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTED_Envelope_Close{top:10px;background:transparent;text-shadow:none;box-shadow:none;border:none;font-size:21px;color:black;opacity:.2}div.DTED_Envelope_Wrapper div.DTED_Envelope_Container div.DTED_Envelope_Close:hover{opacity:1}div.multi-value,div.multi-restore{padding:.5em}div.multi-value span,div.multi-restore span{line-height:1.2em}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table>form div.DTE_Form_Content{margin:0 1em}div.DTE_Bubble div.DTE_Bubble_Liner div.DTE_Bubble_Table div.DTE_Form_Buttons{margin-top:1em}div.DTE_Inline div.DTE_Field{width:100%;margin:0}div.DTE_Inline div.DTE_Field>div{max-width:100%;flex:none}div.DTE_Inline div.DTE_Field input{font-size:1em;margin:-5px 0 -10px !important}div.DTE_Body div.DTE_Body_Content div.DTE_Field.block label,div.DTE_Body div.DTE_Body_Content div.DTE_Field.block>div{max-width:100%;flex:0 0 100%}div.DTE_Field_Type_checkbox div.DTE_Field_InputControl,div.DTE_Field_Type_radio div.DTE_Field_InputControl{padding-top:5px}div.DTE_Field_Type_checkbox div label,div.DTE_Field_Type_radio div label{margin-left:.75em;vertical-align:middle}div.DTE div.DTE_Processing_Indicator{top:20px;right:36px}div.DTE_Field_Type_datatable div.dataTables_filter{padding-bottom:.5em}div.DTE_Field_Type_datatable div.dt-buttons{padding-bottom:.5em;width:100%}div.DTE_Field_Type_datatable div.dt-buttons:empty{display:none}div.DTE_Field_Type_datatable div.dataTables_info{font-size:.8em;line-height:1.3em;padding-right:0}div.DTE_Field_Type_datatable div.dataTables_info span.select-info{display:block}div.DTE_Field_Type_datatable div.dataTables_wrapper>table{border:1px solid #ced4da;border-radius:3px}div.DTE_Field_Type_datatable div.dataTables_wrapper>table thead th,div.DTE_Field_Type_datatable div.dataTables_wrapper>table tbody td{border-top:none}div.DTE_Field_Type_datatable div.dataTables_wrapper div.dataTables_paginate ul.pagination{justify-content:center}