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

45
ci4/app/Models/Tarifas/TarifaAcabadoLineaModel.php
View File

@ -17,7 +17,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
1 => "t1.tirada_max",
2 => "t1.precio_min",
3 => "t1.precio_max",
4 => "t1.precio_unidad",
];
protected $allowedFields = [
@ -25,7 +24,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"tirada_max",
"precio_min",
"precio_max",
"precio_unidad",
"user_created_id",
"is_deleted",
];
@ -53,10 +51,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"label" => "TarifaAcabadoLineas.precioMin",
"rules" => "required|decimal",
],
"precio_unidad" => [
"label" => "TarifaAcabadoLineas.precioUnidad",
"rules" => "required|decimal",
],
"tirada_max" => [
"label" => "TarifaAcabadoLineas.tiradaMax",
"rules" => "required|integer",
@ -84,10 +78,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
"decimal" => "TarifaAcabadoLineas.validation.precio_min.decimal",
"required" => "TarifaAcabadoLineas.validation.precio_min.required",
],
"precio_unidad" => [
"decimal" => "TarifaAcabadoLineas.validation.precio_unidad.decimal",
"required" => "TarifaAcabadoLineas.validation.precio_unidad.required",
],
"tirada_max" => [
"integer" => "TarifaAcabadoLineas.validation.tirada_max.integer",
"required" => "TarifaAcabadoLineas.validation.tirada_max.required",
@ -135,7 +125,7 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
$builder = $this->db
->table($this->table . " t1")
->select(
"t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.precio_unidad AS precio_unidad, t1.user_created_id AS user_created_id, t1.user_updated_id AS user_updated_id, t1.is_deleted AS is_deleted, t1.created_at AS created_at, t1.updated_at AS updated_at, t2.id AS tarifa_acabado"
"t1.id AS id, t1.tirada_min AS tirada_min, t1.tirada_max AS tirada_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.user_created_id AS user_created_id, t1.user_updated_id AS user_updated_id, t1.is_deleted AS is_deleted, t1.created_at AS created_at, t1.updated_at AS updated_at, t2.id AS tarifa_acabado"
);
//JJO
@ -153,7 +143,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.precio_unidad", $search)
->orLike("t1.user_created_id", $search)
->orLike("t1.user_updated_id", $search)
->orLike("t1.is_deleted", $search)
@ -164,7 +153,6 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
->orLike("t1.tirada_max", $search)
->orLike("t1.precio_min", $search)
->orLike("t1.precio_max", $search)
->orLike("t1.precio_unidad", $search)
->orLike("t1.user_created_id", $search)
->orLike("t1.user_updated_id", $search)
->orLike("t1.is_deleted", $search)
@ -185,4 +173,35 @@ class TarifaAcabadoLineaModel extends \App\Models\GoBaseModel
return $builder;
}
public function checkIntervals($data = [], $id_linea = null, $id_tarifa_acabado = null){
helper('general');
if(floatval($data["tirada_min"])>= floatval($data["tirada_max"])){
return lang('TarifaAcabadoLineas.validation.error_tirada_range');
}
$rows = $this->db
->table($this->table)
->select("id, tirada_min, tirada_max")
->where("is_deleted", 0)
->where("tarifa_acabado_id", $id_tarifa_acabado)
->get()->getResultObject();
foreach ($rows as $row) {
if (!is_null($id_linea)){
if($row->id == $id_linea){
continue;
}
}
if(check_overlap(floatval($data["tirada_min"]), floatval($data["tirada_max"]),
$row->tirada_min, $row->tirada_max)){
return lang('TarifaAcabadoLineas.validation.error_tirada_overlap');
}
}
return "";
}
}