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 'mod/tamanio_inputs' into 'main'

Browse Source 
realizados cambios

See merge request jjimenez/safekat!378
This commit is contained in:
Jaime Jimenez Ortega
2024-11-13 09:20:42 +00:00
parent e5b892480b 5a6dbe5ca8
commit 262886a6b9
8 changed files with 138 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/items/_datosGenerales.php
View File

@ -76,7 +76,7 @@
<div class="row col-sm-10 mb-3 justify-content-center"> <div class="row col-sm-10 mb-3 justify-content-center">
<div class="col-sm-2 d-flex flex-column align-items-center mx-1"> <div class="col-sm-2 d-flex flex-column align-items-center mx-1 div-num-input">
<label for="tirada" class="form-label"> <label for="tirada" class="form-label">
<?= lang('Presupuestos.tirada') ?> 1* <?= lang('Presupuestos.tirada') ?> 1*
</label> </label>
@ -84,7 +84,7 @@
name="tirada" step="1" value="50"> name="tirada" step="1" value="50">
</div> </div>
<div class="col-sm-2 d-flex flex-column align-items-center mx-1"> <div class="col-sm-2 d-flex flex-column align-items-center mx-1 div-num-input">
<label for="tirada2" class="form-label"> <label for="tirada2" class="form-label">
<?= lang('Presupuestos.tirada') ?> 2 <?= lang('Presupuestos.tirada') ?> 2
</label> </label>
@ -92,7 +92,7 @@
name="tirada2" step="1" value=""> name="tirada2" step="1" value="">
</div> </div>
<div class="col-sm-2 d-flex flex-column align-items-center mx-1"> <div class="col-sm-2 d-flex flex-column align-items-center mx-1 div-num-input">
<label for="tirada3" class="form-label"> <label for="tirada3" class="form-label">
<?= lang('Presupuestos.tirada') ?> 3 <?= lang('Presupuestos.tirada') ?> 3
</label> </label>
@ -100,7 +100,7 @@
name="tirada3" step="1" value=""> name="tirada3" step="1" value="">
</div> </div>
<div class="col-sm-2 d-flex flex-column align-items-center mx-1"> <div class="col-sm-2 d-flex flex-column align-items-center mx-1 div-num-input">
<label for="tirada4" class="form-label"> <label for="tirada4" class="form-label">
<?= lang('Presupuestos.tirada') ?> 4 <?= lang('Presupuestos.tirada') ?> 4
</label> </label>
@ -122,16 +122,16 @@
<div id="formatoPersonalizado" class="row col-sm-8 justify-content-center d-none"> <div id="formatoPersonalizado" class="row col-sm-8 justify-content-center d-none">
<div class="col-sm-3 mb-1 mx-1"> <div class="col-sm-3 mb-1 mx-1 div-num-input">
<label class="form-label" for="papelFormatoAncho">Ancho Libro*</label> <label class="form-label" for="papelFormatoAncho">Ancho Libro*</label>
<input type="number" id="papelFormatoAncho" name="papel_formato_ancho" step="1" <input type="number" id="papelFormatoAncho" name="papel_formato_ancho" step="1"
class="form-control formato_libro calcular-presupuesto num-input" min="60" value="60"> class="form-control formato_libro calcular-presupuesto num-input" min="110" value="110">
</div> </div>
<div class="col-sm-3 mb-1 mx-1"> <div class="col-sm-3 mb-1 mx-1 div-num-input">
<label class="form-label" for="papelFormatoAlto">Alto Libro*</label> <label class="form-label" for="papelFormatoAlto">Alto Libro*</label>
<input type="number" id="papelFormatoAlto" name="papel_formato_alto" step="1" <input type="number" id="papelFormatoAlto" name="papel_formato_alto" step="1"
class="form-control formato_libro calcular-presupuesto num-input" min="60" value="60"> class="form-control formato_libro calcular-presupuesto num-input" min="170" value="170">
</div> </div>
</div> </div>

14
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/items/_resumen.php
View File

