Merge branch 'main' into 'add/tabla_credito_presupuesto'

Main

See merge request jjimenez/safekat!623

ci4/app/Config/RBAC/permissionMatrix.php

@@ -196,6 +196,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",

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');
+
         });
     });
 });

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);
+    }
 }

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']);
+    }
 }

ci4/app/Language/es/App.php

@@ -792,6 +792,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",

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"
 

ci4/app/Models/OrdenTrabajo/OrdenTrabajoDate.php

@@ -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();
                 }

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

ci4/app/Views/themes/vuexy/components/tables/planning_papel_gramaje_table.php

@@ -19,7 +19,7 @@
         <tfoot>
             <tr>
                 <th colspan="4" style="text-align:right">Total:</th>
-                <th><span class="autonumeric" id="total-metros"></span>(m)</th>
+                <th><span id="total-metros"></span></th>
                 <th id="total-tiempo-papel"></th>
                 <th></th>
 

ci4/app/Views/themes/vuexy/components/tables/planning_papel_pliego_table.php

@@ -0,0 +1,29 @@
+<div class="table-responsive">
+
+    <table id="<?= $id ?>" class="table table-striped table-hover" style="width: 100%;">
+        <thead>
+            <tr>
+                <th><?= lang('Produccion.datatable.papel') ?></th>
+                <th><?= lang('Produccion.datatable.gramaje') ?> (gr)</th>
+                <th><?= lang('Produccion.datatable.tareas') ?></th>
+                <th><?= lang('Produccion.datatable.tirada') ?></th>
+                <th><?= lang('Produccion.datatable.pliegos_libro') ?></th>
+                <th><?= lang('Produccion.datatable.tiempo') ?>(HH:MM)</th>
+                <th></th>
+
+            </tr>
+        </thead>
+        <tbody>
+
+        </tbody>
+        <tfoot>
+            <tr>
+                <th colspan="4" style="text-align:right">Total:</th>
+                <th><span id="total-pliegos"></span></th>
+                <th id="total-tiempo-pliego"></th>
+                <th></th>
+
+            </tr>
+        </tfoot>
+    </table>
+</div>

ci4/app/Views/themes/vuexy/components/tables/planning_plana_table.php

@@ -0,0 +1,43 @@
+<div class="table-responsive">
+
+    <table id="<?= $id ?>" class="table table-striped table-hover" style="width: 100%;">
+        <thead>
+            <tr>
+                <th><?= lang('ID') ?></th>
+                <th><?= lang('Produccion.datatable.fecha_entrega_at') ?></th>
+                <th><?= lang('Produccion.datatable.titulo') ?></th>
+                <th><?= lang('Produccion.datatable.maquina') ?></th>
+                <th><?= lang('Produccion.datatable.tirada') ?></th>
+                <th><?= lang('Produccion.datatable.ancho') ?></th>
+                <th><?= lang('Produccion.datatable.alto') ?></th>
+                <th><?= lang('Produccion.datatable.papel') ?></th>
+                <th><?= lang('Produccion.datatable.gramaje') ?></th>
+                <th></th>
+                <th><?= lang('Produccion.datatable.pliegos') ?></th>
+                <th class="text-nowrap"><?= lang('Basic.global.Action') ?></th>
+            </tr>
+            <tr>
+                <th><input type="text" class="form-control planning-filter" name="otId" placeholder="ID"></th>
+                <th></th>
+                <th><input type="text" class="form-control planning-filter" name="presupuesto_titulo" placeholder="Titulo"></th>
+                <th><select class="select2 form-select-sm planning-maquina-select" name="maquina_planning_nombre"></select></th>
+                <th></th>
+                <th></th>
+                <th></th>
+                <th><select class="select2 form-select-sm  planning-papel-select"  name="papel_impresion"></select></th>
+                <th><input type="text" class="form-control planning-filter" name="gramaje"></th>
+                <th>
+                    <div class="form-check mt-4">
+                        <input class="form-check-input" id="pliegos-check-all" type="checkbox" value="" />
+                    </div>
+                </th>
+                <th><span id="pliegos-sel-total"></span></th>
+                <th></th>
+            </tr>
+        </thead>
+        <tbody>
+
+        </tbody>
+
+    </table>
+</div>

