Merge branch 'main' into 'add/tabla_credito_presupuesto'

Main

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

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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 -->

View File

@ -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>

View File

@ -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>

View File

@ -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>

View File

@ -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') ?>

View File

@ -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">

View File

@ -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>