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

Merge branch 'fix/visibility-accordion' into 'main'

Browse Source 
Fix/visibility accordion

See merge request jjimenez/safekat!518
This commit is contained in:
Alvaro
2025-02-05 10:13:21 +00:00
parent 3b61f0a8c6 319a7e0992
commit 186adbee00
4 changed files with 58 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php
View File

@ -60,8 +60,7 @@
</div> </div>
</div> </div>
</div> <!-- //.accordion --> </div> <!-- //.accordion -->
<?php if (str_contains($formAction, 'edit')): ?> <?php if ($tarifaacabadoEntity->id): ?>
<div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible"> <div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingTwo"> <h2 class="accordion-header" id="headingTwo">

54
ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
View File

@ -32,14 +32,14 @@
<?php if (str_contains($formAction, 'edit')): ?> <?php if (str_contains($formAction, 'edit')): ?>
<div class="accordion mt-3" id="accordionEncuadernacionTiradas" style="visibility:visible"> <div class="accordion mt-3" id="accordionEncuadernacionTiradas" style="visibility:visible">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingOne"> <h2 class="accordion-header" id="headingZero">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip2" aria-expanded="false" aria-controls="accordionTip2"> <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip0" aria-expanded="false" aria-controls="accordionTip0">
<h3><?= lang("TarifaEncuadernacionTiradas.moduleTitle") ?></h3> <h3><?= lang("TarifaEncuadernacionTiradas.moduleTitle") ?></h3>
</button> </button>
</h2> </h2>
<div id="accordionTip2" class="accordion-collapse collapse show" data-bs-parent="#accordionEncuadernacionTiradas"> <div id="accordionTip0" class="accordion-collapse collapse show" data-bs-parent="#accordionEncuadernacionTiradas">
<div class="accordion-body"> <div class="accordion-body">
<table id="tableOfTarifaencuadernaciontiradas" class="table table-striped table-hover" style="width: 100%;"> <table id="tableOfTarifaencuadernaciontiradas" class="table table-striped table-hover" style="width: 100%;">
@ -60,7 +60,7 @@
</div> </div>
</div> <!-- //.accordion --> </div> <!-- //.accordion -->
<div class="accordion mt-3" id="accordionEncuadernacionLineas" style="visibility:<?php ?>visible"> <div class="accordion mt-3" id="accordionEncuadernacionLineas" style="visibility:visible">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingOne"> <h2 class="accordion-header" id="headingOne">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip1" aria-expanded="false" aria-controls="accordionTip1"> <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip1" aria-expanded="false" aria-controls="accordionTip1">
@ -93,28 +93,15 @@
</div> </div>
</div> </div>
</div> <!-- //.accordion --> </div> <!-- //.accordion -->
<div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible">
<div class="accordion mt-3 d-none" id="accordionEncuadernacionLineasHoras" style="visibility:visible">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingTwo"> <h2 class="accordion-header" id="headingThree">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTipTarifaMaquina" aria-expanded="false" aria-controls="accordionTipTarifaMaquina"> <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip3" aria-expanded="false" aria-controls="accordionTip3">
<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" => $tarifaEncuadernacionEntity->id]) ?>
</div>
</div>
</div>
</div> <!-- //.accordion -->
<div class="accordion mt-3" id="accordionEncuadernacionLineasHoras" style="visibility:hidden">
<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="#accordionTip1" aria-expanded="false" aria-controls="accordionTip1">
<h3><?= lang("TarifaEncuadernacionLineas.moduleTitle") ?></h3> <h3><?= lang("TarifaEncuadernacionLineas.moduleTitle") ?></h3>
</button> </button>
</h2> </h2>
<div id="accordionTip1" class="accordion-collapse collapse show" data-bs-parent="#accordionEncuadernacionLineas"> <div id="accordionTip3" class="accordion-collapse collapse show" data-bs-parent="#accordionEncuadernacionLineasHoras">
<div class="accordion-body"> <div class="accordion-body">
<table id="tableOfTarifaencuadernacionlineasHoras" class="table table-striped table-hover" style="width: 100%;"> <table id="tableOfTarifaencuadernacionlineasHoras" class="table table-striped table-hover" style="width: 100%;">
@ -136,6 +123,21 @@
</div> </div>
</div> </div>
</div> <!-- //.accordion --> </div> <!-- //.accordion -->
<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" => $tarifaEncuadernacionEntity->id]) ?>
</div>
</div>
</div>
</div> <!-- //.accordion -->
@ -207,12 +209,12 @@ id = -1;
function check_por_horas(){ function check_por_horas(){
if($('#por_horas').is(':checked')){ if($('#por_horas').is(':checked')){
$('#accordionEncuadernacionLineasHoras').css("visibility", "visible"); $('#accordionEncuadernacionLineasHoras').removeClass("d-none");
$('#accordionEncuadernacionLineas').css("visibility", "collapse"); $('#accordionEncuadernacionLineas').addClass("d-none");
} }
else{ else{
$('#accordionEncuadernacionLineasHoras').css("visibility", "collapse"); $('#accordionEncuadernacionLineasHoras').addClass("d-none");
$('#accordionEncuadernacionLineas').css("visibility", "visible"); $('#accordionEncuadernacionLineas').removeClass("d-none");
} }
} }
check_por_horas() check_por_horas()

2
ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php
View File

@ -61,7 +61,7 @@
</div> </div>
</div> </div>
</div> <!-- //.accordion --> </div> <!-- //.accordion -->
<?php if ($formAction != site_url('tarifas/tarifasmanipulado/add')): ?> <?php if ($tarifaManipuladoEntity?->id): ?>
<div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible"> <div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible">
<div class="card accordion-item active"> <div class="card accordion-item active">