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

6
ci4/app/Models/Configuracion/MaquinaModel.php
View File

@ -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;
}

8
ci4/app/Models/Configuracion/MaquinasPapelesImpresionModel.php
View File

@ -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;
}