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

muchos cambios (y no los papeles)

Browse Source
This commit is contained in:
Jaime Jiménez
2024-11-14 20:43:13 +01:00
parent 923c283c22
commit c19d1ffae8
11 changed files with 277 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
ci4/app/Views/themes/vuexy/form/clientes/plantillaprecios/viewClienteplantillapreciosForm.php
View File

@ -278,14 +278,26 @@
language: {
url: "/themes/vuexy/vendor/libs/datatables-sk/plugins/i18n/es-ES.json"
},
buttons: [ {
className: 'btn btn-primary me-sm-3 me-1',
extend: "createInline",
editor: editor,
formOptions: {
submitTrigger: -1,
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
}
buttons: [
{
extend: 'collection',
text: 'Exportar',
buttons:[
'copy', 'csv', 'excel', 'print', {
extend: 'pdfHtml5',
orientation: 'landscape',
pageSize: 'A4'
}
]
},
{
className: 'btn btn-primary me-sm-3 me-1',
extend: "createInline",
editor: editor,
formOptions: {
submitTrigger: -1,
submitHtml: '<a href="javascript:void(0);"><i class="ti ti-device-floppy"></i></a>'
}
} ]
} );

8
ci4/app/Views/themes/vuexy/form/presupuestos/cliente/disenioLibro.js
View File

