falta el checkear que no se solapen intervalos. corregido error en varios sitios (ponia user_update_id en lugar de user_updated_id; también en BBDD)

This commit is contained in:
Jaime Jiménez
2023-07-12 14:42:21 +02:00
parent 1908290167
commit c4a7cfc799
28 changed files with 137 additions and 119 deletions

View File

@ -32,8 +32,10 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
"tirada_min",
"tirada_max",
"maquina_id",
"deleted_at",
"is_deleted",
"user_created_id",
"user_updated_id"
];
protected $returnType = "App\Entities\Configuracion\MaquinasDefectoEntity";
@ -48,63 +50,63 @@ class MaquinasDefectoModel extends \App\Models\GoBaseModel
protected $validationRules = [
"alto_max" => [
"label" => "MaquinaPorDefectoes.altoMax",
"label" => "MaquinasPorDefecto.altoMax",
"rules" => "required|decimal",
],
"alto_min" => [
"label" => "MaquinaPorDefectoes.altoMin",
"label" => "MaquinasPorDefecto.altoMin",
"rules" => "required|decimal",
],
"ancho_max" => [
"label" => "MaquinaPorDefectoes.anchoMax",
"label" => "MaquinasPorDefecto.anchoMax",
"rules" => "required|decimal",
],
"ancho_min" => [
"label" => "MaquinaPorDefectoes.anchoMin",
"label" => "MaquinasPorDefecto.anchoMin",
"rules" => "required|decimal",
],
"tipo" => [
"label" => "MaquinaPorDefectoes.tipo",
"label" => "MaquinasPorDefecto.tipo",
"rules" => "required|in_list[bn,bnhq,color,portada,cubierta,rotativa]",
],
"tirada_max" => [
"label" => "MaquinaPorDefectoes.tiradaMax",
"label" => "MaquinasPorDefecto.tiradaMax",
"rules" => "required|integer",
],
"tirada_min" => [
"label" => "MaquinaPorDefectoes.tiradaMin",
"label" => "MaquinasPorDefecto.tiradaMin",
"rules" => "required|integer",
],
];
protected $validationMessages = [
"alto_max" => [
"decimal" => "MaquinaPorDefectoes.validation.alto_max.decimal",
"required" => "MaquinaPorDefectoes.validation.alto_max.required",
"decimal" => "MaquinasPorDefecto.validation.alto_max.decimal",
"required" => "MaquinasPorDefecto.validation.alto_max.required",
],
"alto_min" => [
"decimal" => "MaquinaPorDefectoes.validation.alto_min.decimal",
"required" => "MaquinaPorDefectoes.validation.alto_min.required",
"decimal" => "MaquinasPorDefecto.validation.alto_min.decimal",
"required" => "MaquinasPorDefecto.validation.alto_min.required",
],
"ancho_max" => [
"decimal" => "MaquinaPorDefectoes.validation.ancho_max.decimal",
"required" => "MaquinaPorDefectoes.validation.ancho_max.required",
"decimal" => "MaquinasPorDefecto.validation.ancho_max.decimal",
"required" => "MaquinasPorDefecto.validation.ancho_max.required",
],
"ancho_min" => [
"decimal" => "MaquinaPorDefectoes.validation.ancho_min.decimal",
"required" => "MaquinaPorDefectoes.validation.ancho_min.required",
"decimal" => "MaquinasPorDefecto.validation.ancho_min.decimal",
"required" => "MaquinasPorDefecto.validation.ancho_min.required",
],
"tipo" => [
"in_list" => "MaquinaPorDefectoes.validation.tipo.in_list",
"required" => "MaquinaPorDefectoes.validation.tipo.required",
"in_list" => "MaquinasPorDefecto.validation.tipo.in_list",
"required" => "MaquinasPorDefecto.validation.tipo.required",
],
"tirada_max" => [
"integer" => "MaquinaPorDefectoes.validation.tirada_max.integer",
"required" => "MaquinaPorDefectoes.validation.tirada_max.required",
"integer" => "MaquinasPorDefecto.validation.tirada_max.integer",
"required" => "MaquinasPorDefecto.validation.tirada_max.required",
],
"tirada_min" => [
"integer" => "MaquinaPorDefectoes.validation.tirada_min.integer",
"required" => "MaquinaPorDefectoes.validation.tirada_min.required",
"integer" => "MaquinasPorDefecto.validation.tirada_min.integer",
"required" => "MaquinasPorDefecto.validation.tirada_min.required",
],
];

View File

@ -69,7 +69,7 @@ class PapelImpresionModel extends \App\Models\GoBaseModel
"isActivo",
"deleted_at",
"is_deleted",
"user_update_id",
"user_updated_id",
];
protected $returnType = "App\Entities\Configuracion\PapelImpresion";

View File

@ -21,7 +21,7 @@ class TarifaacabadoModel extends \App\Models\GoBaseModel
"deleted_at",
"is_deleted",
"user_created_id",
"user_update_id",
"user_updated_id",
];
protected $returnType = 'App\Entities\Tarifas\TarifaacabadoEntity';

View File

@ -18,7 +18,7 @@ class TarifapreimpresionModel extends \App\Models\GoBaseModel
"deleted_at",
"is_deleted",
"user_created_id",
"user_update_id"];
"user_updated_id"];
protected $returnType = "App\Entities\Tarifas\TarifapreimpresionEntity";
protected $useTimestamps = true;