diff --git a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php index c4997434..0f05f073 100644 --- a/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php @@ -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); diff --git a/ci4/app/Controllers/Configuracion/Papelesimpresion.php b/ci4/app/Controllers/Configuracion/Papelesimpresion.php index 129fb75f..8d06ea4d 100644 --- a/ci4/app/Controllers/Configuracion/Papelesimpresion.php +++ b/ci4/app/Controllers/Configuracion/Papelesimpresion.php @@ -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 diff --git a/ci4/app/Language/en/PapelImpresion.php b/ci4/app/Language/en/PapelImpresion.php index 40e9a97d..cd460766 100644 --- a/ci4/app/Language/en/PapelImpresion.php +++ b/ci4/app/Language/en/PapelImpresion.php @@ -25,8 +25,9 @@ return [ 'papelImpresionList' => 'Print Paper List', 'papelesImpresion' => 'Print papers', 'papelesimpresion' => 'Print papers', - 'pesoPorPliego' => 'Weight per sheet', + 'pesoPorPliego' => 'Weight per sheet (grams)', 'precioPliego' => 'Sheet price', + 'precioMetro' => 'Meter price', 'precioTonelada' => 'Ton price', 'referencia' => 'Reference', 'rotativa' => 'Rotary', diff --git a/ci4/app/Language/es/PapelImpresion.php b/ci4/app/Language/es/PapelImpresion.php index 42bb8ad0..aae90965 100644 --- a/ci4/app/Language/es/PapelImpresion.php +++ b/ci4/app/Language/es/PapelImpresion.php @@ -25,8 +25,9 @@ return [ 'papelImpresionList' => 'Lista Papel Impresión', 'papelesImpresion' => 'Papeles Impresión', 'papelesimpresion' => 'Papeles Impresión', - 'pesoPorPliego' => 'Peso Por Pliego', + 'pesoPorPliego' => 'Peso Por Pliego (gramos)', 'precioPliego' => 'Precio Pliego', + 'precioMetro' => 'Precio Metro', 'precioTonelada' => 'Precio Tonelada', 'referencia' => 'Referencia', 'rotativa' => 'Rotativa', diff --git a/ci4/app/Models/Configuracion/MaquinaModel.php b/ci4/app/Models/Configuracion/MaquinaModel.php index 863225f3..bb5dbdb3 100644 --- a/ci4/app/Models/Configuracion/MaquinaModel.php +++ b/ci4/app/Models/Configuracion/MaquinaModel.php @@ -252,16 +252,14 @@ class MaquinaModel extends \App\Models\GoBaseModel return $result; } - public function getIdMaquinasForPapelImpresion($papel_impresion_id, $rotativa, $ancho, $alto){ + public function getIdMaquinasForPapelImpresion($papel_impresion_id, $rotativa){ $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; } diff --git a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php index 1b4c6b7b..f9d7a36e 100644 --- a/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php +++ b/ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php @@ -112,7 +112,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel * * @return \CodeIgniter\Database\BaseBuilder */ - public function getResource_maquinas(string $search = "", $papel_id = -1, $isRotativa = -1, $ancho =-1, $alto = -1) + public function getResource_maquinas(string $search = "", $papel_id = -1, $isRotativa = -1) { $builder = $this->db ->table($this->table . " t1") @@ -126,8 +126,6 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel $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); @@ -192,7 +190,7 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel // Funcion para obtener todas las máquinas seleccionadas para un papel - public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa, $ancho, $alto) + public function getInitSelectedMachines($papel_impresion_id= -1, $isRotativa) { $builder = $this->db ->table($this->table . " t1") @@ -207,8 +205,6 @@ class MaquinasPapelesImpresionModel extends \App\Models\GoBaseModel // 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; } 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 e15d47aa..457dc07e 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 @@ -116,7 +116,7 @@
-