@ -3,13 +3,6 @@
<h3 class="mb-1 fw-bold">Resumen del presupuesto</h3> <h3 class="mb-1 fw-bold">Resumen del presupuesto</h3>
<div class="line mb-4"></div> <div class="line mb-4"></div>
<div class="col-sm-8 mb-3 d-flex flex-column align-items-center">
<h5 class="mb-1 "> Precio unidad: <span id="resumenPrecioU"></span> €</h5>
<h4 class="mb-1 "> Total base: <span id="resumenTotalBase"></span> €</h>
<h4 class="mb-1 "> Iva (<span id="resumenIvaPorcentaje"></span>%): <span id="resumenIva"></span> €</h>
<h3 class="mt-3 mb-1 fw-bold"> Total: <span id="resumenTotal"></span> €</h>
</div><!--//.mb-3 -->
<div id="divFormaCubierta" class="col-sm-12 mb-3 d-flex flex-column align-items-center"> <div id="divFormaCubierta" class="col-sm-12 mb-3 d-flex flex-column align-items-center">
<div class="row justify-content-center col-sm-12"> <div class="row justify-content-center col-sm-12">
<div id="btnPreviewCubierta" class="btn col-sm-4 btn-primary waves-effect waves-light ml-2"> <div id="btnPreviewCubierta" class="btn col-sm-4 btn-primary waves-effect waves-light ml-2">
@ -203,4 +196,11 @@
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="col-sm-8 mb-3 d-flex flex-column align-items-center">
<h5 class="mb-1 "> Precio unidad: <span id="resumenPrecioU"></span> €</h5>
<h4 class="mb-1 "> Total base: <span id="resumenTotalBase"></span> €</h>
<h4 class="mb-1 "> Iva (<span id="resumenIvaPorcentaje"></span>%): <span id="resumenIva"></span> €</h>
<h3 class="mt-3 mb-1 fw-bold"> Total: <span id="resumenTotal"></span> €</h>
</div><!--//.mb-3 -->
</div> </div>

2
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoList.php
View File

@ -62,7 +62,7 @@ const actionBtns = function(data) {
return ` return `
<td class="text-right py-0 align-middle"> <td class="text-right py-0 align-middle">
<div class="btn-group btn-group-sm"> <div class="btn-group btn-group-sm">
<a href="javascript:void(0);"><i class="ti ti-pencil ti-sm btn-edit mx-2" data-id="${data.id}"></i></a> <a href="javascript:void(0);"><i class="ti ti-eye ti-sm btn-edit mx-2" data-id="${data.id}"></i></a>
</div> </div>
</td>`; </td>`;
}; };

5
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/viewPresupuestoclienteForm.php
View File

@ -14,7 +14,10 @@
<div class="container-xxl flex-grow-1 container-p-y"> <div class="container-xxl flex-grow-1 container-p-y">
<div class="col-12"> <div class="col-12">
<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
<?php if ($state != 2): ?>
<h3 class="card-title"><?= $boxTitle ?? $pageTitle ?></h3>
<?php endif; ?>
<?= csrf_field() ?> <?= csrf_field() ?>
<?= view("themes/_commonPartialsBs/_alertBoxes") ?> <?= view("themes/_commonPartialsBs/_alertBoxes") ?>
<?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?> <?= !empty($validation->getErrors()) ? $validation->listErrors("bootstrap_style") : "" ?>

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

@ -388,29 +388,42 @@
language: { language: {
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
}, },
buttons: [ { buttons: [
className: 'btn btn-primary float-end me-sm-3 me-1', {
extend: "createInline", extend: 'collection',
editor: editor3, text: 'Exportar',
formOptions: { buttons:[
submitTrigger: -1, 'copy', 'csv', 'excel', 'print', {
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>' extend: 'pdfHtml5',
orientation: 'landscape',
pageSize: 'A4'
}
]
}, },
action: function ( e, dt, node, config ) { {
if(selected_tirada_id == -1){ className: 'btn btn-primary float-end me-sm-3 me-1',
popErrorAlert("<?= lang('TarifaEncuadernacionLineas.validation.error_seleccion_tiradas') ?>"); extend: "createInline",
} editor: editor3,
else{ formOptions: {
formOptions= { submitTrigger: -1,
submitTrigger: -1, submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
},
}; action: function ( e, dt, node, config ) {
editor3.inlineCreate(config.position, formOptions); if(selected_tirada_id == -1){
} popErrorAlert("<?= lang('TarifaEncuadernacionLineas.validation.error_seleccion_tiradas') ?>");
}, }
} ] else{
formOptions= {
submitTrigger: -1,
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
};
editor3.inlineCreate(config.position, formOptions);
}
},
}
]
} ); } );
@ -581,29 +594,42 @@
language: { language: {
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
}, },
buttons: [ { buttons: [
className: 'btn btn-primary float-end me-sm-3 me-1', {
extend: "createInline", extend: 'collection',
editor: editor, text: 'Exportar',
formOptions: { buttons:[
submitTrigger: -1, 'copy', 'csv', 'excel', 'print', {
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>' extend: 'pdfHtml5',
orientation: 'landscape',
pageSize: 'A4'
}
]
}, },
action: function ( e, dt, node, config ) { {
if(selected_tirada_id == -1){ className: 'btn btn-primary float-end me-sm-3 me-1',
popErrorAlert("<?= lang('TarifaEncuadernacionLineas.validation.error_seleccion_tiradas') ?>"); extend: "createInline",
} editor: editor,
else{ formOptions: {
formOptions= { submitTrigger: -1,
submitTrigger: -1, submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
},
}; action: function ( e, dt, node, config ) {
editor.inlineCreate(config.position, formOptions); if(selected_tirada_id == -1){
} popErrorAlert("<?= lang('TarifaEncuadernacionLineas.validation.error_seleccion_tiradas') ?>");
}, }
} ] else{
formOptions= {
submitTrigger: -1,
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
};
editor.inlineCreate(config.position, formOptions);
}
},
}
]
} ); } );
@ -733,7 +759,7 @@
select: true, select: true,
info: false, 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( { ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('dataTableOfTarifaEncuadernacionTiradas') ?>', url: '<?= route_to('dataTableOfTarifaEncuadernacionTiradas') ?>',
data: { data: {
id_tarifaencuadernacion: id, id_tarifaencuadernacion: id,
@ -768,13 +794,25 @@
language: { language: {
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json" url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
}, },
buttons: [ { buttons: [
className: 'btn btn-primary float-end me-sm-3 me-1', {
extend: "createInline", extend: 'collection',
editor: editor2, text: 'Exportar',
formOptions: { buttons:[
submitTrigger: -1, 'copy', 'csv', 'excel', 'print', {
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>' extend: 'pdfHtml5',
orientation: 'landscape',
pageSize: 'A4'
}
]
},
{
className: 'btn btn-primary float-end me-sm-3 me-1',
extend: "createInline",
editor: editor2,
formOptions: {
submitTrigger: -1,
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
} }
} ] } ]
} ); } );

