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

arraglados problemas al hacer merge con nacho

Browse Source
This commit is contained in:
Jaime Jimenez
2023-10-10 12:07:29 +02:00
parent fa478f7e10
commit 453226b811
3 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosPresupuestoClienteItems.php
View File

@ -247,7 +247,7 @@
<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 id="accordion-button-int-plana" type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompInteriorPlanaTip" aria-expanded="false" aria-controls="accordionCompInteriorPlanaTip"> <button id="accordion-button-int-plana" type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompInteriorPlanaTip" aria-expanded="false" aria-controls="accordionCompInteriorPlanaTip">
<h4><?= lang("Presupuestos.compInteriorPlana") ?></h4> <h6 id="title_int_plana"><?= lang("Presupuestos.compInteriorPlana") ?></h6>
</button> </button>
</h2> </h2>
@ -296,8 +296,8 @@
<div class="accordion mt-3" id="accordionCompInteriorRotativa"> <div class="accordion mt-3" id="accordionCompInteriorRotativa">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingTwo"> <h2 class="accordion-header" id="headingTwo">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompInteriorRotativaTip" aria-expanded="false" aria-controls="accordionCompInteriorRotativaTip"> <button id="accordion-button-int-rotativa" type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompInteriorRotativaTip" aria-expanded="false" aria-controls="accordionCompInteriorRotativaTip">
<h4><?= lang("Presupuestos.compInteriorRotativa") ?></h4> <h6 id="title_int_rot"><?= lang("Presupuestos.compInteriorRotativa") ?></h6>
</button> </button>
</h2> </h2>
@ -349,15 +349,15 @@
<div class="accordion mt-3" id="accordionCompCubiertaSobrecubierta"> <div class="accordion mt-3" id="accordionCompCubiertaSobrecubierta">
<div class="card accordion-item active"> <div class="card accordion-item active">
<h2 class="accordion-header" id="headingThree"> <h2 class="accordion-header" id="headingThree">
<button type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompCubiertaSobrecubiertaTip" aria-expanded="false" aria-controls="accordionCompCubiertaSobrecubiertaTip"> <button id="accordion-button-cubierta" type="button" class="accordion-button" data-bs-toggle="collapse" data-bs-target="#accordionCompCubiertaSobrecubiertaTip" aria-expanded="false" aria-controls="accordionCompCubiertaSobrecubiertaTip">
<h4><?= lang("Presupuestos.cubierta") ?></h4> <h6 id="title_cubierta"><?= lang("Presupuestos.cubierta") ?></h6>
</button> </button>
</h2> </h2>
<div id="accordionCompCubiertaSobrecubiertaTip" class="accordion-collapse collapse" data-bs-parent="#accordionCompCubiertaSobrecubierta"> <div id="accordionCompCubiertaSobrecubiertaTip" class="accordion-collapse collapse" data-bs-parent="#accordionCompCubiertaSobrecubierta">
<div class="accordion-body"> <div class="accordion-body">
<table id="tableCompCubierta" class="comparator-table table dt-responsive dataTable"> <table id="tableCompCubierta" class="comparator-table table dt-responsive dataTable" style="width: 100%;">
<thead> <thead>
<tr> <tr>
<th style="padding-right: 0.75em;"><?= lang('Presupuestos.tipo') ?></th> <th style="padding-right: 0.75em;"><?= lang('Presupuestos.tipo') ?></th>

12
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/comparador.js
View File

@ -154,7 +154,17 @@ $('#compPosPaginasColor').on("keyup", function () {
// Este evento recoloca los headers de las tablas cuando se pulsa el // Este evento recoloca los headers de las tablas cuando se pulsa el
// boton del acordeon // boton del acordeon
$('.accordion-button').on('click', function (e) { $('.accordion-button').on('click', function (e) {
$.fn.dataTable.tables({ visible: true, api: true }).columns.adjust();
if(e.target.id.includes("plana")){
$("#tableCompIntPlana").DataTable().columns.adjust();
}
else if(e.target.id.includes("rotativa")){
$("#tableCompIntRotativa").DataTable().columns.adjust();
}
else if(e.target.id.includes("cubierta")){
$("#tableCompCubierta").DataTable().columns.adjust();
}
}); });

11
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
View File

@ -409,10 +409,9 @@
// Rotativa solo negro o color (no hq) // Rotativa solo negro o color (no hq)
if ( is_hq==false){ if ( is_hq==false){
console.log('hola');
if(checkInputsForRotativa()){ if(checkInputsForRotativa()){
let datos = { let datos = {
type: 'interior_rot', type: 'interior_rot',
paginas: parseInt($('#paginas').val()), paginas: parseInt($('#paginas').val()),
@ -689,21 +688,21 @@
<?= $this->endSection() ?> <?= $this->endSection() ?>
<?=$this->section('css') ?> <?=$this->section('css') ?>
<link rel="stylesheet" href="<?= site_url('themes/vuexy/css/datatables-editor/editor.dataTables.min.css') ?>"> <link rel="stylesheet" href="<?= site_url('themes/vuexy/css/datatables-editor/editor.dataTables.min.css') ?>">
<link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.2.3/css/buttons.bootstrap5.min.css"> <link rel="stylesheet" href="https://cdn.datatables.net/buttons/2.2.3/css/buttons.bootstrap5.min.css">
<link rel="stylesheet" href="<?= site_url('themes/vuexy/css/sk-datatables.css') ?>"> <link rel="stylesheet" href="<?= site_url('themes/vuexy/css/sk-datatables.css') ?>">
<?=$this->endSection() ?> <?=$this->endSection() ?>
<?= $this->section('additionalExternalJs') ?> <?= $this->section('additionalExternalJs') ?>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/dataTables.buttons.min.js"></script> <script src="https://cdn.datatables.net/buttons/2.2.3/js/dataTables.buttons.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.bootstrap5.min.js"></script> <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.bootstrap5.min.js"></script>
<script src="https://cdn.datatables.net/select/1.7.0/js/dataTables.select.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.html5.min.js"></script> <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.html5.min.js"></script>
<script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.print.min.js"></script> <script src="https://cdn.datatables.net/buttons/2.2.3/js/buttons.print.min.js"></script>
<script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.min.js') ?>"></script>
<script src="https://cdn.datatables.net/select/1.7.0/js/dataTables.select.min.js"></script> <script src="https://cdn.datatables.net/select/1.7.0/js/dataTables.select.min.js"></script>
<script src="<?= site_url('themes/vuexy/js/datatables-editor/dataTables.editor.min.js') ?>"></script>
<script src="<?= site_url('themes/vuexy/vendor/libs/autosize/autosize.js') ?>"></script> <script src="<?= site_url('themes/vuexy/vendor/libs/autosize/autosize.js') ?>"></script>
<script src="<?= site_url('js_loader/comparadorCosidoTapaBlanda_js') ?>"></script> <script src="<?= site_url('js_loader/comparadorCosidoTapaBlanda_js') ?>"></script>