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

modificacion en tablas tarifas acabado/manipulado. Correccion errores maquinas_defecto. Cambiados modelos y entidades tarifas acabado manipulado

Browse Source
This commit is contained in:
Jaime Jimenez
2023-07-18 18:44:25 +02:00
parent 6e0493a287
commit 0d81dca32b
16 changed files with 124 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
ci4/app/Models/Configuracion/MaquinasDefectoModel.php
View File

@ -183,6 +183,8 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
public function checkIntervals($data = [], $id = null){
helper('general');
if(floatval($data["ancho_min"])>= floatval($data["ancho_max"])){
return lang('MaquinasPorDefecto.validation.error_ancho_range');
}
@ -209,17 +211,17 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
continue;
}
}
if($this->check_overlap(floatval($data["ancho_min"]), floatval($data["ancho_max"]),
if(check_overlap(floatval($data["ancho_min"]), floatval($data["ancho_max"]),
$row->ancho_min, $row->ancho_max)){
return lang('MaquinasPorDefecto.validation.error_ancho_overlap');
}
if($this->check_overlap(floatval($data["alto_min"]), floatval($data["alto_max"]),
if(check_overlap(floatval($data["alto_min"]), floatval($data["alto_max"]),
$row->alto_min, $row->alto_max)){
return lang('MaquinasPorDefecto.validation.error_alto_overlap');
}
if($this->check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
$row->tirada_min, $row->tirada_max)){
return lang('MaquinasPorDefecto.validation.error_ancho_overlap');
return lang('MaquinasPorDefecto.validation.error_tirada_overlap');
}
}
@ -227,15 +229,6 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
return "";
}
// Devuelve true si los intervalos (a1,a2) (b1,b2) se solapan
// https://stackoverflow.com/questions/3269434/whats-the-most-efficient-way-to-test-if-two-ranges-overlap
private function check_overlap($a1, $a2, $b1, $b2){
if (max($a2, $b2) - min($a1, $b1) < ($a2 - $a1) + ($b2 - $b1))
return true;
return false;
}
}