18
ci4/app/Views/themes/vuexy/main/menus/presupuesto_cliente_menu.php
View File

@ -20,6 +20,15 @@ if (auth()->user()->inGroup('cliente-admin')
); );
?> ?>
</a> </a>
<?php if (auth()->user()->can('presupuesto-cliente.create')) { ?>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= route_to('nuevoPresupuestoCliente') ?>" class="menu-link">
Nuevo presupuesto
</a>
</li>
</ul>
<?php } ?>
<ul class="menu-sub"> <ul class="menu-sub">
<li class="menu-item"> <li class="menu-item">
<a href="<?= route_to("listaPresupuestos") ?>" class="menu-link"> <a href="<?= route_to("listaPresupuestos") ?>" class="menu-link">
@ -27,15 +36,6 @@ if (auth()->user()->inGroup('cliente-admin')
</a> </a>
</li> </li>
</ul> </ul>
<?php if (auth()->user()->can('presupuesto-cliente.create')) { ?>
<ul class="menu-sub">
<li class="menu-item">
<a href="<?= route_to('nuevoPresupuestoCliente') ?>" class="menu-link">
Añadir
</a>
</li>
</ul>
<?php } ?>
</li> </li>
<?php <?php
} }

11
httpdocs/assets/js/safekat/pages/presupuestoCliente/datosGenerales.js
View File

@ -89,6 +89,9 @@ class DatosGenerales {
this.pagColorConsecutivas.on('change', this.#handPaginasConsecutivas.bind(this)); this.pagColorConsecutivas.on('change', this.#handPaginasConsecutivas.bind(this));
this.papelDiferente.on('change', this.#handlePapelDiferente.bind(this)); this.papelDiferente.on('change', this.#handlePapelDiferente.bind(this));
this.anchoPersonalizado.on("change", this.#checkValue.bind(this));
this.altoPersonalizado.on("change", this.#checkValue.bind(this));
this.titulo.on('change', () => { $(".titulo").html(this.titulo.val()); }); this.titulo.on('change', () => { $(".titulo").html(this.titulo.val()); });
} }
@ -602,6 +605,14 @@ class DatosGenerales {
} }
} }
#checkValue(event){
let target = event.target;
if(target.value < target.min){
target.value = target.min;
}
}
#handleTipolibro(event) { #handleTipolibro(event) {
// Accede al ID del elemento que disparó el evento // Accede al ID del elemento que disparó el evento
const element = $(event.target); const element = $(event.target);

8
httpdocs/themes/vuexy/css/presupuestoCliente.css
View File

@ -476,4 +476,12 @@
.texto-resumen-lateral{ .texto-resumen-lateral{
font-size: 0.9em; font-size: 0.9em;
}
.num-input{
min-width: 100px;
}
.div-num-input{
min-width: 105px;
} }