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

ya funcionando la consulta de papel_impresion/maquinas

Browse Source
This commit is contained in:
Jaime Jimenez
2023-09-25 08:03:28 +02:00
parent ad55a2290f
commit d9afa9a1ef
10 changed files with 251 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ci4/app/Models/Configuracion/MaquinasCallesModel.php
View File

@ -13,16 +13,14 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
protected $useAutoIncrement = true;
const SORTABLE = [
0 => "t1.formas_min",
1 => "t1.formas_max",
2 => "t1.internas",
3 => "t1.externas",
0 => "t1.formas",
1 => "t1.internas",
2 => "t1.externas",
];
protected $allowedFields = [
"maquina_id",
"formas_min",
"formas_max",
"formas",
"internas",
"externas",
"user_created_id",
@ -43,10 +41,7 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
public static $labelField = "maquina_id";
protected $validationRules = [
"formas_min" => [
"rules" => "required|int",
],
"formas_max" => [
"formas" => [
"rules" => "required|int",
],
"internas" => [
@ -70,8 +65,8 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.maquina_id as maquina, t1.formas_min AS formas_min,
t1.formas_max AS formas_max, t1.internas AS internas, t1.externas AS externas,"
"t1.id AS id, t1.maquina_id as maquina, t1.formas AS formas,
t1.internas AS internas, t1.externas AS externas,"
);
//JJO
@ -82,29 +77,22 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
? $builder
: $builder
->groupStart()
->like("t1.formas_min", $search)
->orLike("t1.formas_max", $search)
->like("t1.formas", $search)
->orLike("t1.internas", $search)
->orLike("t1.externas", $search)
->orLike("t1.formas_min", $search)
->orLike("t1.formas_max", $search)
->orLike("t1.formas", $search)
->orLike("t1.internas", $search)
->orLike("t1.externas", $search)
->groupEnd();
}
public function checkIntervals($data = [], $id = null){
public function checkDuplicatedFormas($data = [], $id = null){
helper('general');
if(floatval($data["formas_min"])>= floatval($data["formas_max"])){
return lang('MaquinasCalles.validation.error_calle_range');
}
$rows = $this->db
->table($this->table)
->select("id, formas_min, formas_max")
->select("id, formas")
->where("is_deleted", 0)
->where("maquina_id", $data['maquina_id'])
->get()->getResultObject();
@ -116,9 +104,8 @@ class MaquinasCallesModel extends \App\Models\GoBaseModel
continue;
}
}
if(check_overlap(floatval($data["formas_min"]), floatval($data["formas_max"]),
$row->formas_min, $row->formas_max)){
return lang('MaquinasCalles.validation.error_calle_overlap');
if(intval($data["formas"]) == $row->formas){
return lang('MaquinasCalles.validation.error_formas_exists');
}
}
}