ci4/app/Views/themes/vuexy/components/tables/planning_rot_table.php

@@ -19,16 +19,16 @@
             </tr>
             <tr>
                 <th><input type="text" class="form-control planning-filter" name="otId" placeholder="ID"></th>
-                <th><input type="text" class="form-control planning-filter" name="fecha_entrega_real_at" placeholder="d/m/Y"></th>
-                <th><input type="text" class="form-control planning-filter" name="presupuesto_titulo" placeholder="Titulo"></th>
-                <th><select class="select2 form-select select-maquina" id="maquina-select-filter" name="maquina_planning_nombre"></select></th>
                 <th></th>
-                <th><input type="text" class="form-control planning-filter" name="maquina_ancho" placeholder="Ancho"></th>
-                <th><input type="text" class="form-control planning-filter" name="maquina_alto" placeholder="Alto"></th>
-                <th><select class="select2 form-select select-maquina" id="papel-impresion-select-filter" name="papel_impresion"></select></th>
+                <th><input type="text" class="form-control planning-filter" name="presupuesto_titulo" placeholder="Titulo"></th>
+                <th><select class="select2 form-select-sm planning-maquina-select"  name="maquina_planning_nombre"></select></th>
+                <th></th>
+                <th></th>
+                <th></th>
+                <th><select class="select2 form-select-sm planning-papel-select"  name="papel_impresion"></select></th>
                 <th><input type="text" class="form-control planning-filter" name="gramaje"></th>
                 <th>
-                    <select class="select2 form-select w-100" name="corte">
+                    <select class="select2 form-select-sm w-100" name="corte">
                         <option value="0" default></option>
                         <option value="1">Guillotina</option>
                         <option value="2">Bobina</option>
@@ -39,7 +39,7 @@
                         <input class="form-check-input" id="metros-check-all" type="checkbox" value="" />
                     </div>
                 </th>
-                <th><span class="autonumeric" id="metros-sel-total"></span></th>
+                <th><span id="metros-sel-total"></span></th>
                 <th></th>
 
 

ci4/app/Views/themes/vuexy/form/produccion/ot/otCosts.php

@@ -3,7 +3,10 @@
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtCostTip" aria-expanded="false" aria-controls="accordionOtCostTip">
 
-                <h4> <i class="tf-icon ti-receipt ti-xs ti">Costes producción</i> </h4>
+                <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-currency-euro ti-md ti"></i></span>
+                    <h4> Costes producción </h4>
+                </div>
             </button>
         </h2>
 

ci4/app/Views/themes/vuexy/form/produccion/ot/otDates.php

@@ -3,7 +3,10 @@
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtDatesTip" aria-expanded="false" aria-controls="accordionOtDatesTip">
 
-                <h4> <i class="tf-icon ti-calendar ti-xs ti">Fechas</i> </h4>
+            <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-calendar ti-md ti"></i></span>
+                    <h4> Fechas </h4>
+                </div>
             </button>
         </h2>
 

ci4/app/Views/themes/vuexy/form/produccion/ot/otDetails.php

@@ -3,37 +3,79 @@
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtDetailsTip" aria-expanded="false" aria-controls="accordionOtDetailsTip">
 
-                <h4> <i class="tf-icon ti-file-info ti-xs ti">Detalles</i> </h4>
+                <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-file-description ti-md ti"></i></span>
+                    <h4> Detalles </h4>
+                </div>
             </button>
         </h2>
 
         <div id="accordionOtDetailsTip" class="accordion-collapse collapse show" data-bs-parent="#accordionOtDetails">
             <div class="accordion-body">