@ -684,7 +684,7 @@ async function calcularPresupuesto() {
datos = Object.assign(datos, window.token_ajax)
$('#divTiradasPrecio').empty();
$('.divTiradasPrecio').empty();
$('#loader').show();
$.ajax({
@ -741,7 +741,7 @@ async function calcularPresupuesto() {
$('#loader').hide();
$('#divTiradasPrecio').empty();
$('.divTiradasPrecio').empty();
if(!error){
@ -768,7 +768,7 @@ async function calcularPresupuesto() {
html += '</a>';
html += '</div>';
$('#divTiradasPrecio').append(html);
$('.divTiradasPrecio').append(html);
}
}
@ -783,7 +783,7 @@ async function calcularPresupuesto() {
},
error: function (error) {
$('#loader').hide();
$('#divTiradasPrecio').empty();
$('.divTiradasPrecio').empty();
}
});
}

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

@ -49,13 +49,12 @@
</div>
<div class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " d-none" : "" ?>" >
<label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
id="label_clienteId" for="clienteId" class="form-label">
<div
class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " d-none" : "" ?>">
<label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " hidden" : "" ?> id="label_clienteId" for="clienteId" class="form-label">
Cliente*
</label>
<select <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
id="clienteId" name="cliente_id" class="form-control select2bs2 calcular-presupuesto"
<select <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " hidden" : "" ?> id="clienteId" name="cliente_id" class="form-control select2bs2 calcular-presupuesto"
style="width: 100%;">
<?php if (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')): ?>
<option value="<?= $clienteId ?>" selected>cliente</option>
@ -64,13 +63,12 @@
</div>
<div class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " d-none" : "" ?>" >
<div
class="col-sm-5 mb-3 d-flex flex-column align-items-center <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " d-none" : "" ?>">
<div class="form-check form-switch mb-2">
<input <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
class="calcular-presupuesto form-check-input" type="checkbox" id="excluirRotativa"
<input <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " hidden" : "" ?> class="calcular-presupuesto form-check-input" type="checkbox" id="excluirRotativa"
name="excluir_rotativa" value="1">
<label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor'))? " hidden" : "" ?>
class="form-check-label" for="excluirRotativa">Excluir rotativa</label>
<label <?= (auth()->user()->inGroup('cliente-admin') || auth()->user()->inGroup('cliente-editor')) ? " hidden" : "" ?> class="form-check-label" for="excluirRotativa">Excluir rotativa</label>
</div>
</div>
@ -271,10 +269,36 @@
</div>
<div class="row col-sm-9 mb-3 d-flex flex-column align-items-left">
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="prototipo" name="prototipo"
value="1">
<label class="form-check-label" for="prototipo">Prototipo</label>
<div class="row" >
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="prototipo" name="prototipo"
value="1">
<label class="form-check-label" for="prototipo">Prototipo</label>
</div>
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="ferro" name="ferro" value="1">
<label class="form-check-label" for="ferro">Ferro</label>
</div>
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="ferroDigital"
name="ferro_digital" value="1">
<label class="form-check-label" for="ferro">Ferro digital</label>
</div>
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="marcapaginas"
name="marcapaginas" value="1">
<label class="form-check-label" for="ferro">Marcapáginas</label>
</div>
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="retractilado"
name="retractilado" value="1">
<label class="form-check-label" for="ferro">Retractilado</label>
</div>
<div class="col-sm-3 form-check form-switch mb-2">
<input class="calcular-presupuesto form-check-input" type="checkbox" id="retractilado5"
name="retractilado5" value="1">
<label class="form-check-label" for="ferro">Retractilado de 5</label>
</div>
</div>
</div>

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

@ -45,160 +45,10 @@
</div>
<div class="offcanvas-body">
<div class="bs-stepper-header">
<div <?= ($state == 2) ? 'hidden' : '' ?> class="step active titulos-menu" data-target="#datos-generales">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
<span class="bs-stepper-circle"><i class="ti ti-info-circle ti-sm"></i></span>
<span class="bs-stepper-label">
<span class="bs-stepper-title">Datos generales</span>
</span>
</button>
</div>
<div <?= ($state == 2) ? 'hidden' : '' ?> class="step titulos-menu" data-target="#interior-libro">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
<span class="bs-stepper-circle"><i class="ti ti-book ti-sm"></i></span>
<span class="bs-stepper-label">
<span class="bs-stepper-title">Interior</span>
</span>
</button>
</div>
<div <?= ($state == 2) ? 'hidden' : '' ?> class="step titulos-menu" data-target="#cubierta-libro">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
<span class="bs-stepper-circle"><i class="ti ti-books ti-sm"></i></span>
<span class="bs-stepper-label">
<span class="bs-stepper-title">Cubierta</span>
</span>
</button>
</div>
<div <?= ($state == 2) ? 'hidden' : '' ?> class="step titulos-menu" data-target="#direcciones-libro">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
<span class="bs-stepper-circle"><i class="ti ti-map-pins ti-sm"></i></span>
<span class="bs-stepper-label">
<span class="bs-stepper-title">Direcciones</span>
</span>
</button>
</div>
<div id="menu_resumen_button" class="step titulos-menu" data-target="#resumen-libro">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
<span class="bs-stepper-circle"><i class="ti ti-checkbox ti-sm"></i></span>
<span class="bs-stepper-label">
<span class="bs-stepper-title">Resumen del presupuesto</span>
</span>
</button>
</div>
<div class="line"></div>
<div id='resumenLateral' class="container align-items-center">
<div class="rl-datos-generales rl-item d-none">
<div class="row">Libro</div>
<div class="row">
<ul class="list-group list-group-timeline">
<li id="rl_tipo" class="list-group-item list-group-timeline-primary texto-resumen-lateral">Rustica
Fresado</li>
<li id="rl_tipo_cubierta" class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Tapa
dura</li>
<li id="rl_tamanio" class="list-group-item list-group-timeline-primary texto-resumen-lateral">170.0
x
240.0</li>
<li id="rl_tiradas" class="list-group-item list-group-timeline-primary texto-resumen-lateral">10,
50,
100, 200</li>
<li id="rl_paginas" class="list-group-item list-group-timeline-primary texto-resumen-lateral">340
páginas</li>
</ul>
</div>
</div>
<div class="rl-interior rl-item d-none">
<div class="row">Interior</div>
<div class="row">
<ul class="list-group list-group-timeline">
<li id="rl_tipo_interior" class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Blanco y
negro estándar</li>
<li id="rl_papel_interior"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Offset
blanco 90 gr.</li>
<li id="rl_papel_interior_color"
class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">Offset
blanco 90 gr.</li>
</ul>
</div>
</div>
<div class="rl-cubierta rl-item d-none">
<div class="row">Cubierta</div>
<div class="row">
<ul class="list-group list-group-timeline">
<li id="rl_papel_cubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Estucado
Mate
300 gr.</li>
<li id="rl_caras_cubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Impresa
1
cara</li>
<li id="rl_acabado_cubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Plastificado brillo</li>
</ul>
</div>
</div>
<div class="rl-sobrecubierta rl-item d-none">
<div class="row">Sobrecubierta</div>
<div class="row">
<ul class="list-group list-group-timeline">
<li id="rl_no_sobrecubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
No</li>
<li id="rl_papel_sobrecubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">Estucado mate 170 gr
</li>
<li id="rl_tamanio_sobrecubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
60mm</li>
<li id="rl_acabado_sobrecubierta"
class="list-group-item list-group-timeline-primary texto-resumen-lateral">
Plastificado brillo</li>
</ul>
</div>
</div>
<div class="rl-servicios-extra rl-item d-none">
<div class="row">Servicios extra</div>
<div class="row">
<ul class="list-group list-group-timeline">
<li id="rl_prototipo"
class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Prototipo</li>
</ul>
</div>
</div>
</div>
<div id='divTiradasPrecio'></div>
</div> <!--//.bs-stepper-header -->
</div>
</div>
<div class="bs-stepper-header d-none d-md-flex">
<div class="bs-stepper-header col-3">
<div <?= ($state == 2) ? 'hidden' : '' ?> class="step active titulos-menu" data-target="#datos-generales">
<button type="button" class="step-trigger" aria-selected="false" disabled="disabled">
@ -332,13 +182,33 @@
<li id="rl_prototipo" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Prototipo</li>
</ul>
<ul class="list-group list-group-timeline">
<li id="rl_ferro" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Ferro</li>
</ul>
<ul class="list-group list-group-timeline">
<li id="rl_ferroDigital" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Ferro digital</li>
</ul>
<ul class="list-group list-group-timeline">
<li id="rl_marcapaginas" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Marcapáginas</li>
</ul>
<ul class="list-group list-group-timeline">
<li id="rl_retractilado" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Retractilado</li>
</ul>
<ul class="list-group list-group-timeline">
<li id="rl_retractilado5" class="list-group-item list-group-timeline-primary texto-resumen-lateral d-none">
Retractilado de 5</li>
</ul>
</div>
</div>
</div>
<div id='divTiradasPrecio'></div>
<div class='divTiradasPrecio'></div>
</div> <!--//.bs-stepper-header -->

2
ci4/app/Views/themes/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.js
View File

@ -777,7 +777,7 @@ function convertirTiempo(horas){
// se convierte a formato hh:mm:ss
const h = Math.floor(seconds / 3600);
const minutos = Math.floor((seconds % 3600) / 60);
const segundos = seconds % 60;
const segundos = round(seconds % 60, 0);
return h + ':' + minutos + ':' + segundos;
}
else{