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

añadido orden multipla maquinaspapelesimpresion

Browse Source
This commit is contained in:
Jaime Jimenez
2023-09-25 18:07:07 +02:00
parent 011ecca043
commit 834ba3488d
4 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ci4/app/Controllers/Configuracion/Maquinaspapelesimpresion.php
View File

@ -78,8 +78,17 @@ class Maquinaspapelesimpresion extends \App\Controllers\GoBaseResourceController
$length = $reqData['length'] ?? 5;
$search = $reqData['search']['value'];
$requestedOrder = $reqData['order']['0']['column'] ?? 1;
$order = MaquinasPapelesImpresionModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 1];
$requestedOrder2 = $reqData['order']['1']['column'] ?? $requestedOrder;
$requestedOrder3 = $reqData['order']['2']['column'] ?? $requestedOrder;
$requestedOrder4 = $reqData['order']['3']['column'] ?? $requestedOrder;
$order = MaquinasPapelesImpresionModel::SORTABLE[$requestedOrder >= 0 ? $requestedOrder : 0];
$order2 = MaquinasPapelesImpresionModel::SORTABLE[$requestedOrder2 >= 0 ? $requestedOrder2 : $requestedOrder];
$order3 = MaquinasPapelesImpresionModel::SORTABLE[$requestedOrder3 >= 0 ? $requestedOrder3 : $requestedOrder];
$order4 = MaquinasPapelesImpresionModel::SORTABLE[$requestedOrder4 >= 0 ? $requestedOrder4 : $requestedOrder];
$dir = $reqData['order']['0']['dir'] ?? 'asc';
$dir2 = $reqData['order']['1']['dir'] ?? $dir;
$dir3 = $reqData['order']['2']['dir'] ?? $dir;
$dir4= $reqData['order']['3']['dir'] ?? $dir;
$maquina_id = $reqData['maquina_id'] ?? -1;
// Para saber si el papel que se tiene que mostrar es para rotativa
@ -88,11 +97,12 @@ class Maquinaspapelesimpresion extends \App\Controllers\GoBaseResourceController
// Se obtienen las líneas de las tarifas seleccionadas para esta máquina
$tarifas = $tarifa_model->getResource("", $maquina_id)->get()->getResultObject();
$resourceData = $this->model->getResource($search, $isRotativa, $tarifas, $maquina_id)->orderBy($order, $dir)->limit($length, $start)->get()->getResultObject();
$resourceData = $this->model->getResource($search, $isRotativa, $tarifas, $maquina_id)
->orderBy($order, $dir)->orderBy($order2, $dir2)->orderBy($order3, $dir3)->orderBy($order4, $dir4)->limit($length, $start)->get()->getResultObject();
return $this->respond(Collection::datatable(
$resourceData,
$this->model->getResource()->countAllResults(),
$this->model->getResource("", $isRotativa, $tarifas, $maquina_id)->countAllResults(),
$this->model->getResource($search, $isRotativa, $tarifas, $maquina_id)->countAllResults()
));
} else {

4
ci4/app/Language/es/Maquinas.php
View File

@ -12,8 +12,8 @@ return [
'createdAt' => 'Created At',
'deletedAt' => 'Deleted At',
'duracionJornada' => 'Duracion Jornada',
'forzarNumFormasHorizontalesPortada' => 'Forzar Num Formas Horizontales Portada',
'forzarNumFormasVerticalesPortada' => 'Forzar Num Formas Verticales Portada',
'forzarNumFormasHorizontalesPortada' => 'Forzar Num Formas Horizontales Cubierta',
'forzarNumFormasVerticalesPortada' => 'Forzar Num Formas Verticales Cubierta',
'id' => 'ID',
'impresion' => 'impresion',
'isDeleted' => 'Is Deleted',

6
ci4/app/Services/PresupuestoService.php
View File

@ -120,7 +120,7 @@ class PresupuestoService extends BaseService
$papel = (object) array('id' => 529, 'gramaje'=>80, "precio_tonelada"=>10);
$papel = (object) array('id' => 201, 'gramaje'=>70, "precio_tonelada"=>1750);
$maquina = (object) array('alto' => 120, 'ancho'=>200);
echo PresupuestoService::getPrecioPliego($maquina, $papel,2);
}
@ -245,9 +245,9 @@ class PresupuestoService extends BaseService
$margen = (new \App\Models\Configuracion\PapelImpresionMargenModel())->getMargenFormPags($papel_impresion->id, $paginas);
if(count($margen)>0){
$peso_por_pliego = $maquina->alto * $maquina->ancho * $papel_impresion->gramaje / 1000000;
$precio_pliego = $papel_impresion->precio_tonelada*(1+(intVal($margen[0]['margen'])/100)) / 1000000 * $peso_por_pliego;
$precio_pliego = $papel_impresion->precio_tonelada*(1+(floatval($margen[0]['margen'])/100.0)) / 1000000 * $peso_por_pliego;
return round($precio_pliego * 1.04, 6);
return round($precio_pliego, 6);
}
return -1;
}

18
ci4/app/Views/themes/backend/vuexy/form/configuracion/maquinas/viewMaquinaForm.php
View File

@ -478,13 +478,14 @@
processing: true,
autoWidth: true,
responsive: true,
lengthMenu: [ 5, 10, 25],
lengthMenu: [ 5, 10, 25, 50, 75, 100, 250],
order: [[ 1, "asc" ]],
pageLength: 10,
pageLength: 25,
lengthChange: true,
searching: true,
paging: true,
info: true,
stateSave: true,
dom: "lftp",
ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('dataTableOfMaquinasPapelesImpresion') ?>',
@ -521,8 +522,11 @@
columnDefs: [
{
orderable: false,
searchable: false,
targets: [lastColNr2]
},
{
searchable: false,
targets: [0,3,4,5,6,7,8,lastColNr2]
}
],
rowCallback: function (row, data) {
@ -531,13 +535,7 @@
},
language: {
url: "//cdn.datatables.net/plug-ins/1.13.4/i18n/<?= config('Basics')->i18n ?>.json"
},
columnDefs: [
{
searchable: false,
targets: [0,3,4,5,6,7,8]
}
],
}
} );