jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Realizadas todas la modificaciones solicitadas por @jm

Browse Source
This commit is contained in:
Jaime Jiménez
2023-08-01 20:01:34 +02:00
parent 7a4bcf2be2
commit d29cec040a
8 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
View File

@ -119,17 +119,15 @@ class Maquinaspapelesimpresion extends \App\Controllers\GoBaseResourceController
$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;
$papel_id = $reqData['papel_id'] ?? -1;
$isRotativa = $reqData['isRotativa'] ?? -1;
$resourceData = $this->model->getResource_maquinas($search, $papel_id, $isRotativa, $ancho, $alto)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$resourceData = $this->model->getResource_maquinas($search, $papel_id, $isRotativa)->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()
$this->model->getResource_maquinas($search, $papel_id, $isRotativa)->countAllResults()
));
} else {
return $this->failUnauthorized('Invalid request', 403);

4
ci4/app/Controllers/Configuracion/Papelesimpresion.php
View File

@ -415,12 +415,12 @@ class Papelesimpresion extends \App\Controllers\GoBaseResourceController
$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');
$active_values = $ma_pa_model->getInitSelectedMachines($id, $data['rotativa'])->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');
$rows = $ma_model->getIdMaquinasForPapelImpresion($id, $data['rotativa'])->get()->getResult('array');
$ma_pa_model->insertRows($rows);
// Se actualizan los activos que había en caso de que los hubiera