From 8a965c9d8ed3516c4705815a9f2118e6721405b6 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Wed, 5 Feb 2025 10:02:02 +0100
Subject: [PATCH 1/2] fix:edge visibility css accordion

---
 .../components/forms/tarifa_maquinas.php      |  2 +-
 .../viewTarifaEncuadernacionForm.php          | 54 ++++++++++---------
 2 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/ci4/app/Views/themes/vuexy/components/forms/tarifa_maquinas.php b/ci4/app/Views/themes/vuexy/components/forms/tarifa_maquinas.php
index 57917575..f98d062e 100644
--- a/ci4/app/Views/themes/vuexy/components/forms/tarifa_maquinas.php
+++ b/ci4/app/Views/themes/vuexy/components/forms/tarifa_maquinas.php
@@ -27,4 +27,4 @@
         <tbody>
         </tbody>
     </table>
-</div>
+</div>
\ No newline at end of file
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
index 2cad126a..1dc8bc14 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/encuadernacion/viewTarifaEncuadernacionForm.php
@@ -32,14 +32,14 @@
     <?php if (str_contains($formAction, 'edit')): ?>
         <div class="accordion mt-3" id="accordionEncuadernacionTiradas" style="visibility:visible">
             <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="#accordionTip2" aria-expanded="false" aria-controls="accordionTip2">
+                <h2 class="accordion-header" id="headingZero">
+                    <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>
                     </button>
 
                 </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">
 
                         <table id="tableOfTarifaencuadernaciontiradas" class="table table-striped table-hover" style="width: 100%;">
@@ -60,7 +60,7 @@
             </div>
         </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">
                 <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">
@@ -93,28 +93,15 @@
                 </div>
             </div>
         </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">
-                <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 -->
-        <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">
+                <h2 class="accordion-header" id="headingThree">
+                    <button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionTip3" aria-expanded="false" aria-controls="accordionTip3">
                         <h3><?= lang("TarifaEncuadernacionLineas.moduleTitle") ?></h3>
                     </button>
                 </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">
 
                         <table id="tableOfTarifaencuadernacionlineasHoras" class="table table-striped table-hover" style="width: 100%;">
@@ -136,6 +123,21 @@
                 </div>
             </div>
         </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(){
     if($('#por_horas').is(':checked')){
-    $('#accordionEncuadernacionLineasHoras').css("visibility", "visible");
-    $('#accordionEncuadernacionLineas').css("visibility", "collapse");
+    $('#accordionEncuadernacionLineasHoras').removeClass("d-none");
+    $('#accordionEncuadernacionLineas').addClass("d-none");
     }
     else{
-    $('#accordionEncuadernacionLineasHoras').css("visibility", "collapse");
-    $('#accordionEncuadernacionLineas').css("visibility", "visible");
+    $('#accordionEncuadernacionLineasHoras').addClass("d-none");
+    $('#accordionEncuadernacionLineas').removeClass("d-none");
     }
     }
     check_por_horas()

From 319a7e0992d9d24a564307ff062ee54df16610b8 Mon Sep 17 00:00:00 2001
From: amazuecos <amazuecos@outlook.es>
Date: Wed, 5 Feb 2025 11:12:36 +0100
Subject: [PATCH 2/2] fix view tarifa-maquinas edit

---
 .../tarifas/acabado/viewTarifaAcabadoForm.php | 57 +++++++++----------
 .../manipulado/viewTarifaManipuladoForm.php   |  2 +-
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php
index 4e42b95a..e54487da 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/acabado/viewTarifaAcabadoForm.php
@@ -29,39 +29,38 @@
 
     <?php if ($formAction == route_to('tarifaAcabadoAdd')): ?>
         <div class="accordion mt-3" id="accordionAcabadoLineas" style="visibility:hidden">
-        <?php else: ?>
+    <?php else: ?>
             <div class="accordion mt-3" id="accordionAcabadoLineas" style="visibility:visible">
-            <?php endif; ?>
-            <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("TarifaAcabadoLineas.moduleTitle") ?></h3>
-                    </button>
-                </h2>
+    <?php endif; ?>
+                <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("TarifaAcabadoLineas.moduleTitle") ?></h3>
+                        </button>
+                    </h2>
 
-                <div id="accordionTip1" class="accordion-collapse collapse show" data-bs-parent="#accordionAcabadoLineas">
-                    <div class="accordion-body">
-                        <table id="tableOfTarifaacabadolineas" class="table table-striped table-hover" style="width: 100%;">
-                            <thead>
-                                <tr>
-                                    <th><?= lang('TarifaAcabadoLineas.proveedor') ?></th>
-                                    <th><?= lang('TarifaAcabadoLineas.tiradaMin') ?></th>
-                                    <th><?= lang('TarifaAcabadoLineas.precioMax') ?></th>
-                                    <th><?= lang('TarifaAcabadoLineas.tiradaMax') ?></th>
-                                    <th><?= lang('TarifaAcabadoLineas.precioMin') ?></th>
-                                    <th><?= lang('TarifaAcabadoLineas.margen') ?></th>
-                                    <th class="noFilter"></th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                            </tbody>
-                        </table>
+                    <div id="accordionTip1" class="accordion-collapse collapse show" data-bs-parent="#accordionAcabadoLineas">
+                        <div class="accordion-body">
+                            <table id="tableOfTarifaacabadolineas" class="table table-striped table-hover" style="width: 100%;">
+                                <thead>
+                                    <tr>
+                                        <th><?= lang('TarifaAcabadoLineas.proveedor') ?></th>
+                                        <th><?= lang('TarifaAcabadoLineas.tiradaMin') ?></th>
+                                        <th><?= lang('TarifaAcabadoLineas.precioMax') ?></th>
+                                        <th><?= lang('TarifaAcabadoLineas.tiradaMax') ?></th>
+                                        <th><?= lang('TarifaAcabadoLineas.precioMin') ?></th>
+                                        <th><?= lang('TarifaAcabadoLineas.margen') ?></th>
+                                        <th class="noFilter"></th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                </tbody>
+                            </table>
+                        </div>
                     </div>
                 </div>
-            </div>
             </div> <!-- //.accordion -->
-            <?php if (str_contains($formAction, 'edit')): ?>
-
+            <?php if ($tarifaacabadoEntity->id): ?>
                 <div class="accordion mt-3" id="accordionTarifaMaquinas" style="visibility:visible">
                     <div class="card accordion-item active">
                         <h2 class="accordion-header" id="headingTwo">
@@ -76,7 +75,7 @@
                         </div>
                     </div>
                 </div> <!-- //.accordion -->
-            <?php endif ?>
+                <?php endif ?>
         </div><!--//.row -->
 
         <?= $this->endSection() ?>
diff --git a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php
index f07210b3..c1d55627 100644
--- a/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php
+++ b/ci4/app/Views/themes/vuexy/form/tarifas/manipulado/viewTarifaManipuladoForm.php
@@ -61,7 +61,7 @@
                 </div>
             </div>
             </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="card accordion-item active">