Merge branch 'main' into 'add/tabla_credito_presupuesto'

Main

See merge request jjimenez/safekat!623
This commit is contained in:
2025-03-29 10:31:40 +00:00
26 changed files with 651 additions and 205 deletions

View File

@ -193,8 +193,16 @@ class Ordentrabajo extends BaseController
$q = $this->produccionService->papelGramajeDatatableQuery();
return DataTable::of($q)
->edit("tiempoReal", fn($q) => float_seconds_to_hhmm_string($q->tiempoReal * 3600))
->add("metros", fn($q) => $q->papel_ancho*$q->totalTirada/1000)
->edit("tiempoReal", fn($q) => $q->tiempoReal * 3600)
->add("action", fn($q) => ["title" => lang('Produccion.datatable.filter_by_task'), 'data' => $q])
->toJson(true);
}
public function papel_pliego_datatable()
{
$q = $this->produccionService->papelPliegoDatatableQuery();
return DataTable::of($q)
->edit("tiempoReal", fn($q) => $q->tiempoReal * 3600)
->add("action", fn($q) => ["title" => lang('Produccion.datatable.filter_by_task'), 'data' => $q])
->toJson(true);
}
@ -266,9 +274,17 @@ class Ordentrabajo extends BaseController
->edit("fecha_entrega_real_at", fn($q) => $q->fecha_entrega_real_at ? Time::createFromFormat("Y-m-d", $q->fecha_entrega_real_at)->format("d/m/Y") : "")
->add("metros_check", fn($q) => $q->otId)
->add("corte", fn($q) => $q->otId)
->add("metros", fn($q) => $q->papel_ancho*$q->ot_tirada/1000)
->add("action", fn($q) => $q)
->toJson(true);
}
public function planning_plana_datatable()
{
$q = $this->produccionService->planningPlanaQueryDatatable();
return DataTable::of($q)
->edit("fecha_entrega_real_at", fn($q) => $q->fecha_entrega_real_at ? Time::createFromFormat("Y-m-d", $q->fecha_entrega_real_at)->format("d/m/Y") : "")
->add("pliegos_check", fn($q) => $q->otId)
->add("action", fn($q) => $q)
->toJson(true);
}
}