From 8c64b678fe5a8434bfe652ada622a284093cf433 Mon Sep 17 00:00:00 2001 From: amazuecos Date: Sat, 29 Mar 2025 11:07:36 +0100 Subject: [PATCH] planning plana --- ci4/app/Config/RBAC/permissionMatrix.php | 2 + ci4/app/Config/Routes.php | 3 + .../Controllers/Produccion/Ordentrabajo.php | 22 +- .../Presupuestos/PresupuestoLineaEntity.php | 4 + ci4/app/Language/es/App.php | 2 + ci4/app/Language/es/Produccion.php | 7 +- .../Models/OrdenTrabajo/OrdenTrabajoDate.php | 10 +- .../Maquinas/TarifaExtraMaquinaModel.php | 2 +- ci4/app/Services/ChatService.php | 2 +- ci4/app/Services/ProductionService.php | 128 ++++++++- .../tables/planning_papel_gramaje_table.php | 2 +- .../tables/planning_papel_pliego_table.php | 29 ++ .../tables/planning_plana_table.php | 43 +++ .../components/tables/planning_rot_table.php | 16 +- .../vuexy/form/produccion/ot/otCosts.php | 5 +- .../vuexy/form/produccion/ot/otDates.php | 5 +- .../vuexy/form/produccion/ot/otDetails.php | 94 +++++-- .../vuexy/form/produccion/ot/otHeader.php | 45 ++++ .../vuexy/form/produccion/ot/otPortada.php | 6 +- .../vuexy/form/produccion/ot/otProgress.php | 5 +- .../vuexy/form/produccion/ot/otTask.php | 5 +- .../produccion/ot/viewPlanningRotativa.php | 64 ++++- .../form/produccion/viewOrdenTrabajoEdit.php | 73 +----- .../vuexy/main/menus/produccion_menu.php | 2 +- httpdocs/assets/img/cortadora_bobinas.png | Bin 0 -> 9888 bytes httpdocs/assets/img/guillotina.png | Bin 0 -> 10150 bytes .../assets/js/safekat/pages/produccion/ot.js | 40 +-- .../planning_rotativa/planning_rotativa.js | 248 ++++++++++++++---- 28 files changed, 655 insertions(+), 209 deletions(-) create mode 100644 ci4/app/Views/themes/vuexy/components/tables/planning_papel_pliego_table.php create mode 100644 ci4/app/Views/themes/vuexy/components/tables/planning_plana_table.php create mode 100644 ci4/app/Views/themes/vuexy/form/produccion/ot/otHeader.php create mode 100644 httpdocs/assets/img/cortadora_bobinas.png create mode 100644 httpdocs/assets/img/guillotina.png diff --git a/ci4/app/Config/RBAC/permissionMatrix.php b/ci4/app/Config/RBAC/permissionMatrix.php index e0b0fec1..c60bd757 100644 --- a/ci4/app/Config/RBAC/permissionMatrix.php +++ b/ci4/app/Config/RBAC/permissionMatrix.php @@ -194,6 +194,8 @@ const SK_PERMISSION_MATRIX = [ "pedidos-cancelados.menu", "pedidos-todos.view", "pedidos-todos.menu", + "pedidos-gestion.toprod", + "pedidos-gestion.menu", "tarifa-preimpresion.create", "tarifa-preimpresion.edit", "tarifa-preimpresion.menu", diff --git a/ci4/app/Config/Routes.php b/ci4/app/Config/Routes.php index a894926d..f0336fbe 100644 --- a/ci4/app/Config/Routes.php +++ b/ci4/app/Config/Routes.php @@ -1001,7 +1001,10 @@ $routes->group('produccion', ['namespace' => 'App\Controllers\Produccion'], func $routes->group('planning', ['namespace' => 'App\Controllers\Produccion'], function ($routes) { $routes->get('rotativa', 'Ordentrabajo::index_planning_rotativa'); $routes->get('papel/datatable', 'Ordentrabajo::papel_gramaje_datatable'); + $routes->get('papel/plana/datatable', 'Ordentrabajo::papel_pliego_datatable'); $routes->get('rotativa/datatable', 'Ordentrabajo::planning_rotativa_datatable'); + $routes->get('plana/datatable', 'Ordentrabajo::planning_plana_datatable'); + }); }); }); diff --git a/ci4/app/Controllers/Produccion/Ordentrabajo.php b/ci4/app/Controllers/Produccion/Ordentrabajo.php index 6834ecf0..cfb354c7 100755 --- a/ci4/app/Controllers/Produccion/Ordentrabajo.php +++ b/ci4/app/Controllers/Produccion/Ordentrabajo.php @@ -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); + } } diff --git a/ci4/app/Entities/Presupuestos/PresupuestoLineaEntity.php b/ci4/app/Entities/Presupuestos/PresupuestoLineaEntity.php index f0705d98..247a12ec 100755 --- a/ci4/app/Entities/Presupuestos/PresupuestoLineaEntity.php +++ b/ci4/app/Entities/Presupuestos/PresupuestoLineaEntity.php @@ -221,4 +221,8 @@ class PresupuestoLineaEntity extends \CodeIgniter\Entity\Entity return $nombre; } + public function isRotativa() : bool + { + return in_array($this->attributes['tipo'],['lp_rot_color','lp_rot_bn']); + } } diff --git a/ci4/app/Language/es/App.php b/ci4/app/Language/es/App.php index db627a10..d1875d70 100755 --- a/ci4/app/Language/es/App.php +++ b/ci4/app/Language/es/App.php @@ -791,6 +791,8 @@ return [ "menu_orden_trabajo_finalizados" => "OTs finalizados", "menu_orden_trabajo_pendientes" => "OTs pendientes", "menu_planning_rotativa" => "Planning rotativa", + "menu_planning" => "Plannings", + "menu_ordentrabajomaquetacion" => "Orden de trabajo maquetación", "menu_ordenmaquina" => "Orden máquina", diff --git a/ci4/app/Language/es/Produccion.php b/ci4/app/Language/es/Produccion.php index fdceace1..da69474a 100644 --- a/ci4/app/Language/es/Produccion.php +++ b/ci4/app/Language/es/Produccion.php @@ -25,7 +25,9 @@ return [ "logo" => "Logo impresion", "filter_by_task" => "Filtrar por tarea", "metros" => "Metros", - "corte" => "Corte" + "corte" => "Corte", + "pliegos" => "Pliegos", + "pliegos_libro" => "Pliegos" ], @@ -71,7 +73,8 @@ return [ "preview_pdf" => "Previsualizar PDF", "imprimir_codigo_safekat" => "Imprimir código SAFEKAT", "imprimir_ferro" => "Imprimir ferro", - "planning_rotativa" => "Tareas rotativa", + "planning_rotativa" => "Planificación rotativa", + "planning_plana" => "Planificación plana", "solapa" => "Solapa", "papel_gramajes" => "Papel y gramajes" diff --git a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php index bd7ff3a0..d6a7d7c1 100644 --- a/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php +++ b/ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php @@ -61,9 +61,9 @@ class OrdenTrabajoDate extends Model // Callbacks protected $allowCallbacks = true; protected $beforeInsert = []; - protected $afterInsert = ["updateOrdenTrabajoUser"]; + protected $afterInsert = []; protected $beforeUpdate = []; - protected $afterUpdate = ["updateOrdenTrabajoUser"]; + protected $afterUpdate = []; protected $beforeFind = []; protected $afterFind = []; protected $beforeDelete = []; @@ -102,7 +102,7 @@ class OrdenTrabajoDate extends Model } return $data; } - protected function updateUserDateMap($data,$values){ + public function updateUserDateMap($orden_trabajo_id,$data){ $mapping = [ "fecha_encuadernado_at" => "encuadernacion_user_id", // "fecha_externo_at" => "null", @@ -121,10 +121,10 @@ class OrdenTrabajoDate extends Model ]; $otUser = model(OrdenTrabajoUser::class); $auth_user_id = auth()->user()->id; - foreach ($values as $key => $value) { + foreach ($data as $key => $value) { if(isset($mapping[$key])){ if($value){ - $otUser->where('orden_trabajo_id',$data['orden_trabajo_id']) + $otUser->where('orden_trabajo_id',$orden_trabajo_id) ->set([$mapping[$key] => $auth_user_id]) ->update(); } diff --git a/ci4/app/Models/Tarifas/Maquinas/TarifaExtraMaquinaModel.php b/ci4/app/Models/Tarifas/Maquinas/TarifaExtraMaquinaModel.php index 1ee4be1e..8cb8d36d 100644 --- a/ci4/app/Models/Tarifas/Maquinas/TarifaExtraMaquinaModel.php +++ b/ci4/app/Models/Tarifas/Maquinas/TarifaExtraMaquinaModel.php @@ -9,7 +9,7 @@ use CodeIgniter\Model; class TarifaExtraMaquinaModel extends Model { - protected $table = 'tarifa_acabado_maquinas'; + protected $table = 'tarifa_extra_maquinas'; protected $primaryKey = 'id'; protected $useAutoIncrement = true; protected $returnType = TarifaExtraMaquinaEntity::class; diff --git a/ci4/app/Services/ChatService.php b/ci4/app/Services/ChatService.php index 97d88a65..4a91bf92 100644 --- a/ci4/app/Services/ChatService.php +++ b/ci4/app/Services/ChatService.php @@ -22,7 +22,7 @@ use CodeIgniter\Email\Email; class ChatService extends BaseService { protected ?ChatEntity $chatEntity; - protected Email $emailService; + protected EmailService $emailService; protected UserModel $userModel; protected ChatModel $chatModel; protected ChatMessageModel $chatMessageModel; diff --git a/ci4/app/Services/ProductionService.php b/ci4/app/Services/ProductionService.php index 70b5b11f..6f9ea0c6 100644 --- a/ci4/app/Services/ProductionService.php +++ b/ci4/app/Services/ProductionService.php @@ -13,10 +13,14 @@ use App\Models\OrdenTrabajo\OrdenTrabajoTarea; use App\Models\OrdenTrabajo\OrdenTrabajoUser; use App\Models\Usuarios\UserModel; use CodeIgniter\Config\BaseService; +use App\Entities\Configuracion\Maquina as MaquinaEntity; +use App\Entities\Produccion\OrdenTrabajoTareaEntity; +use App\Models\Configuracion\MaquinaModel; use CodeIgniter\Database\BaseBuilder; use CodeIgniter\Database\BaseResult; use CodeIgniter\Database\Exceptions\DatabaseException; use CodeIgniter\I18n\Time; +use CodeIgniter\Model; use Dompdf\Dompdf; /** @@ -24,12 +28,19 @@ use Dompdf\Dompdf; */ class ProductionService extends BaseService { + public array $TIPOS_PLANA = ['lp_bn','lp_color','lp_colorhq']; + public array $TIPOS_ROTATIVA = ['lp_rot_bn','lp_rot_color']; + protected OrdenTrabajoModel $otModel; + protected OrdenTrabajoTarea $otTarea; protected OrdenTrabajoDate $otDate; protected OrdenTrabajoUser $otUser; protected OrdenTrabajoEntity $ot; protected UserModel $userModel; + protected string $defaultMaquinaCorteName = 'HT-1000'; + protected MaquinaEntity $defaultMaquinaCorte; + protected MaquinaModel $maquinaModel; protected array $MAPPING_DATE_USER = [ "fecha_encuadernado_at" => "encuadernacion_user_id", // "fecha_externo_at" => "null", @@ -70,10 +81,12 @@ class ProductionService extends BaseService } public function init(int $orden_trabajo_id): self { + $this->maquinaModel = model(MaquinaModel::class); $this->otModel = model(OrdenTrabajoModel::class); $this->ot = $this->otModel->find($orden_trabajo_id); $pedido = $this->ot->pedido(); $this->setPedido($pedido); + $this->defaultMaquinaCorte = $this->maquinaModel->where('nombre',$this->defaultMaquinaCorteName)->first(); return $this; } /** @@ -140,14 +153,17 @@ class ProductionService extends BaseService $fecha_encuadernado = Time::now()->addDays(2)->format("Y-m-d"); $fecha_entrega_real = Time::now()->addDays(5)->format("Y-m-d"); $fecha_embalaje_at = Time::now()->addDays(4)->format("Y-m-d"); - return $this->otDate->insert([ + $data = [ "orden_trabajo_id" => $this->ot->id, "fecha_encuadernado_at" => $fecha_encuadernado, "fecha_entrega_real_at" => $fecha_entrega_real, "fecha_impresion_at" => Time::now()->format("Y-m-d"), "embalaje_at" => $fecha_embalaje_at, "fecha_entrega_externo" => $this->pedido->fecha_entrega_externo, - ]); + ]; + $otDateId = $this->otDate->insert($data); + $this->otDate->updateUserDateMap($this->ot->id,$data); + return $otDateId; } protected function storeOrdenTrabajoUsers(): int|bool|string { @@ -171,7 +187,7 @@ class ProductionService extends BaseService return $r; } /** - * Inserta las tareas de la orden de trabajo. + * Inserta las tareas de la orden de trabajo.p * Acepta como argumento una entidad de la orden de trabajo OrdenTrabajoEntity * * @@ -196,9 +212,28 @@ class ProductionService extends BaseService $ot_tareas["tiempo_real"] = $p_linea->horas_maquina; //? Tiempo real se inserta manual? $insert_query_result = $this->otTarea->insert($ot_tareas); $ot_tareas = []; + $this->storeTareaCorte($p_linea); } return $insert_query_result; } + protected function storeTareaCorte(PresupuestoLineaEntity $pLinea): ?OrdenTrabajoTareaEntity + { + $otCorte = null; + if($pLinea->isRotativa()){ + $tareaId = $this->otTarea->insert([ + 'orden_trabajo_id' => $this->ot->id, + 'presupuesto_linea_id' => $pLinea->id, + 'nombre' => 'Corte', + 'maquina_id' => $this->defaultMaquinaCorte->id, + 'orden' => $this->defaultMaquinaCorte->orden_planning, + 'tiempo_estimado' => $pLinea->rotativa_tiempo_corte, + 'tiempo_real' => $pLinea->rotativa_tiempo_corte + ]); + $otCorte = $this->otTarea->find($tareaId); + } + return $otCorte; + } + protected function storeOrdenTrabajoAcabadoTareas(): bool { $p_lineas = $this->presupuesto_lineas_acabado(); @@ -404,6 +439,7 @@ class ProductionService extends BaseService "ordenes_trabajo.total_tirada as ot_tirada", "lg_papel_formato.ancho as papel_ancho", "lg_papel_formato.alto as papel_alto", + "presupuesto_linea.rotativa_metros_total as metros", // "JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_ancho') as maquina_ancho", // "JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_alto') as maquina_alto", "lg_papel_impresion.nombre as papel_impresion", @@ -422,7 +458,49 @@ class ProductionService extends BaseService ->join("lg_maquinas as lgmp", "lgmp.id = presupuesto_linea.maquina_id", "left") ->join("lg_imposiciones", "lg_imposiciones.id = orden_trabajo_tareas.imposicion_id", "left") // ->where("orden_trabajo_tareas.orden_trabajo_id", $this->ot->id) - ->whereIn("presupuesto_linea.tipo", ["lp_rot_bn", "lp_rot_color"]) + ->whereIn("presupuesto_linea.tipo", $this->TIPOS_ROTATIVA) + ->where('lg_maquinas.is_rotativa',true) + ->where("orden_trabajo_tareas.deleted_at", null) + ->orderBy("orden_trabajo_tareas.orden", "ASC"); + return $q; + } + /** + * Query para mostrar en datatable + * + * @return BaseBuilder + */ + public function planningPlanaQueryDatatable(): BaseBuilder + { + $q = $this->otModel->builder()->select([ + "ordenes_trabajo.id as otId", + "orden_trabajo_dates.fecha_entrega_real_at", + "presupuestos.titulo as presupuesto_titulo", + "orden_trabajo_tareas.maquina_id", + "lg_maquinas.nombre as maquina_planning_nombre", + "ordenes_trabajo.total_tirada as ot_tirada", + "lg_papel_formato.ancho as papel_ancho", + "lg_papel_formato.alto as papel_alto", + "presupuesto_linea.pliegos_pedido as pliegosPedido", + // "JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_ancho') as maquina_ancho", + // "JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_alto') as maquina_alto", + "lg_papel_impresion.nombre as papel_impresion", + "presupuesto_linea.gramaje as papel_gramaje", + + + + ]) + ->join("orden_trabajo_tareas", "orden_trabajo_tareas.orden_trabajo_id = ordenes_trabajo.id", "left") + ->join("orden_trabajo_dates", "orden_trabajo_dates.orden_trabajo_id = ordenes_trabajo.id", "left") + ->join("presupuesto_linea", "presupuesto_linea.id = orden_trabajo_tareas.presupuesto_linea_id", "left") + ->join("presupuestos", "presupuestos.id = presupuesto_linea.presupuesto_id", "right") + ->join("lg_papel_formato", "lg_papel_formato.id = presupuestos.papel_formato_id", "left") + ->join("lg_maquinas", "lg_maquinas.id = orden_trabajo_tareas.maquina_id", "left") + ->join("lg_papel_impresion", "lg_papel_impresion.id = presupuesto_linea.papel_impresion_id", "left") + ->join("lg_maquinas as lgmp", "lgmp.id = presupuesto_linea.maquina_id", "left") + ->join("lg_imposiciones", "lg_imposiciones.id = orden_trabajo_tareas.imposicion_id", "left") + // ->where("orden_trabajo_tareas.orden_trabajo_id", $this->ot->id) + ->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA) + ->where('lg_maquinas.is_rotativa',false) ->where("orden_trabajo_tareas.deleted_at", null) ->orderBy("orden_trabajo_tareas.orden", "ASC"); return $q; @@ -472,6 +550,7 @@ class ProductionService extends BaseService "lg_papel_formato.alto as papel_alto", // "CAST(JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_ancho') AS DOUBLE) as maquina_ancho", // "CAST(JSON_EXTRACT(presupuesto_linea.formas,'$.maquina_alto') AS DOUBLE) as maquina_alto", + "presupuesto_linea.rotativa_metros_total as metros", "SUM(ordenes_trabajo.total_tirada) as totalTirada", "SUM(orden_trabajo_tareas.tiempo_real) as tiempoReal" ]) @@ -482,6 +561,34 @@ class ProductionService extends BaseService ->join("lg_papel_formato", "lg_papel_formato.id = presupuestos.papel_formato_id", "left") ->where("orden_trabajo_tareas.deleted_at", null) ->where("orden_trabajo_tareas.presupuesto_linea_id IS NOT NULL", NULL, FALSE) + ->whereIn("presupuesto_linea.tipo", $this->TIPOS_ROTATIVA) + ->groupBy('lg_papel_impresion.id'); + + + + return $q; + } + public function papelPliegoDatatableQuery(): BaseBuilder + { + $q = $this->otModel->builder()->select([ + "lg_papel_impresion.id as papelImpresionId", + "lg_papel_impresion.nombre as papelImpresionNombre", + "lg_papel_impresion.gramaje as papelImpresionGramaje", + "COUNT(orden_trabajo_tareas.id) as tareasCount", + "lg_papel_formato.ancho as papel_ancho", + "lg_papel_formato.alto as papel_alto", + "presupuesto_linea.pliegos_pedido as pliegosPedido", + "SUM(ordenes_trabajo.total_tirada) as totalTirada", + "SUM(orden_trabajo_tareas.tiempo_real) as tiempoReal" + ]) + ->join("orden_trabajo_tareas", "orden_trabajo_tareas.orden_trabajo_id = ordenes_trabajo.id", "left") + ->join("presupuesto_linea", "presupuesto_linea.id = orden_trabajo_tareas.presupuesto_linea_id", "left") + ->join("presupuestos", "presupuestos.id = presupuesto_linea.presupuesto_id", "right") + ->join("lg_papel_impresion", "presupuesto_linea.papel_impresion_id = lg_papel_impresion.id", "left") + ->join("lg_papel_formato", "lg_papel_formato.id = presupuestos.papel_formato_id", "left") + ->where("orden_trabajo_tareas.deleted_at", null) + ->where("orden_trabajo_tareas.presupuesto_linea_id IS NOT NULL", NULL, FALSE) + ->whereIn("presupuesto_linea.tipo", $this->TIPOS_PLANA) ->groupBy('lg_papel_impresion.id'); @@ -614,18 +721,23 @@ class ProductionService extends BaseService public function updateOrdenTrabajoDate($data) { - // // return $this->otDate->find($this->ot->id); + $result = []; $otDate = $this->otDate->where('orden_trabajo_id', $this->ot->id) ->set([$data['name'] => $data[$data['name']]]) ->update($data); + $this->otDate->updateUserDateMap($this->ot->id,$data); $ot_users = $this->ot->users(); - if($this->MAPPING_DATE_USER[$data["name"]]){ + if(isset($this->MAPPING_DATE_USER[$data["name"]])){ $user_id = $ot_users->{$this->MAPPING_DATE_USER[$data["name"]]}; $user = $this->userModel->find($user_id); - return ["user" => $user, "status" => $otDate]; + if($user_id){ + $result = ["user" => null, "status" => false]; + } + $result = ["user" => $user, "status" => $otDate]; }else{ - return ["user" => null, "status" => false]; + $result = ["user" => null, "status" => false]; } + return $result; } public function updateOrdenTrabajo($data): bool diff --git a/ci4/app/Views/themes/vuexy/components/tables/planning_papel_gramaje_table.php b/ci4/app/Views/themes/vuexy/components/tables/planning_papel_gramaje_table.php index cc71352d..e8427765 100644 --- a/ci4/app/Views/themes/vuexy/components/tables/planning_papel_gramaje_table.php +++ b/ci4/app/Views/themes/vuexy/components/tables/planning_papel_gramaje_table.php @@ -19,7 +19,7 @@ Total: - (m) + diff --git a/ci4/app/Views/themes/vuexy/components/tables/planning_papel_pliego_table.php b/ci4/app/Views/themes/vuexy/components/tables/planning_papel_pliego_table.php new file mode 100644 index 00000000..51a75dca --- /dev/null +++ b/ci4/app/Views/themes/vuexy/components/tables/planning_papel_pliego_table.php @@ -0,0 +1,29 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
(gr)(HH:MM)
Total:
+
\ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/tables/planning_plana_table.php b/ci4/app/Views/themes/vuexy/components/tables/planning_plana_table.php new file mode 100644 index 00000000..e0e9aac3 --- /dev/null +++ b/ci4/app/Views/themes/vuexy/components/tables/planning_plana_table.php @@ -0,0 +1,43 @@ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ +
+
+
\ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/components/tables/planning_rot_table.php b/ci4/app/Views/themes/vuexy/components/tables/planning_rot_table.php index 7cb8e213..f12d2c00 100644 --- a/ci4/app/Views/themes/vuexy/components/tables/planning_rot_table.php +++ b/ci4/app/Views/themes/vuexy/components/tables/planning_rot_table.php @@ -19,16 +19,16 @@ - - - - - - + + + + + + - @@ -39,7 +39,7 @@ - + diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otCosts.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otCosts.php index c6d7826b..874d4a23 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otCosts.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otCosts.php @@ -3,7 +3,10 @@

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 26d44620..59aeb8cf 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php @@ -3,7 +3,10 @@

diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otDetails.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otDetails.php index 3c2279e5..e8c94487 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otDetails.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otDetails.php @@ -3,37 +3,79 @@

-
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - +
+
+
+
+
+
+
+ +
+
+
papel_formato()->ancho?>xpapel_formato()->alto?>
+ +
+
+
+
+
+
+ +
+
+
merma?>
+ +
+
+
+
+
+
+ +
+
+
solapas?>
+ + +
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+ +
+
+
merma?>
+ + +
+
+
+
+
diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otHeader.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otHeader.php new file mode 100644 index 00000000..08c29f9a --- /dev/null +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otHeader.php @@ -0,0 +1,45 @@ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+

[id ?>]titulo ?>

+

nombre ?>

+

OT : id ?>

+
+
+

progreso ?> %

+ Progreso +
+
+
+
+
+
+
+ + + Presupuesto + + + + Pedido + +
+
+
+
+
+
+
\ No newline at end of file diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otPortada.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otPortada.php index 508202ff..8e13bdc7 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otPortada.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otPortada.php @@ -2,8 +2,10 @@

diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otProgress.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otProgress.php index 1cbcb577..3abb1ac0 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otProgress.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otProgress.php @@ -3,7 +3,10 @@

diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/otTask.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/otTask.php index 113178d8..40eb9437 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/otTask.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/otTask.php @@ -3,7 +3,10 @@

diff --git a/ci4/app/Views/themes/vuexy/form/produccion/ot/viewPlanningRotativa.php b/ci4/app/Views/themes/vuexy/form/produccion/ot/viewPlanningRotativa.php index 48b56fb7..2c84a148 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/ot/viewPlanningRotativa.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/ot/viewPlanningRotativa.php @@ -12,11 +12,24 @@
  • - + +
    • +
  • +
-
- +
-
- -
endSection() ?> section('css') ?> diff --git a/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php b/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php index 59191045..5340bde6 100644 --- a/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php +++ b/ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php @@ -5,79 +5,8 @@ extend('themes/vuexy/main/defaultlayout') ?> section('content'); ?>
-
-
-
-
-
-
-
-
-
+ - -
-
- - -
- -
diff --git a/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php b/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php index b59fd6ac..399ff4a3 100644 --- a/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php +++ b/ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php @@ -33,7 +33,7 @@ if (auth()->user()->inGroup('beta')) { -->
  • " class="menu-link"> - +
    • diff --git a/httpdocs/assets/img/cortadora_bobinas.png b/httpdocs/assets/img/cortadora_bobinas.png new file mode 100644 index 0000000000000000000000000000000000000000..e802a0f3518878c2fb498b37bc7ee5c58c11c1b9 GIT binary patch literal 9888 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 NK}J=&PSPyo{{TE738w%6 literal 0 HcmV?d00001 diff --git a/httpdocs/assets/img/guillotina.png b/httpdocs/assets/img/guillotina.png new file mode 100644 index 0000000000000000000000000000000000000000..3e6343ae66530e828a2c26b8bf7d6265a73519e5 GIT binary patch literal 10150 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 literal 0 HcmV?d00001 diff --git a/httpdocs/assets/js/safekat/pages/produccion/ot.js b/httpdocs/assets/js/safekat/pages/produccion/ot.js index 616b8a4e..23a52461 100644 --- a/httpdocs/assets/js/safekat/pages/produccion/ot.js +++ b/httpdocs/assets/js/safekat/pages/produccion/ot.js @@ -1,7 +1,7 @@ import Ajax from "../../components/ajax.js" import ClassSelect from "../../components/select2.js"; import DatePicker from "../../components/datepicker.js"; -import { alertConfirmationDelete } from "../../components/alerts/sweetAlert.js"; +import { alertConfirmationDelete, alertSuccess } from "../../components/alerts/sweetAlert.js"; import Modal from "../../components/modal.js" class OrdenTrabajo { @@ -100,7 +100,7 @@ class OrdenTrabajo { this.item.on("click", "#btn-reset-tareas", this.handleResetTareasDeleteConfirmation.bind(this)) this.otForm.on("click", ".ot-tarea-comment", this.handleNoteTarea.bind(this)) $("#btn-update-tarea-comment").on("click", this.handleTareaNoteSubmit.bind(this)) - this.otForm.on("keyup","#ot-comment",this.handleOtComment.bind(this)) + this.otForm.on("change", "#ot-comment", this.handleOtComment.bind(this)) this._handleGetData() this.handleGetPortada() @@ -116,7 +116,7 @@ class OrdenTrabajo { bottomEnd: 'paging' }, serverSide: true, - responsive : true, + responsive: true, createdRow: this.filterCreatedRow.bind(this), pageLength: 10, language: { @@ -231,10 +231,10 @@ class OrdenTrabajo { } fillOtDetails() { const progreso = this.summaryData.ot.progreso - this.otForm.find("#ot-progress-bar").attr('aria-valuenow',progreso).text(progreso + "%").css("width",progreso + "%") - this.otForm.find("#ot-paginas").val(this.summaryData.presupuesto.paginas) - this.otForm.find("#ot-tirada").val(this.summaryData.presupuesto.tirada) - this.otForm.find("#ot-merma").val(this.summaryData.presupuesto.merma) + this.otForm.find("#ot-progress-bar").attr('aria-valuenow', progreso).text(progreso + "%").css("width", progreso + "%") + this.otForm.find("#ot-paginas").text(this.summaryData.presupuesto.paginas) + this.otForm.find("#ot-tirada").text(this.summaryData.presupuesto.tirada) + this.otForm.find("#ot-merma").text(this.summaryData.presupuesto.merma) } fillOtDates() { this.fechaImpresion.setDate(this.summaryData.dates.fecha_impresion_at) @@ -275,7 +275,7 @@ class OrdenTrabajo { handleTareaNoteSubmit(event) { const data = {} data["comment"] = $("#comment-tarea").val() - data["orden_trabajo_tarea_id"] = $("#comment-tarea").data("id") + data["orden_trabajo_tarea_id"] = this.tareaIdComment const ajax = new Ajax( "/produccion/ordentrabajo/update/tarea", data, @@ -291,17 +291,19 @@ class OrdenTrabajo { this._handleGetData(); } handleTareaChangeError(error) { } - handleOtComment(event){ + handleOtComment(event) { console.log($(event.currentTarget).val()) const ajax = new Ajax( "/produccion/ordentrabajo/update", { - "orden_trabajo_id" : this.modelId, - "name" : $(event.currentTarget).attr("name"), - "comentarios" : $(event.currentTarget).val() + "orden_trabajo_id": this.modelId, + "name": $(event.currentTarget).attr("name"), + "comentarios": $(event.currentTarget).val() }, null, - null, + (response) => { + alertSuccess(response.message).fire() + }, null ) ajax.post(); @@ -326,7 +328,11 @@ class OrdenTrabajo { } handleDateChangeSuccess(formItem, response) { formItem.addClass("is-valid") - formItem.parent().append(`
    ${[response.user.first_name, response.user.last_name].join(" ")}
    `) + alertSuccess(response.message).fire() + if (response.user) { + formItem.parent().find(".form-text").remove() + formItem.parent().append(`
    ${[response.user.first_name, response.user.last_name].join(" ")}
    `) + } } handleDateChangeError(errors) { } handlePreimpresionReviewChange(event) { @@ -455,10 +461,10 @@ class OrdenTrabajo { } handleDeleteTareaError() { } handleNoteTarea(event) { - let tarea_id = $(event.currentTarget).data("id"); - const tarea = this.summaryData.tasks.find(task => task.id == tarea_id) + this.tareaIdComment = $(event.currentTarget).data("id"); + const tarea = this.summaryData.tasks.find(task => task.id == this.tareaIdComment) if (tarea) { - $("#comment-tarea").attr("data-id", tarea_id) + $("#comment-tarea").attr("data-id", this.tareaIdComment) $("#comment-type").text(tarea.nombre ?? "") $("#comment-tarea").val(tarea.comment) this.tareaCommentModal.toggle() diff --git a/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js b/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js index 8b3225fc..e590a591 100644 --- a/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js +++ b/httpdocs/assets/js/safekat/pages/produccion/planning_rotativa/planning_rotativa.js @@ -6,24 +6,45 @@ class PlanningRotativa { constructor(domItem) { this.item = domItem this.tablePlanningRot = this.item.find("#planning-rotativa-datatable") + this.tablePlanningPlana = this.item.find("#planning-plana-datatable") this.papelGramajeTablePlanning = this.item.find("#planning-papel-datatable") + this.papelPliegoTablePlanning = this.item.find("#planning-pliego-datatable") this.papelImpresionHeader = this.item.find('#papel-impresion-name-header') + this.papelImpresionPlanaHeader = this.item.find('#papel-impresion-name-plana-header') + this.checkAllMetros = this.item.find("#metros-check-all") + this.checkAllPliegos = this.item.find("#pliegos-check-all") + this.datatableColumns = [ - { data: 'otId', searchable: false, sortable: false }, - { data: 'fecha_entrega_real_at', searchable: true, sortable: false }, - { data: 'presupuesto_titulo', searchable: true, sortable: false }, - { data: 'maquina_planning_nombre', searchable: true, sortable: false }, - { data: 'ot_tirada', searchable: false, sortable: false, }, - { data: 'papel_ancho', searchable: false, sortable: false, render: d => `${d}` }, - { data: 'papel_alto', searchable: false, sortable: false, render: d => `${d}` }, + { data: 'otId', searchable: false, sortable: false, width: "3rem" }, + { data: 'fecha_entrega_real_at', searchable: true, sortable: false, width: "15rem" }, + { data: 'presupuesto_titulo', searchable: true, sortable: false, width: "20rem" }, + { data: 'maquina_planning_nombre', searchable: true, sortable: false, width: "10rem" }, + { data: 'ot_tirada', searchable: false, sortable: false, width: "5rem" }, + { data: 'papel_ancho', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, + { data: 'papel_alto', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, { data: 'papel_impresion', searchable: false, sortable: false }, - { data: 'papel_gramaje', searchable: false, sortable: false, render: d => `${d}` }, - { data: 'corte', searchable: false, sortable: false, render: d => d }, + { data: 'papel_gramaje', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, + { data: 'corte', searchable: false, sortable: false, render: this.renderCorteImage.bind(this), width: "10rem" }, { data: 'metros_check', searchable: false, sortable: false, render: d => `` }, { data: 'metros', searchable: false, sortable: false, render: d => `${d}` }, { data: 'action', searchable: false, sortable: false, render: this._renderBtnAction }, + ] + this.datatablePlanaColumns = [ + { data: 'otId', searchable: false, sortable: false, width: "3rem" }, + { data: 'fecha_entrega_real_at', searchable: true, sortable: false, width: "15rem" }, + { data: 'presupuesto_titulo', searchable: true, sortable: false, width: "20rem" }, + { data: 'maquina_planning_nombre', searchable: true, sortable: false, width: "10rem" }, + { data: 'ot_tirada', searchable: false, sortable: false, width: "5rem" }, + { data: 'papel_ancho', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, + { data: 'papel_alto', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, + { data: 'papel_impresion', searchable: false, sortable: false }, + { data: 'papel_gramaje', searchable: false, sortable: false, width: "5rem", render: d => `${d}` }, + { data: 'pliegos_check', searchable: false, sortable: false, render: d => `` }, + { data: 'pliegosPedido', searchable: false, sortable: false, render: d => `${d}` }, + { data: 'action', searchable: false, sortable: false, render: this._renderBtnAction }, + ] this.papelGramajeDatatableColumns = [ { data: 'papelImpresionNombre', searchable: true, sortable: true }, @@ -31,7 +52,7 @@ class PlanningRotativa { { data: 'tareasCount', searchable: true, sortable: true }, { data: 'totalTirada', searchable: false, sortable: false }, { data: 'metros', searchable: false, sortable: false, render: d => `${d}` }, - { data: 'tiempoReal', searchable: false, sortable: false }, + { data: 'tiempoReal', searchable: false, sortable: false, render: d => this.formatSeconds(d) }, { data: 'action', searchable: false, sortable: false, render: (d) => { return `` @@ -40,32 +61,82 @@ class PlanningRotativa { ] - this.maquinaSelectFilter = new ClassSelect($("#maquina-select-filter"), `/maquinas/select`, "Seleccione una maquina", true, {}, $('body')); - this.papelImpresionFilter = new ClassSelect($("#papel-impresion-select-filter"), `/papelesimpresion/select`, "Seleccione un papel", true, {}, $('body')); + this.papelPliegoDatatableColumns = [ + { data: 'papelImpresionNombre', searchable: true, sortable: true }, + { data: 'papelImpresionGramaje', searchable: true, sortable: true }, + { data: 'tareasCount', searchable: true, sortable: true }, + { data: 'totalTirada', searchable: false, sortable: false }, + { data: 'pliegosPedido', searchable: false, sortable: false, render: d => `${d}` }, + { data: 'tiempoReal', searchable: false, sortable: false, render: d => this.formatSeconds(d) }, + { + data: 'action', searchable: false, sortable: false, render: (d) => { + return `` + } + }, + + + ] + this.maquinaSelectFilter = new ClassSelect( + this.tablePlanningRot.find(".planning-maquina-select"), + `/maquinas/select`, + "Seleccione una maquina", + true, { + dropdownCssClass: "h-2" + }, $('body')); + this.papelImpresionFilter = new ClassSelect(this.tablePlanningRot.find(".planning-papel-select"), `/papelesimpresion/select`, "Seleccione un papel", true, {}, $('body')); + this.maquinaSelectFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-maquina-select"), `/maquinas/select`, "Seleccione una maquina", true, {}, $('body')); + this.papelImpresionFilterPlana = new ClassSelect(this.tablePlanningPlana.find(".planning-papel-select"), `/papelesimpresion/select`, "Seleccione un papel", true, {}, $('body')); this.maquinaSelectFilter.config.dropdownParent = this.item } init() { + const autoNumericOptions = { + digitGroupSeparator: ".", + decimalCharacter: ",", + allowDecimalPadding: 'floats', + currencySymbol: '(m)', + currencySymbolPlacement: 's', + decimalPlaces: 2, + unformatOnSubmit: true, + + } + const autoNumericPliegosOptions = { + digitGroupSeparator: ".", + decimalCharacter: ",", + allowDecimalPadding: 'floats', + decimalPlaces: 0, + unformatOnSubmit: true, + + } + this.totalMetros = new AutoNumeric(this.item.find('#total-metros')[0], autoNumericOptions); + this.totalMetrosSel = new AutoNumeric(this.item.find('#metros-sel-total')[0], autoNumericOptions); + this.totalPliegos = new AutoNumeric(this.item.find('#total-pliegos')[0], autoNumericPliegosOptions); + this.totalPliegosSel = new AutoNumeric(this.item.find('#pliegos-sel-total')[0], autoNumericPliegosOptions); this.maquinaSelectFilter.init() this.papelImpresionFilter.init() + this.maquinaSelectFilterPlana.init() + this.papelImpresionFilterPlana.init() this.checkAllMetros.on('change', () => { let isChecked = this.checkAllMetros.prop('checked') this.item.find(".metros-check").prop('checked', isChecked).trigger("change") }) + this.checkAllPliegos.on('change', () => { + let isChecked = this.checkAllPliegos.prop('checked') + this.item.find(".pliegos-check").prop('checked', isChecked).trigger("change") + }) this.papelGramajeTablePlanning.on('click', '.papel-gramaje-btn', this.filterPapelGramaje.bind(this)) + this.papelPliegoTablePlanning.on('click', '.papel-pliego-btn', this.filterPapelGramajePlana.bind(this)) + this.papelImpresionFilter.onChange(() => { this.papelImpresionHeader.text(this.papelImpresionFilter.getText()) }) + this.papelImpresionFilterPlana.onChange(() => { + this.papelImpresionPlanaHeader.text(this.papelImpresionFilter.getText()) + }) this.datatablePlanningRot = this.tablePlanningRot.DataTable({ processing: true, orderCellsTop: true, - layout: { - topStart: 'info', - topEnd: null, - bottomStart: 'pageLength', - bottomEnd: 'paging' - }, - + dom: 'lrtip', serverSide: true, responsive: true, pageLength: 10, @@ -75,17 +146,23 @@ class PlanningRotativa { columns: this.datatableColumns, ajax: '/produccion/ordentrabajo/planning/rotativa/datatable' }); + this.datatablePlanningPlana = this.tablePlanningPlana.DataTable({ + processing: true, + orderCellsTop: true, + dom: 'lrtip', + serverSide: true, + responsive: true, + pageLength: 10, + language: { + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" + }, + columns: this.datatablePlanaColumns, + ajax: '/produccion/ordentrabajo/planning/plana/datatable' + }); this.papelGramajeDatatable = this.papelGramajeTablePlanning.DataTable({ processing: true, orderCellsTop: true, - - layout: { - topStart: 'info', - topEnd: null, - bottomStart: 'pageLength', - bottomEnd: 'paging' - }, - + dom: 'lrtip', serverSide: true, responsive: true, pageLength: 10, @@ -95,22 +172,58 @@ class PlanningRotativa { columns: this.papelGramajeDatatableColumns, ajax: '/produccion/ordentrabajo/planning/papel/datatable' }); - this.item.on("keyup", ".planning-filter", (event) => { + this.papelPliegoDatatable = this.papelPliegoTablePlanning.DataTable({ + processing: true, + orderCellsTop: true, + dom: 'lrtip', + serverSide: true, + responsive: true, + pageLength: 10, + language: { + url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" + }, + columns: this.papelPliegoDatatableColumns, + ajax: '/produccion/ordentrabajo/planning/papel/plana/datatable' + }); + /** + * PLANNING ROTATIVA + */ + this.tablePlanningRot.on("keyup", ".planning-filter", (event) => { console.log(this.datatablePlanningRot.column($(event.currentTarget).attr("name"))) let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) this.datatablePlanningRot.column(columnIndex).search($(event.currentTarget).val()).draw() }) - this.item.on("change", "#maquina-select-filter", (event) => { + this.tablePlanningRot.on("change", ".planning-maquina-select", (event) => { let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) this.datatablePlanningRot.column(columnIndex).search(this.maquinaSelectFilter.getText()).draw() }) - this.item.on("change", "#papel-impresion-select-filter", (event) => { + this.tablePlanningRot.on("change", ".planning-papel-select", (event) => { let columnIndex = this.datatableColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) this.datatablePlanningRot.column(columnIndex).search(this.papelImpresionFilter.getText()).draw() }) this.papelGramajeDatatable.on('draw', this.addTotalFooter.bind(this)) + this.tablePlanningRot.on('change', ".metros-check", this.calcMetrosCheck.bind(this)) + /** + * PLANNING PLANA + */ + this.tablePlanningPlana.on("keyup", ".planning-filter", (event) => { + console.log(this.datatablePlanningRot.column($(event.currentTarget).attr("name"))) + let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatablePlanningPlana.column(columnIndex).search($(event.currentTarget).val()).draw() + }) + this.tablePlanningPlana.on("change", ".planning-maquina-select", (event) => { + let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatablePlanningPlana.column(columnIndex).search(this.maquinaSelectFilterPlana.getText()).draw() + }) + this.tablePlanningPlana.on("change", ".planning-papel-select", (event) => { + let columnIndex = this.datatablePlanaColumns.findIndex((element) => element.data == $(event.currentTarget).attr("name")) + this.datatablePlanningPlana.column(columnIndex).search(this.papelImpresionFilterPlana.getText()).draw() + }) + this.papelPliegoDatatable.on('draw', this.addTotalFooterPliego.bind(this)) + + this.tablePlanningPlana.on('change', ".pliegos-check", this.calcPliegosCheck.bind(this)) } _renderBtnAction(d) { return `` @@ -123,6 +236,10 @@ class PlanningRotativa { const papelImpresionId = $(event.currentTarget).data('id') this.getPapelImpresion(papelImpresionId) } + filterPapelGramajePlana(event) { + const papelImpresionId = $(event.currentTarget).data('id') + this.getPapelImpresionPlana(papelImpresionId) + } getPapelImpresion(papelImpresionId) { let ajax = new Ajax('/papelesimpresion/show/' + papelImpresionId, null, @@ -132,43 +249,74 @@ class PlanningRotativa { ) ajax.get() } + getPapelImpresionPlana(papelImpresionId) { + let ajax = new Ajax('/papelesimpresion/show/' + papelImpresionId, + null, + null, + this.getPapelImpresionPlanaSuccess.bind(this), + this.getPapelImpresionPlanaError.bind(this) + ) + ajax.get() + } getPapelImpresionSuccess(response) { this.papelImpresionFilter.setOption(response.id, response.nombre) + this.tablePlanningRot.find('input[name=gramaje]').val(response.gramaje).trigger("change") this.papelImpresionHeader.text(response.nombre) } getPapelImpresionError(response) { } + getPapelImpresionPlanaSuccess(response) { + this.papelImpresionFilterPlana.setOption(response.id, response.nombre) + this.tablePlanningPlana.find('input[name=gramaje]').val(response.gramaje).trigger("change") + this.papelImpresionPlanaHeader.text(response.nombre) + } + getPapelImpresionPlanaError(response) { } formatSeconds(s) { return [parseInt(s / 60 / 60), parseInt(s / 60 % 60)].join(':').replace(/\b(\d)\b/g, '0$1'); } addTotalFooter() { - const data = this.papelGramajeDatatable.column(5).data().reduce((a, b) => { - let sa = a.split(":") - let ha = parseInt(sa[0]) * 3600 - let ma = parseInt(sa[1]) * 60 - let sb = b.split(":") - let hb = parseInt(sb[0]) * 3600 - let mb = parseInt(sb[1]) * 60 - return hb + mb + ha + ma - }) - const metros = this.papelGramajeDatatable.column(4).data().reduce((a, b) => { + const seconds = this.papelGramajeDatatable.column(5).data().reduce((a, b) => { + return parseFloat(a) + parseFloat(b) + }, 0) + const metros = this.papelGramajeDatatable.column(4).data().map((e) => parseFloat(e)) + $('#total-tiempo-papel').text(this.formatSeconds(seconds)) + this.totalMetros.set(metros.reduce((a, b) => a + b, 0)) + + + } + addTotalFooterPliego() { + const seconds = this.papelPliegoDatatable.column(5).data().reduce((a, b) => { + return parseFloat(a) + parseFloat(b) + }, 0) + const pliegos = this.papelPliegoDatatable.column(4).data().map((e) => parseFloat(e)) + $('#total-tiempo-pliego').text(this.formatSeconds(seconds)) + this.totalPliegos.set(pliegos.reduce((a, b) => a + b, 0)) - return a + b - }) - $('#total-tiempo-papel').text(this.formatSeconds(data)) - $('#total-metros').text(metros) } calcMetrosCheck() { const metros_sel = this.datatablePlanningRot.rows((idx, data, node) => { return $(node).find('input[type="checkbox"]').prop('checked'); - }).data().toArray().reduce((a, b) => { - a = a?.metros ?? 0 - b = b?.metros ?? 0 - return a + b - }, null) - this.item.find('#metros-sel-total').text(metros_sel) + }).data().toArray().map((e) => parseFloat(e.metros)) + this.totalMetrosSel.set(metros_sel.reduce((a, b) => a + b, 0)) } + calcPliegosCheck() { + const metros_sel = this.datatablePlanningPlana.rows((idx, data, node) => { + return $(node).find('input[type="checkbox"]').prop('checked'); + }).data().toArray().map((e) => parseInt(e.pliegosPedido)) + this.totalPliegosSel.set(metros_sel.reduce((a, b) => a + b, 0)) + + } + renderCorteImage() { + return ` + +
    + Guillotina +
    +     + ` + } + }