arreglados multiples fallos de presupuesto admin y problema en los forms de las tarifas

This commit is contained in:
2025-01-29 20:42:19 +01:00
parent 7e3d1d5df4
commit 2871326989
9 changed files with 202 additions and 75 deletions

View File

@ -107,7 +107,18 @@
for="solapas"><?= lang('Presupuestos.solapasCubierta') ?></label>
</div>
</div><!--//.mb-3 -->
</div>
<div class="row">
<div class="mb-1 solapas-cubierta-div d-none" id="div_solapas_ancho">
<label for="solapas_ancho" class="form-label">
<?= lang('Presupuestos.solapasAnchoCubierta') ?>*
</label>
<input type="number" id="solapas_ancho" name="solapas_ancho" placeholder="0"
maxLength="8" step="1" class="form-control solapas_cubierta" value="">
<div class="form-text">
Entre 60 y 120 mm
</div>
</div><!--//.mb-1 -->
</div>
</div>
@ -122,6 +133,19 @@
</div>
</div><!--//.mb-3 -->
</div>
<div class="row">
<div class="mb-1 solapas-sobrecubierta-div d-none" id="div_solapas_ancho_sobrecubierta">
<label for="solapas_ancho_sobrecubierta" class="form-label">
<?= lang('Presupuestos.solapasAnchoSobrecubierta') ?>*
</label>
<input type="number" id="solapas_ancho_sobrecubierta" name="solapas_ancho_sobrecubierta"
placeholder="60" min="60" maxLength="8" step="1"
class="form-control solapas_sobrecubierta" value="">
<div class="form-text">
Entre 60 y 120 mm
</div>
</div><!--//.mb-1 -->
</div>
</div>
<div class="col-md-12 col-lg-6 px-4">
@ -138,32 +162,6 @@
</div>
</div>
<!-- Fila 3 -->
<div class="row">
<div class="col-md-12 col-lg-2 px-4">
<div class="mb-1 solapas-cubierta-div d-none" id="div_solapas_ancho">
<label for="solapas_ancho" class="form-label">
<?= lang('Presupuestos.solapasAnchoCubierta') ?>*
</label>
<input type="number" id="solapas_ancho" name="solapas_ancho" placeholder="0" maxLength="8"
step="1" class="form-control solapas_cubierta" value="">
</div><!--//.mb-1 -->
</div>
<div class="col-md-12 col-lg-2 px-4">
<div class="mb-1 solapas-sobrecubierta-div d-none" id="div_solapas_ancho_sobrecubierta">
<label for="solapas_ancho_sobrecubierta" class="form-label">
<?= lang('Presupuestos.solapasAnchoSobrecubierta') ?>*
</label>
<input type="number" id="solapas_ancho_sobrecubierta" name="solapas_ancho_sobrecubierta"
placeholder="60" min="60" maxLength="8" step="1"
class="form-control solapas_sobrecubierta" value="">
</div><!--//.mb-1 -->
</div>
</div>
<!----------------------------------------------------------------------------->

View File

@ -258,8 +258,7 @@
paging: true,
info: false,
stateSave: false,
dom: '<"mt-4"><"float-end"B><"float-start"l>
<t><"mt-4 mb-3"p>',
dom: '<"mt-4"><"float-end"B><"float-start"l><t><"mt-4 mb-3"p>',
ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('tarifaAcabadoLineasDT') ?>',
data: {

View File

@ -173,8 +173,7 @@
searching: false,
paging: true,
info: false,
dom: '<"mt-4"><"float-end"B><"float-start"l>
<t><"mt-4 mb-3"p>',
dom: '<"mt-4"><"float-end"B><"float-start"l><t><"mt-4 mb-3"p>',
ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('dataTableOfTarifaManipuladoLineas') ?>',
data: {

View File

@ -1,4 +1,5 @@
<?= $this->include("themes/_commonPartialsBs/select2bs5") ?>
<?= $this->include("themes/_commonPartialsBs/datatables") ?>
<?= $this->include("themes/_commonPartialsBs/sweetalert") ?>
<?= $this->extend('themes/vuexy/main/defaultlayout') ?>
<?= $this->section("content") ?>
@ -26,25 +27,6 @@
</div><!-- //.card -->
</div><!--//.col -->
</div><!--//.row -->
<?php if(str_contains($formAction, 'edit')): ?>
<div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible">
<div class="card accordion-item active">
<h2 class="accordion-header" id="headingTwo">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTipTarifaMaquina" aria-expanded="false" aria-controls="accordionTipTarifaMaquina">
<h3>Tarifa máquinas</h3>
</button>
</h2>
<div id="accordionTipTarifaMaquina" class="accordion-collapse collapse show" data-bs-parent="#accordionTarifaMaquinas">
<div class="accordion-body">
<?= view("themes/vuexy/components/forms/tarifa_maquinas", ["id" => "tarifa_maquina_component", "tarifaId" => $tarifapreimpresionEntity?->id]) ?>
</div>
</div>
</div>
</div> <!-- //.accordion -->
<?php endif; ?>
<?= $this->endSection() ?>
<?= $this->section("additionalExternalJs") ?>
<script type="module" src="<?= site_url('assets/js/safekat/pages/tarifas/maquinas/preimpresion/index.js') ?>"></script>
<?= $this->endSection() ?>