-                <div class="row">
-                    <!-- Detail 1-->
-                    <div class="col-xs-12 col-md-4 col-lg-2 mb-2">
-                        <label for="ot-formato" class="form-label"><?= @lang("Produccion.formato") ?></label>
-                        <input type="text" class="form-control" name="formato" id="ot-formato" disabled>
-                    </div>
-                    <!-- Detail 2-->
-                    <div class="col-xs-12 col-md-4 col-lg-2 mb-2">
-                        <label for="ot-paginas" class="form-label"><?= @lang("Produccion.paginas") ?></label>
-                        <input type="text" class="form-control" name="paginas" id="ot-paginas" name="presupuesto.paginas" disabled>
-                    </div>
-                    <!-- Detail 3-->
-                    <div class="col-xs-12 col-md-4 col-lg-2 mb-2">
-                        <label for="ot-solapa" class="form-label"><?= @lang("Produccion.solapa") ?></label>
-                        <input type="text" class="form-control" name="solapa" id="ot-solapa" disabled>
-                    </div>
-                    <!-- Detail 4-->
-                    <div class="col-xs-12 col-md-4 col-lg-2 mb-2">
-                        <label for="ot-tirada" class="form-label"><?= @lang("Produccion.tirada") ?></label>
-                        <input type="text" class="form-control" name="tirada" id="ot-tirada" name="presupuesto.tirada" disabled>
-                    </div>
-                    <!-- Detail 5-->
-                    <div class="col-xs-12 col-md-4 col-lg-4 mb-2">
-                        <label for="ot-merma" class="form-label"><?= @lang("Produccion.merma") ?></label>
-                        <input type="text" class="form-control" name="merma" id="ot-merma" name="presupuesto.merma" disabled>
+                <div class="col-lg-12 mb-4 col-md-12 ">
+                    <div class="card">
+                        <div class="card-body pt-2">
+                            <div class="row gy-3  justify-content-center">
+                                <div class="col-md-2 col-6">
+                                    <div class="d-flex align-items-center">
+                                        <div class="badge rounded-pill bg-label-primary me-3 p-2">
+                                            <i class="ti ti-dimensions ti-lg"></i>
+                                        </div>
+                                        <div class="card-info">
+                                            <h5 class="mb-0" id="ot-formato"><?=$presupuesto->papel_formato()->ancho?>x<?=$presupuesto->papel_formato()->alto?></h5>
+                                            <span class="fx-large"><?= @lang("Produccion.formato") ?></span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-2 col-6">
+                                    <div class="d-flex align-items-center">
+                                        <div class="badge rounded-pill bg-label-info me-3 p-2">
+                                            <i class="ti ti-box-multiple ti-lg"></i>
+                                        </div>
+                                        <div class="card-info">
+                                            <h5 class="mb-0" id="ot-paginas"><?=$presupuesto->merma?></h5>
+                                            <span class="fx-large"><?= @lang("Produccion.paginas") ?></span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-2 col-6">
+                                    <div class="d-flex align-items-center">
+                                        <div class="badge rounded-pill bg-label-danger me-3 p-2">
+                                            <i class="ti ti-bookmark ti-lg"></i>
+                                        </div>
+                                        <div class="card-info">
+                                            <h5 class="mb-0" id="ot-solapa"><?=$presupuesto->solapas?></h5>
+
+                                            <span class="fx-large"><?= @lang("Produccion.solapa") ?></span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-2 col-6">
+                                    <div class="d-flex align-items-center">
+                                        <div class="badge rounded-pill bg-label-success me-3 p-2">
+                                            <i class="ti ti-books ti-lg"></i>
+                                        </div>
+                                        <div class="card-info">
+                                            <h5 class="mb-0" id="ot-tirada"></h5>
+
+                                            <span class="fx-large"><?= @lang("Produccion.tirada") ?></span>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div class="col-md-2 col-6">
+                                    <div class="d-flex align-items-center">
+                                        <div class="badge rounded-pill bg-label-success me-3 p-2">
+                                            <i class="ti ti-notebook ti-lg"></i>
+                                        </div>
+                                        <div class="card-info">
+                                            <h5 class="mb-0" id="ot-merma"><?=$presupuesto->merma?></h5>
+
+                                            <span class="fx-large"><?= @lang("Produccion.merma") ?></span>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
             </div>

