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

25
ci4/app/Controllers/Configuracion/Maquinastarifasimpresion.php
View File

@ -255,20 +255,19 @@ if ($this->request->getPost('predeterminado') == null ) {
return lang('MaquinasTarifasImpresions.validation.cubierta_sobrecubierta_color');
}
// No se pueden duplicar valores al crear
if($action === Editor::ACTION_CREATE){
$builder = $this->model->select('*')
->where(array(
'maquina_id'=> $values['maquina_id'],
'tipo'=> $values['tipo'],
'uso'=> $values['uso'],
'is_deleted'=> 0));
$builder = $this->model->select('*')
->where(array(
'maquina_id'=> $values['maquina_id'],
'tipo'=> $values['tipo'],
'uso'=> $values['uso'],
'is_deleted'=> 0));
if ($builder->countAllResults() >= 1){
if(($action === Editor::ACTION_EDIT && $builder->get()->getFirstRow()->id != $pkey)
|| $action === Editor::ACTION_CREATE)
return lang('MaquinasTarifasImpresions.validation.duplicated_uso_tipo');
// No se pueden duplicar valores al crear o al editar
if ($builder->countAllResults() >= 1){
if(($action === Editor::ACTION_EDIT && $builder->get()->getFirstRow()->id != $pkey)
|| $action === Editor::ACTION_CREATE){
return lang('MaquinasTarifasImpresions.validation.duplicated_uso_tipo');
}
}
}

28
ci4/app/Controllers/Tarifas/Tarifaacabadolineas.php
View File

@ -22,6 +22,8 @@ use
DataTables\Editor\Validate,
DataTables\Editor\ValidateOptions;
use function PHPUnit\Framework\isEmpty;
class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
protected $modelName = TarifaAcabadoLineaModel::class;
@ -276,13 +278,6 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required') )
),
Field::inst( 'precio_unidad' )
->validator( 'Validate::numeric', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_unidad.decimal') )
)
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.precio_unidad.required') )
),
Field::inst( 'tarifa_acabado_id' ),
Field::inst( 'user_created_id' ),
Field::inst( 'created_at' ),
@ -296,17 +291,14 @@ class Tarifaacabadolineas extends \App\Controllers\GoBaseResourceController {
if ($action === Editor::ACTION_CREATE || $action === Editor::ACTION_EDIT){
foreach ($data['data'] as $pkey => $values ){
// Si no se quiere borrar...
if($data['data'][$pkey]['is_deleted'] != 1)
{
$count = $this->model->select('*')
->where(array( 'tarifa_acabado_id'=> $values['tarifa_acabado_id'],
'tirada_min'=> $values['tirada_min'],
'tirada_max'=> $values['tirada_max'],
'is_deleted'=> 0
))
->countAllResults();
if ($count >= 1){
return lang('TarifaAcabadoLineas.validation.duplicated_tirada');
if($data['data'][$pkey]['is_deleted'] != 1){
$process_data['tirada_min'] = $data['data'][$pkey]['tirada_min'];
$process_data['tirada_max'] = $data['data'][$pkey]['tirada_max'];
$response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_acabado_id']);
// No se pueden duplicar valores al crear o al editar
if (!empty($response)){
return $response;
}
}
}

23
ci4/app/Controllers/Tarifas/Tarifamanipuladolineas.php
View File

@ -240,13 +240,6 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController {
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.precio_max.required') )
),
Field::inst( 'precio_unidad' )
->validator( 'Validate::numeric', array(
'message' => lang('TarifaAcabadoLineas.validation.precio_unidad.decimal') )
)
->validator( 'Validate::notEmpty',array(
'message' => lang('TarifaAcabadoLineas.validation.precio_unidad.required') )
),
Field::inst( 'tarifa_manipulado_id' ),
Field::inst( 'user_created_id' ),
Field::inst( 'created_at' ),
@ -262,16 +255,12 @@ class Tarifamanipuladolineas extends \App\Controllers\GoBaseResourceController {
// Si no se quiere borrar...
if($data['data'][$pkey]['is_deleted'] != 1)
{
$count = $this->model->select('*')
->where(array(
'tarifa_manipulado_id'=> $values['tarifa_manipulado_id'],
'tirada_min'=> $values['tirada_min'],
'tirada_max'=> $values['tirada_max'],
'is_deleted'=> 0))
->countAllResults();
if ($count >= 1){
return lang('TarifaAcabadoLineas.validation.duplicated_tirada');
$process_data['tirada_min'] = $data['data'][$pkey]['tirada_min'];
$process_data['tirada_max'] = $data['data'][$pkey]['tirada_max'];
$response = $this->model->checkIntervals($process_data, $pkey, $data['data'][$pkey]['tarifa_manipulado_id']);
// No se pueden duplicar valores al crear o al editar
if (!empty($response)){
return $response;
}
}
}