fix bugs sk-7

This commit is contained in:
amazuecos
2025-03-31 00:17:49 +02:00
parent 4991642d48
commit ba0ad10935
16 changed files with 204 additions and 56 deletions

View File

@ -2,6 +2,7 @@
namespace App\Entities\Presupuestos;
use App\Entities\Tarifas\TarifaEncuadernacionEntity;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Tarifas\Maquinas\TarifaEncuadernacionMaquinaModel;
use App\Models\Tarifas\TarifaEncuadernacionModel;
use CodeIgniter\Entity;
@ -34,7 +35,13 @@ class PresupuestoEncuadernacionesEntity extends \CodeIgniter\Entity\Entity
public function maquinas() : array
{
$m = model(TarifaEncuadernacionMaquinaModel::class);
return $m->where("tarifa_encuadernacion_id",$this->attributes["tarifa_encuadernado_id"])->findAll();
$tarifa_maquinas = $m->where("tarifa_encuadernacion_id",$this->attributes["tarifa_encuadernado_id"])->findAll();
$maquinaModel = model(MaquinaModel::class);
$maquinas = [];
foreach ($tarifa_maquinas as $key => $tarifa_maquina) {
$maquinas[] = $maquinaModel->find($tarifa_maquina->maquina_id);
}
return $maquinas;
}
public function tarifa() : TarifaEncuadernacionEntity
{

View File

@ -2,6 +2,7 @@
namespace App\Entities\Presupuestos;
use App\Entities\Tarifas\TarifaManipuladoEntity;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Tarifas\Maquinas\TarifaManipuladoMaquinaModel;
use App\Models\Tarifas\TarifaManipuladoModel;
use CodeIgniter\Entity;
@ -28,7 +29,13 @@ class PresupuestoManipuladosEntity extends \CodeIgniter\Entity\Entity
public function maquinas() : array
{
$m = model(TarifaManipuladoMaquinaModel::class);
return $m->where("tarifa_manipulado_id",$this->attributes["tarifa_manipulado_id"])->findAll();
$tarifa_maquinas = $m->where("tarifa_manipulado_id",$this->attributes["tarifa_manipulado_id"])->findAll();
$maquinaModel = model(MaquinaModel::class);
$maquinas = [];
foreach ($tarifa_maquinas as $key => $tarifa_maquina) {
$maquinas[] = $maquinaModel->find($tarifa_maquina->maquina_id);
}
return $maquinas;
}
public function tarifa() : TarifaManipuladoEntity
{

View File

@ -2,6 +2,7 @@
namespace App\Entities\Presupuestos;
use App\Entities\Tarifas\TarifapreimpresionEntity;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Tarifas\Maquinas\TarifaPreimpresionMaquinaModel;
use App\Models\Tarifas\TarifapreimpresionModel;
use CodeIgniter\Entity;
@ -26,7 +27,13 @@ class PresupuestoPreimpresionesEntity extends \CodeIgniter\Entity\Entity
public function maquinas() : array
{
$m = model(TarifaPreimpresionMaquinaModel::class);
return $m->where("tarifa_preimpresion_id",$this->attributes["tarifa_preimpresion_id"])->findAll();
$tarifa_maquinas = $m->where("tarifa_preimpresion_id",$this->attributes["tarifa_preimpresion_id"])->findAll();
$maquinaModel = model(MaquinaModel::class);
$maquinas = [];
foreach ($tarifa_maquinas as $key => $tarifa_maquina) {
$maquinas[] = $maquinaModel->find($tarifa_maquina->maquina_id);
}
return $maquinas;
}
public function tarifa() : TarifapreimpresionEntity
{

View File

@ -2,6 +2,7 @@
namespace App\Entities\Presupuestos;
use App\Entities\Tarifas\TarifaextraEntity;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Tarifas\Maquinas\TarifaExtraMaquinaModel;
use App\Models\Tarifas\TarifaextraModel;
use CodeIgniter\Entity;
@ -27,7 +28,13 @@ class PresupuestoServiciosExtraEntity extends \CodeIgniter\Entity\Entity
public function maquinas() : array
{
$m = model(TarifaExtraMaquinaModel::class);
return $m->where("tarifa_extra_id",$this->attributes["tarifa_extra_id"])->findAll();
$tarifa_maquinas = $m->where("tarifa_extra_id",$this->attributes["tarifa_extra_id"])->findAll();
$maquinaModel = model(MaquinaModel::class);
$maquinas = [];
foreach ($tarifa_maquinas as $key => $tarifa_maquina) {
$maquinas[] = $maquinaModel->find($tarifa_maquina->maquina_id);
}
return $maquinas;
}
public function tarifa() : TarifaextraEntity
{

View File

@ -2,7 +2,9 @@
namespace App\Entities\Tarifas\Maquinas;
use App\Entities\Configuracion\Maquina;
use App\Entities\Tarifas\TarifaEncuadernacionEntity;
use App\Models\Configuracion\MaquinaModel;
use App\Models\Tarifas\TarifaEncuadernacionModel;
use CodeIgniter\Entity\Entity;
@ -31,4 +33,9 @@ class TarifaEncuadernacionMaquinaEntity extends Entity
$m = model(TarifaEncuadernacionModel::class);
return $m->find($this->attributes["tarifa_encuadernacion_id"]);
}
public function maquina(): ?Maquina
{
$m = model(MaquinaModel::class);
return $m->find($this->attributes['maquina_id']);
}
}

View File

@ -6,7 +6,8 @@ use App\Entities\Tarifas\TarifaextraEntity;
use App\Models\Tarifas\Acabados\TarifaAcabadoModel;
use App\Models\Tarifas\TarifaextraModel;
use CodeIgniter\Entity\Entity;
use App\Entities\Configuracion\Maquina;
use App\Models\Configuracion\MaquinaModel;
class TarifaExtraMaquinaEntity extends Entity
{
@ -29,4 +30,9 @@ class TarifaExtraMaquinaEntity extends Entity
$m = model(TarifaextraModel::class);
return $m->find($this->attributes["tarifa_extra_id"]);
}
public function maquina(): ?Maquina
{
$m = model(MaquinaModel::class);
return $m->find($this->attributes['maquina_id']);
}
}

View File

@ -4,7 +4,8 @@ namespace App\Entities\Tarifas\Maquinas;
use App\Entities\Tarifas\TarifaManipuladoEntity;
use App\Models\Tarifas\TarifaManipuladoModel;
use CodeIgniter\Entity\Entity;
use App\Entities\Configuracion\Maquina;
use App\Models\Configuracion\MaquinaModel;
class TarifaManipuladoMaquinaEntity extends Entity
{
@ -28,4 +29,9 @@ class TarifaManipuladoMaquinaEntity extends Entity
$m = model(TarifaManipuladoModel::class);
return $m->find($this->attributes["tarifa_manipulado_id"]);
}
public function maquina(): ?Maquina
{
$m = model(MaquinaModel::class);
return $m->find($this->attributes['maquina_id']);
}
}

View File

@ -4,7 +4,8 @@ namespace App\Entities\Tarifas\Maquinas;
use App\Entities\Tarifas\TarifapreimpresionEntity;
use App\Models\Tarifas\TarifapreimpresionModel;
use CodeIgniter\Entity\Entity;
use App\Entities\Configuracion\Maquina;
use App\Models\Configuracion\MaquinaModel;
class TarifaPreimpresionMaquinaEntity extends Entity
{
@ -28,4 +29,9 @@ class TarifaPreimpresionMaquinaEntity extends Entity
$m = model(TarifapreimpresionModel::class);
return $m->find($this->attributes["tarifa_preimpresion_id"]);
}
public function maquina(): ?Maquina
{
$m = model(MaquinaModel::class);
return $m->find($this->attributes['maquina_id']);
}
}