ci4/app/Views/themes/vuexy/form/produccion/ot/otHeader.php

@@ -0,0 +1,45 @@
+<div class="row">
+    <div class="col-md-12">
+        <div class="card mb-3" id="alert-orden-trabajo">
+            <div class="row g-0">
+                <div class="col-md-2 d-flex align-items-center justify-content-center " style="max-height: 50%;">
+                    <div class="sk-wave sk-primary portada-loader">
+                        <div class="sk-wave-rect"></div>
+                        <div class="sk-wave-rect"></div>
+                        <div class="sk-wave-rect"></div>
+                        <div class="sk-wave-rect"></div>
+                        <div class="sk-wave-rect"></div>
+                    </div>
+                    <img class="card-img card-img-left img-thumbnail" id="portada-orden-trabajo" src="" hidden>
+                </div>
+                <div class="col-md-8">
+                    <div class="card-body">
+                        <h1 class="card-title mb-0">[<?= $presupuesto->id ?>]<?= $presupuesto->titulo ?></h1>
+                        <h4 class="card-title mb-0 text-secondary"><?= $cliente->nombre ?></h4>
+                        <h3 class="card-title mb-3">OT : <?= $ot->id ?></h3>
+                        <div class="d-flex align-items-center">
+                            <div class="card-info">
+                                <h3 class="mb-0"><?= $ot->progreso ?> %</h3>
+                                <span class="fx-large">Progreso</span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="col-md-2">
+                    <div class="card-body">
+                        <div class="d-flex flex-column justify-content-start gap-2">
+                            <a target="_blank" type="button" href="<?= route_to('editarPresupuestoAdmin', $presupuesto->id) ?>" class="btn btn-primary text-white w-100">
+                                <span class="ti-sm ti ti-currency-dollar me-1"></span>
+                                Presupuesto
+                            </a>
+                            <a target="_blank" href="<?= route_to('editarPedido', $ot->pedido()->id) ?>" class="btn  btn-primary text-white w-100">
+                                <span class="ti-sm ti ti-truck-delivery  me-1"></span>
+                                Pedido
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div><!--//.col -->
+</div><!--//.row -->

ci4/app/Views/themes/vuexy/form/produccion/ot/otPortada.php

@@ -2,8 +2,10 @@
     <div class="card accordion-item">
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtPortadaTip" aria-expanded="false" aria-controls="accordionOtPortadaTip">
-
-                <h4> <i class="tf-icon ti-photo ti-xs ti">Portada</i> </h4>
+                <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-photo ti-md ti"></i></span>
+                    <h4> Portada </h4>
+                </div>
             </button>
         </h2>
 

ci4/app/Views/themes/vuexy/form/produccion/ot/otProgress.php

@@ -3,7 +3,10 @@
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtProgressTip" aria-expanded="false" aria-controls="accordionOtProgressTip">
 
-                <h4> <i class="tf-icon ti-hourglass ti-xs ti">Progreso</i> </h4>
+            <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-list-details ti-md ti"></i></span>
+                    <h4> Progreso </h4>
+                </div>
             </button>
         </h2>
 

ci4/app/Views/themes/vuexy/form/produccion/ot/otTask.php

@@ -3,7 +3,10 @@
         <h2 class="accordion-header">
             <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionOtTasksTip" aria-expanded="false" aria-controls="accordionOtTasksTip">
 
