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 'bug/ordenar_tarifas' into 'main'

Browse Source 
solucionado el problema de ordenar tarifas enc tiradas

See merge request jjimenez/safekat!206
This commit is contained in:
Jaime Jimenez Ortega
2024-04-10 19:03:25 +00:00
parent 7e9a736f2c 3d7992355a
commit 845771ae08
4 changed files with 5312 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
ci4/app/Controllers/Tarifas/Tarifaencuadernaciontiradas.php
View File

@ -196,15 +196,24 @@ class Tarifaencuadernaciontiradas extends \App\Controllers\GoBaseResourceControl
$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;
$order = TarifaEncuadernacionTiradaModel::SORTABLE[$requestedOrder > 0 ? $requestedOrder : 1]; $requestedOrder0 = $reqData['order']['0']['column'] ?? 0;
$dir = $reqData['order']['0']['dir'] ?? 'asc'; $order0 = TarifaEncuadernacionTiradaModel::SORTABLE[$requestedOrder0 >= 0 ? $requestedOrder0 : 1];
$dir0 = $reqData['order']['0']['dir'] ?? 'asc';
$requestedOrder1 = $reqData['order']['1']['column'] ?? $requestedOrder0;
$order1 = TarifaEncuadernacionTiradaModel::SORTABLE[$requestedOrder1 >= 0 ? $requestedOrder1 : 1];
$dir1 = $reqData['order']['1']['dir'] ?? 'asc';
$requestedOrder2 = $reqData['order']['2']['column'] ?? $requestedOrder0;
$order2 = TarifaEncuadernacionTiradaModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : 1];
$dir2 = $reqData['order']['2']['dir'] ?? 'asc';
$id_TM = $reqData['id_tarifaencuadernacion'] ?? -1; $id_TM = $reqData['id_tarifaencuadernacion'] ?? -1;
$model = new TarifaEncuadernacionTiradaModel(); $model = new TarifaEncuadernacionTiradaModel();
$resourceData = $model->getResource("", $id_TM)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject(); $resourceData = $model->getResource("", $id_TM)->
orderBy($order0, $dir0)->orderBy($order1, $dir1)->orderBy($order2, $dir2)->
limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable( return $this->respond(Collection::datatable(
$resourceData, $resourceData,

6
ci4/app/Models/Tarifas/TarifaEncuadernacionTiradaModel.php
View File

@ -13,9 +13,9 @@ class TarifaEncuadernacionTiradaModel extends \App\Models\GoBaseModel
protected $useAutoIncrement = true; protected $useAutoIncrement = true;
const SORTABLE = [ const SORTABLE = [
1 => "t3.nombre", 0 => "t3.nombre",
2 => "t1.tirada_min", 1 => "t1.tirada_min",
3 => "t1.tirada_max", 2 => "t1.tirada_max",
]; ];

1
ci4/app/Views/themes/backend/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
View File

@ -751,7 +751,6 @@
searchable: false, searchable: false,
targets: [lastColNr2] targets: [lastColNr2]
}, },
{"orderData": [ 0, 1 ], "targets": 1 },
], ],
language: { language: {

5296
xdebug.log
View File

File diff suppressed because it is too large Load Diff