jjimenez/safekat
1
0
Fork 0
mirror of https://git.imnavajas.es/jjimenez/safekat.git synced 2025-07-25 22:52:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

view maquinista

Browse Source
This commit is contained in:
amazuecos
2025-04-25 13:20:35 +02:00
parent 4379a9d23b
commit dafdf68c41
7 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ci4/app/Services/ProductionService.php
View File

@ -1724,7 +1724,7 @@ class ProductionService extends BaseService
->orWhere('orden_trabajo_tareas.maquina_id', $maquina_id)
->orWhere('presupuesto_linea.maquina_id', $maquina_id)
->groupEnd()
->where('pedidos.fecha_impresion IS NOT NULL', null, false)
// ->where('pedidos.fecha_impresion IS NOT NULL', null, false)
->where("orden_trabajo_tareas.deleted_at", null)
->where("tarea_progress.estado", 'P')
->orderBy("pedidos.fecha_impresion", "ASC")

1
ci4/app/Views/themes/vuexy/components/cards/tarea_card_actions.php
View File

@ -1,7 +1,6 @@
<div class="card h-100">
<div class="card-body">
<div class="row h-100">
<?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
<div class="col-6">
<div class="d-flex flex-column justify-content-evenly gap-2 h-100">

2
ci4/app/Views/themes/vuexy/components/tables/maquinista_tarea_table.php
View File

@ -1,4 +1,4 @@
<div class="table-maquinista">
<div class="table-maquinista table-responsive">
<table id="maquinista-tarea-table" class="table table-hover text-dark" style="width: 100%;">
<thead>

18
ci4/app/Views/themes/vuexy/form/produccion/maquinista/viewMaquinistaMaquinaList.php
View File

@ -17,10 +17,10 @@
</div>
<div class="row" id="maquinas-impresion">
<?php foreach ($maquinas["impresion"] as $key => $maquina): ?>
<div class="col-md-3 col-lg-3 col-xs-12 mb-2 h-100">
<div class="col-md-4 col-sm-2 col-lg-3 col-xs-12 mb-2 h-100 p-2">
<a href="<?= route_to("viewProduccionMaquinaTareasList", $maquina["maquinaId"]) ?>" type="button" class="maquina-btn btn btn-outline-primary w-100">
<span class="d-none d-sm-inline-flex align-items-center gap-2">
<i class="icon-base ti tabler-home icon-sm me-1_5"></i><?= $maquina["nombre"] ?>
<span class="d-sm-inline-flex justify-content-between align-items-center gap-2">
<?= $maquina["nombre"] ?>
<?php if ($maquina["countTareas"] > 0): ?>
<span class="badge rounded-pill badge-center h-px-20 w-px-20 bg-secondary ms-1_5"><?= $maquina["countTareas"] ?></span>
<? endif; ?>
@ -38,10 +38,10 @@
</div>
<div class="row" id="maquinas-acabado">
<?php foreach ($maquinas["acabado"] as $key => $maquina): ?>
<div class="col-md-3 col-lg-3 col-xs-12 mb-2 h-100">
<div class="col-md-4 col-sm-2 col-lg-3 col-xs-12 mb-2 h-100 p-2">
<a href="<?= route_to("viewProduccionMaquinaTareasList", $maquina["maquinaId"]) ?>" type="button" class="maquina-btn btn btn-outline-primary w-100">
<span class="d-none d-sm-inline-flex align-items-center gap-2">
<i class="icon-base ti tabler-home icon-sm me-1_5"></i><?= $maquina["nombre"] ?>
<span class="d-sm-inline-flex justify-content-between align-items-center gap-2">
<?= $maquina["nombre"] ?>
<?php if ($maquina["countTareas"] > 0): ?>
<span class="badge rounded-pill badge-center h-px-20 w-px-20 bg-secondary ms-1_5"><?= $maquina["countTareas"] ?></span>
<? endif; ?>
@ -59,10 +59,10 @@
</div>
<div class="row" id="maquinas-manipulado">
<?php foreach ($maquinas["manipulado"] as $key => $maquina): ?>
<div class="col-md-3 col-lg-3 col-xs-12 mb-2 h-100">
<div class="col-md-4 col-sm-2 col-lg-3 col-xs-12 mb-2 h-100 p-2">
<a href="<?= route_to("viewProduccionMaquinaTareasList", $maquina["maquinaId"]) ?>" type="button" class="maquina-btn btn btn-outline-primary w-100">
<span class="d-none d-sm-inline-flex align-items-center gap-2">
<i class="icon-base ti tabler-home icon-sm me-1_5"></i><?= $maquina["nombre"] ?>
<span class="d-sm-inline-flex justify-content-between align-items-center gap-2">
<?= $maquina["nombre"] ?>
<?php if ($maquina["countTareas"] > 0): ?>
<span class="badge rounded-pill badge-center h-px-20 w-px-20 bg-secondary ms-1_5"><?= $maquina["countTareas"] ?></span>
<? endif; ?>