-                <h4> <i class="tf-icon ti-list-check ti-xs ti">Tareas</i> </h4>
+            <div class="d-flex flex-row justify-content-start align-items-stretch gap-2">
+                    <span><i class="ti-subtask ti-md ti"></i></span>
+                    <h4> Tareas </h4>
+                </div>
             </button>
         </h2>
 

ci4/app/Views/themes/vuexy/form/produccion/ot/viewPlanningRotativa.php

@@ -12,11 +12,24 @@
         <div class="nav-tabs-shadow nav-align-top">
             <ul class="nav nav-tabs" role="tablist">
                 <li class="nav-item">
-                    <button type="button" class="nav-link active" role="tab" id="navs-top-align-prot-tab" data-bs-toggle="tab" data-bs-target="#navs-top-align-prot"><?= lang("Produccion.planning_rotativa") ?></button>
+                    <button type="button"
+                        class="nav-link active"
+                        role="tab"
+                        id="navs-top-align-rot-tab"
+                        data-bs-toggle="tab"
+                        data-bs-target="#prot-datatables-container-rot"><?= lang("Produccion.planning_rotativa") ?></button>
+                </li>
+                <li class="nav-item">
+                    <button type="button"
+                        class="nav-link"
+                        role="tab"
+                        id="navs-top-align-plana-tab"
+                        data-bs-toggle="tab"
+                        data-bs-target="#prot-datatables-container-plana"><?= lang("Produccion.planning_plana") ?></button>
                 </li>
             </ul>
-            <div class="tab-content" id="prot-datatables-container">
-                <div class="tab-pane fade show active" id="navs-top-align-prot">
+            <div class="tab-content">
+                <div class="tab-pane fade show active" id="prot-datatables-container-rot"  role="tabpanel">
                     <div class="accordion accordion-bordered mt-3" id="accordionPapelGramaje">
                         <div class="card accordion-item active">
                             <h2 class="accordion-header" id="headingOne">
@@ -35,8 +48,6 @@
                             </div>
                         </div>
                     </div>
-                </div>
-                <div class="tab-pane fade show active" id="navs-top-align-prot">
                     <div class="accordion accordion-bordered mt-3" id="accordionPlanningRotativa">
                         <div class="card accordion-item active">
                             <h2 class="accordion-header" id="headingOne">
@@ -58,15 +69,52 @@
                         </div>
                     </div>
                 </div>
+                <div class="tab-pane fade" id="prot-datatables-container-plana" role="tabpanel">
+                    <div class="accordion accordion-bordered mt-3" id="accordionPapelPliego">
+                        <div class="card accordion-item active">
+                            <h2 class="accordion-header" id="headingOne">
+                                <button type="button" class="accordion-button" data-bs-toggle="collapse"
+                                    data-bs-target="#accordionPapelPliegoContainer" aria-expanded="false"
+                                    aria-controls="accordionPapelPliegoContainer">
+                                    <h4><?= lang("Produccion.papel_gramajes") ?></h4>
+                                </button>
+                            </h2>
+
+                            <div id="accordionPapelPliegoContainer" class="accordion-collapse collapse show"
+                                data-bs-parent="#accordionPapelPliego">
+                                <div class="accordion-body">
+                                    <?= view("themes/vuexy/components/tables/planning_papel_pliego_table.php", ["id" => "planning-pliego-datatable"]) ?>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="accordion accordion-bordered mt-3" id="accordionPlanningPlana">
+                        <div class="card accordion-item active">
+                            <h2 class="accordion-header" id="headingOne">
+                                <button type="button" class="accordion-button" data-bs-toggle="collapse"
+                                    data-bs-target="#accordionPlanningPlanaContainer" aria-expanded="false"
+                                    aria-controls="accordionPlanningPlanaContainer">
+                                    <h4><?= lang("Produccion.planning_plana") ?></h4>
+                                </button>
+                            </h2>
+
+                            <div id="accordionPlanningPlanaContainer" class="accordion-collapse collapse show"
+                                data-bs-parent="#accordionPlanningPlana">
+                                <div class="accordion-body">
+                                    <h6 id="papel-impresion-name-plana-header" class="text-secondary "></h6>
+                                    <?= view("themes/vuexy/components/tables/planning_plana_table.php", ["id" => "planning-plana-datatable"]) ?>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
             </div>
 
