From 46176adc7052412e9a7db393296eb4c38633f00c Mon Sep 17 00:00:00 2001 From: amazuecos Date: Mon, 5 May 2025 07:53:36 +0200 Subject: [PATCH] fix show form cosido in ot task --- .../Controllers/Produccion/Ordentrabajo.php | 3 ++- .../Produccion/OrdenTrabajoTareaEntity.php | 2 +- .../Tarifas/TarifaEncuadernacionEntity.php | 5 +++- .../Tarifas/TarifaManipuladoEntity.php | 2 +- ci4/app/Services/ProductionService.php | 24 +++++++++---------- .../vuexy/form/produccion/ot/otDates.php | 11 +-------- 6 files changed, 21 insertions(+), 26 deletions(-) diff --git a/ci4/app/Controllers/Produccion/Ordentrabajo.php b/ci4/app/Controllers/Produccion/Ordentrabajo.php index 0cf73fce..e2b1cee1 100755 --- a/ci4/app/Controllers/Produccion/Ordentrabajo.php +++ b/ci4/app/Controllers/Produccion/Ordentrabajo.php @@ -219,8 +219,9 @@ class Ordentrabajo extends BaseController $this->viewData["user_dates"] = $this->produccionService->userDates(); $this->viewData["pedido_user_dates"] = $this->produccionService->pedidoUserDates(); $this->viewData["colors"] = $this->produccionService->getPdfColors(); - $this->viewData["tiempo_estimado"] = $this->produccionService->getTiempoProcesamientoHHMM(); + $this->viewData["tiempo_estimado"] = $this->produccionService->getTiempoProcesamientoHHMMSS(); $this->viewData["flags"] = $this->produccionService->getFlags(); + $this->viewData["tareaCosido"] = $this->produccionService->getTareaCosido(); return view(static::$viewPath . $this->editRoute, $this->viewData); diff --git a/ci4/app/Entities/Produccion/OrdenTrabajoTareaEntity.php b/ci4/app/Entities/Produccion/OrdenTrabajoTareaEntity.php index c90de2b9..c01a327f 100755 --- a/ci4/app/Entities/Produccion/OrdenTrabajoTareaEntity.php +++ b/ci4/app/Entities/Produccion/OrdenTrabajoTareaEntity.php @@ -212,7 +212,7 @@ class OrdenTrabajoTareaEntity extends Entity public function isCosido(): bool { $isTareaCosido = false; - $pm = $this->presupuesto_manipulado(); + $pm = $this->presupuesto_encuadernacion(); if ($pm) { $isTareaCosido = $pm->tarifa()->isCosido(); } diff --git a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php index 608ebf37..f43d64de 100755 --- a/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaEncuadernacionEntity.php @@ -40,7 +40,10 @@ class TarifaEncuadernacionEntity extends \CodeIgniter\Entity\Entity $words_initial = array_map(fn($w) => substr(strtoupper($w),0,1),$words); return implode("",$words_initial); } - + public function isCosido(): bool + { + return in_array($this->attributes['id'], [3, 17]); + } } diff --git a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php index 5c48cd96..3ddf5ac9 100755 --- a/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php +++ b/ci4/app/Entities/Tarifas/TarifaManipuladoEntity.php @@ -36,6 +36,6 @@ class TarifaManipuladoEntity extends \CodeIgniter\Entity\Entity public function isCosido(): bool { - return in_array($this->attributes['id'], [3, 17]); + return in_array($this->attributes['id'], [2, 3, 17, 45]); } } diff --git a/ci4/app/Services/ProductionService.php b/ci4/app/Services/ProductionService.php index 1a5349d1..56d3c1d8 100755 --- a/ci4/app/Services/ProductionService.php +++ b/ci4/app/Services/ProductionService.php @@ -873,7 +873,7 @@ class ProductionService extends BaseService "tareas_encuadernacion" => $this->tareas_encuadernacion(), "tareas_preimpresion" => $this->tareas_preimpresion(), "tareas_impresion" => $this->tareas_impresion(), - "tiempo_procesamiento" => $this->getTiempoProcesamientoHHMM(), + "tiempo_procesamiento" => $this->getTiempoProcesamientoHHMMSS(), "tiempo_total" => $this->getTiempoTotalTareas(), "statusColor" => $this->getOtColorStatus(), "tareaCosido" => $this->getTareaCosido(), @@ -902,8 +902,8 @@ class ProductionService extends BaseService "peso_unidad" => $logistica_data["peso_unidad"], "peso_pedido" => $logistica_data["peso_pedido"], "imposicion" => $this->getImposicionTareaImpresion(), - "tiempo_procesamiento" => $this->getTiempoProcesamientoHHMM(), - "tiempo_impresion" => $this->getTiempoTareasImpresionHHMM(), + "tiempo_procesamiento" => $this->getTiempoProcesamientoHHMMSS(), + "tiempo_impresion" => $this->getTiempoTareasImpresionHHMMSS(), "colors" => $this->getPdfColors(), "isPOD" => $this->isPOD, "uvi" => $this->getUVI(), @@ -1435,17 +1435,17 @@ class ProductionService extends BaseService } return $pedidoUserDates; } - public function getTiempoProcesamientoHHMM(): ?string + public function getTiempoProcesamientoHHMMSS(): ?string { try { $time_tareas_seconds = array_map(fn($q) => $q->tiempo_estimado ?? 0, $this->ot->tareas()); $seconds = array_sum($time_tareas_seconds); - return float_seconds_to_hhmm_string($seconds); + return float_seconds_to_hhmmss_string($seconds); } catch (\Throwable $th) { - return '00:00'; + return '00:00:00'; } } - public function getTiempoTareasImpresionHHMM(): string + public function getTiempoTareasImpresionHHMMSS(): string { try { $tareas_impresion = $this->ot->tareas_impresion(); @@ -1455,7 +1455,7 @@ class ProductionService extends BaseService $tiempo_seconds += $tarea->tiempo_estimado; } } - return float_seconds_to_hhmm_string($tiempo_seconds); + return float_seconds_to_hhmmss_string($tiempo_seconds); } catch (\Throwable $th) { return '00:00'; } @@ -1845,10 +1845,10 @@ class ProductionService extends BaseService public function cosido(): bool { $flag = false; - $manipulados = $this->presupuesto->manipulados(); - foreach ($manipulados as $key => $manipulado) { - $tarifa_manipulado = $manipulado->tarifa(); - if ($tarifa_manipulado->isCosido()) { + $encuadernaciones = $this->presupuesto->encuadernaciones(); + foreach ($encuadernaciones as $key => $encuadernacion) { + $tarifaEncuadernacionEntity = $encuadernacion->tarifa(); + if ($tarifaEncuadernacionEntity->isCosido()) { $flag = true; break; } diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php index 5182f889..801461df 100755 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php @@ -15,7 +15,7 @@
- +
@@ -99,15 +99,6 @@
- - -
- -
- - -
-