1
ci4/app/Views/themes/vuexy/form/produccion/maquinista/viewMaquinistaMaquinaTarea.php
View File

@ -39,6 +39,7 @@
<div class="tab-content">
<div class="tab-pane fade show active" id="navs-tarea">
<div class="container-fluid h-100">
<?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
<div class="row mb-2 h-100 d-flex flex-wrap">
<div class="col-md-12 d-flex justify-content-end mb-2">
<button class="btn-primary btn d-flex justify-content-evenly gap-2"><span class="ti ti-barcode ti-lg"></span><?= lang('Produccion.print_label') ?></button>

14
ci4/app/Views/themes/vuexy/form/produccion/maquinista/viewMaquinistaMaquinaTareas.php
View File

@ -13,18 +13,20 @@ use CodeIgniter\I18n\Time;
<div class="col-md-12">
<div class="card">
<div class="card-body">
<div class="row mb-2">
<div class="d-flex flex-row justify-content-between align-items-center">
<div class="d-flex flex-row justify-content-start align-items-center gap-2">
<button type="button" id="btn-tareas-hoy" class="btn btn-primary h-100 active" aria-pressed="true"><?= lang('Produccion.maquinista.tareas_hoy') ?></button>
<button type="button" id="btn-all-tareas" class="btn btn-primary h-100"><?= lang('Produccion.maquinista.tareas_all') ?></button>
<div class="row mb-2 align-items-center">
<div class="col-md-6 col-xs-12 justify-content-start ">
<div class="d-flex flex-row justify-content-center align-items-stretch gap-2 h-100">
<button type="button" id="btn-tareas-hoy" class="btn btn-primary h-100 active w-50" aria-pressed="true"><?= lang('Produccion.maquinista.tareas_hoy') ?></button>
<button type="button" id="btn-all-tareas" class="btn btn-primary h-100 w-50"><?= lang('Produccion.maquinista.tareas_all') ?></button>
</div>
</div>
<div class="col-md-6 col-xs-12 justify-content-end d-flex">
<span class="display-6" id="today-date"><?= Time::now()->format('d/m/Y') ?></span>
</div>
<!-- <div class="d-flex flex-row justify-content-end align-content-center gap-2">
<button type="button" class="btn btn-primary"><?= lang('Produccion.maquinista.maquinas') ?></button>
</div> -->
</div>
</div>
<?= view("/themes/vuexy/components/tables/maquinista_tarea_table.php") ?>
</div>
</div>

2
ci4/app/Views/themes/vuexy/main/menus/maquinista_menu.php
View File

@ -18,7 +18,7 @@ if (auth()->user()->inGroup('maquina')) {
</a>
</li>
<li class="menu-item">
<a href="<?= route_to("viewProduccionMaquinistaColas") ?>" class="menu-link beta">
<a href="<?= site_url("produccion/ordentrabajo/planning/rotativa") ?>" class="menu-link">
<div><?= lang("App.menu_maquinista_colas") ?></div>
</a>
</li>