+
         </div>
     </div>
     <!--//.card -->
 </div>
-</div>
-<!--//.col -->
-</div>
 <?= $this->endSection() ?>
 
 <?= $this->section('css') ?>

ci4/app/Views/themes/vuexy/form/produccion/viewOrdenTrabajoEdit.php

@@ -5,79 +5,8 @@
 <?= $this->extend('themes/vuexy/main/defaultlayout') ?>
 <?= $this->section('content');  ?>
 <div id="ot-edit" data-id="<?= $modelId ?>">
-    <div class="row">
-        <div class="col-md-2 d-flex align-items-center justify-content-center">
-            <div class="sk-wave sk-primary portada-loader">
-                <div class="sk-wave-rect"></div>
-                <div class="sk-wave-rect"></div>
-                <div class="sk-wave-rect"></div>
-                <div class="sk-wave-rect"></div>
-                <div class="sk-wave-rect"></div>
-            </div>
+    <?= view("themes/vuexy/form/produccion/ot/otHeader") ?>
 
-            <img class="rounded" id="portada-orden-trabajo" src="" width="100%" height="100%" hidden>
-        </div>
-        <div class="col-md-10">
-
-            <div class="alert alert-info h-100" role="alert" id="alert-orden-trabajo">
-                <div class="row">
-                    <div class="col-md-10">
-                        <div class="d-flex flex-row bd-highlight gap-2">
-                            <div class="bd-highlight">
-                                <h4>OT : </h4>
-                            </div>
-                            <div class="bd-highlight">
-                                <h4><?= $ot->id ?></h4>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="d-flex flex-row bd-highlight justify-content-end">
-                            <h4><?= $ot->progreso ?> %</h4>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-md-10">
-
-                        <div class="d-flex flex-row bd-highlight gap-2">
-                            <div class="bd-highlight">
-                                <span><i class="tf-icons ti-md ti ti-building-factory-2"></i></span>
-                            </div>
-                            <div class="bd-highlight">
-                                <h4><?= $presupuesto->titulo ?></h4>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="col-md-2">
-                        <div class="d-flex flex-row bd-highlight justify-content-end">
-                            <button class="btn btn-sm btn-warning w-100">Presupuesto</button>
-                        </div>
-                    </div>
-                </div>
-                <div class="row">
-                    <div class="col-md-10">
-                        <div class="d-flex flex-row bd-highlight">
-                            <div class="bd-highlight">
-                                <span><i class="tf-icons ti-md ti ti-user"></i></span>
-                            </div>
-                            <div>
-                                <h4><?= $cliente->nombre ?></h4>
-                            </div>
-                        </div>
-
-                    </div>
-                    <div class="col-md-2 ">
-                        <div class="d-flex flex-row bd-highlight justify-content-end">
-                            <button class="btn btn-sm btn-warning w-100">Pedido</button>
-                        </div>
-                    </div>
-                </div>
-
-            </div>
-        </div><!--//.col -->
-
-    </div><!--//.row -->
     <div class="row">
         <form id="ot-edit-form">
             <div class="col-md-12">

ci4/app/Views/themes/vuexy/main/menus/produccion_menu.php

@@ -33,7 +33,7 @@ if (auth()->user()->inGroup('beta')) {
             </li> -->
             <li class="menu-item">
                 <a href="<?= site_url("produccion/ordentrabajo/planning/rotativa") ?>" class="menu-link">
-                    <?= lang("App.menu_planning_rotativa") ?>
+                    <?= lang("App.menu_planning") ?>
                 </a>
             </li>
         </ul>