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

Merge branch 'main' into 'bug/presupuesto_cliente'

Browse Source 
Main

See merge request jjimenez/safekat!245
This commit is contained in:
Jaime Jimenez Ortega
2024-05-17 09:27:00 +00:00
parent fa0e344b76 5bfdb50a83
commit 9fd701a6b4
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ci4/app/Controllers/Tarifas/Tarifaencuadernacionlineas.php
View File

@ -351,13 +351,25 @@ class Tarifaencuadernacionlineas extends \App\Controllers\BaseResourceController
$start = $reqData['start'] ?? 0; $start = $reqData['start'] ?? 0;
$length = $reqData['length'] ?? 5; $length = $reqData['length'] ?? 5;
$search = $reqData['search']['value']; $search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 0; $requestedOrder = $reqData['order']['0']['column'] ?? 0;
$order = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0]; $order = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
$dir = $reqData['order']['0']['dir'] ?? 'asc'; $dir = $reqData['order']['0']['dir'] ?? 'asc';
$requestedOrder1 = $reqData['order']['0']['column'] ?? 0;
$order1 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder1 >= 0 ? $requestedOrder1 : 0];
$dir1 = $reqData['order']['1']['dir'] ?? 'asc';
$requestedOrder2 = $reqData['order']['1']['column'] ?? 0;
$order2 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : 0];
$dir2 = $reqData['order']['1']['dir'] ?? 'asc';
$requestedOrder3 = $reqData['order']['2']['column'] ?? 0;
$order3 = TarifaEncuadernacionLineaModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : 0];
$dir3 = $reqData['order']['2']['dir'] ?? 'asc';
$id_TE = $reqData['tirada_id'] ?? -1; $id_TE = $reqData['tirada_id'] ?? -1;
$resourceData = $this->model->getResource("", $id_TE)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); $resourceData = $this->model->getResource("", $id_TE)->
orderBy($order1, $dir1)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable( return $this->respond(Collection::datatable(
$resourceData, $resourceData,

15
ci4/app/Models/Tarifas/TarifaEncuadernacionLineaModel.php
View File

@ -13,12 +13,13 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
protected $useAutoIncrement = true; protected $useAutoIncrement = true;
const SORTABLE = [ const SORTABLE = [
0 => "t1.dimensiones_id", 0 => "t1.id",
1 => "t1.paginas_libro_min", 1 => "t1.dimensiones_id",
2 => "t1.paginas_libro_max", 2 => "t1.paginas_libro_min",
3 => "t1.precio_min", 3 => "t1.paginas_libro_max",
4 => "t1.precio_max", 4 => "t1.precio_min",
]; 5 => "t1.precio_max",
];
protected $allowedFields = [ protected $allowedFields = [
"tirada_encuadernacion_id", "tirada_encuadernacion_id",
@ -119,7 +120,7 @@ class TarifaEncuadernacionLineaModel extends \App\Models\BaseModel
->table($this->table . " t1") ->table($this->table . " t1")
->select( ->select(
"t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.paginas_libro_min AS paginas_libro_min, t1.paginas_libro_max AS paginas_libro_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.tirada_min AS tirada_min, "t1.id AS id, t1.tirada_encuadernacion_id AS tirada_encuadernacion_id, t1.paginas_libro_min AS paginas_libro_min, t1.paginas_libro_max AS paginas_libro_max, t1.precio_min AS precio_min, t1.precio_max AS precio_max, t1.tirada_min AS tirada_min,
t1.tirada_max AS tirada_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max" t1.tirada_max AS tirada_max, t1.margen AS margen, t2.id AS tarifa_encuadernacion, t3.id AS dimensiones_id, t3.ancho_min, t3.ancho_max, , t3.alto_min, t3.alto_max, t3.descripcion as descripcion"
); );
//JJO //JJO
$builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id); $builder->where('tirada_encuadernacion_id', $tirada_encuadernacion_id);