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 'main' into 'dev/presupuestos_guardar_event'

Browse Source 
# Conflicts:
#   ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaForm.php
This commit is contained in:
Ignacio Martinez Navajas
2024-02-05 21:17:20 +00:00
parent a334ac6842 f84c652967
commit df02012019
16 changed files with 539 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -834,6 +834,7 @@
const dimension = getDimensionLibro();
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior',
color: is_color?1:0,
hq: is_hq?1:0,
@ -911,6 +912,7 @@
if(checkInputsForRotativa()){
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior_rot',
paginas: parseInt($('#paginas').val()),
paginas_negro: parseInt($('#compPaginasNegro').val()),
@ -988,6 +990,7 @@
const dimension = getDimensionLibro();
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'cubierta',
paginas: parseInt($('#compCarasCubierta').select2('data')[0].id),
tirada: parseInt($('#tirada').val()),

5
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_datosServiciosItems.php
View File

@ -877,8 +877,10 @@
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
if(tipo != null)
if(tipo != null){
datos['tipo'] = tipo;
datos['tipo_impresion_id'] = <?php echo $tipo_impresion_id; ?>;
}
$.ajax({
type: "POST",
@ -1095,6 +1097,7 @@
if(tipo != null){
datos['tipo'] = tipo;
datos['solapas'] = $('#solapas').is(':checked')?1:0;
datos['tipo_impresion_id'] = <?php echo $tipo_impresion_id; ?>;
}

204
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_lineasPresupuestoItems.php
View File

@ -90,26 +90,26 @@ function format(d) {
'<td></td>'+
'<td></td>'+
'<td colspan="10">'+
'<div class="row flex-grow-1 d-flex justify-content-center align-items-end">' +
'<div class="row flex-grow-1 d-flex align-items-end">' +
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.numeroPliegos") ?>" +
'<input id="' + d.row_id +'_numeroPliegos" name="' + d.row_id +'_numeroPliegos" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.numeroPliegos +'">'+
'<input readonly id="' + d.row_id +'_numeroPliegos" name="' + d.row_id +'_numeroPliegos" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.numeroPliegos +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.pliegosPedido") ?>" +
'<input id="' + d.row_id +'_pliegosPedido" name="' + d.row_id +'_pliegosPedido" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.pliegosPedido +'">'+
'<input readonly id="' + d.row_id +'_pliegosPedido" name="' + d.row_id +'_pliegosPedido" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.pliegosPedido +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.precioPliego") ?>" +
'<input id="' + d.row_id +'_precioPliego" name="' + d.row_id +'_precioPliego" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioPliego +'">'+
'<input readonly id="' + d.row_id +'_precioPliego" name="' + d.row_id +'_precioPliego" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioPliego +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.libro") ?>" +
'<input id="' + d.row_id +'_libro" name="' + d.row_id +'_libro" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.libro +'">'+
'<input readonly id="' + d.row_id +'_libro" name="' + d.row_id +'_libro" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.libro +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.totalPapelPedido") ?>" +
'<input id="' + d.row_id +'_totalPapelPedido" name="' + d.row_id +'_totalPapelPedido" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.totalPapelPedido +'">'+
'<input readonly id="' + d.row_id +'_totalPapelPedido" name="' + d.row_id +'_totalPapelPedido" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.totalPapelPedido +'">'+
'</div>'+
'<input id="' + d.row_id +'_margenPapelPedido" name="' + d.row_id +'_margenPapelPedido" readonly class="lp-input lp-cell lp-cell-disabled ' + d.row_class + '-input" type="text" value="' + d.margenPapelPedido +'" style="display: none;">' +
'<div class="d-flex col-md-auto justify-content-center align-items-center">' +
@ -117,23 +117,23 @@ function format(d) {
'</div>'+
'<div class="col-md-1 col-lg-1">' +
"<?= lang("Presupuestos.click") ?>" +
'<input id="' + d.row_id +'_click" name="' + d.row_id +'_click" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.click +'">'+
'<input readonly id="' + d.row_id +'_click" name="' + d.row_id +'_click" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.click +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.totalClicks") ?>" +
'<input id="' + d.row_id +'_totalClicks" name="' + d.row_id +'_totalClicks" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.totalClicks +'">'+
'<input readonly id="' + d.row_id +'_totalClicks" name="' + d.row_id +'_totalClicks" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.totalClicks +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.horas") ?>" +
'<input id="' + d.row_id +'_horasMaquina" name="' + d.row_id +'_horasMaquina" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.horasMaquina +'">'+
'<input readonly id="' + d.row_id +'_horasMaquina" name="' + d.row_id +'_horasMaquina" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.horasMaquina +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.precioHora") ?>" +
'<input id="' + d.row_id +'_precioHora" name="' + d.row_id +'_precioHora" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioHora +'">'+
'<input readonly id="' + d.row_id +'_precioHora" name="' + d.row_id +'_precioHora" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioHora +'">'+
'</div>'+
'<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.precioImpresion") ?>" +
'<input id="' + d.row_id +'_precioImpresion" name="' + d.row_id +'_precioImpresion" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioImpresion +'">'+
'<input readonly id="' + d.row_id +'_precioImpresion" name="' + d.row_id +'_precioImpresion" class="lp-input lp-cell lp-cell-disabled ' + d.row_class +'-input" type="text" value="' + d.precioImpresion +'">'+
'</div>'+
'<div class="d-flex col-md-auto justify-content-center align-items-center">' +
'<input id="' + d.row_id + '_checkClicks" name="' + d.row_id +'_checkClicks" class="update-totales" style="bottom:0;width: 15px; padding: 0; margin:0;" type="checkbox" ' + (d.check_impresion_total==true?'checked':'') + '>' +
@ -153,7 +153,7 @@ function format(d) {
'<td></td>'+
'<td></td>'+
'<td colspan="10">'+
'<div class="row flex-grow-1 d-flex justify-content-center align-items-end">' +
'<div class="row flex-grow-1 d-flex align-items-end">' +
'<div class="col-md-12 col-lg-1">' +
'<button id="' + d.row_id +'_defecto" name="' + d.row_id +'_defecto" type="button" class="btn btn-label-primary waves-effect lp-button"><?= lang('Presupuestos.porDefecto') ?></button>' +
'</div>'+
@ -163,7 +163,7 @@ function format(d) {
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.saturacion') ?>' +
'<input type="text" id="' + d.row_id +'_saturacion" name="' + d.row_id +'_saturacion" class="lp-cell lp-input lp-cell-disabled" readonly value="100">' +
'<input readonly type="text" id="' + d.row_id +'_saturacion" name="' + d.row_id +'_saturacion" class="lp-cell lp-input lp-cell-disabled" readonly value="100">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobNegro') ?>' +
@ -204,54 +204,54 @@ function format(d) {
'<td></td>'+
'<td></td>'+
'<td colspan="10">'+
'<div class="row flex-grow-1 d-flex justify-content-center align-items-end">' +
'<div class="row flex-grow-1 d-flex align-items-end">' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.metrosMinuto') ?>' +
'<input type="text" id="' + d.row_id +'_metrosMinuto" name="' + d.row_id +'_metrosMinuto" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosMinuto +'">' +
'<input readonly type="text" id="' + d.row_id +'_metrosMinuto" name="' + d.row_id +'_metrosMinuto" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosMinuto +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.resolucion') ?>' +
'<input type="text" id="' + d.row_id +'_resolucion" name="' + d.row_id +'_resolucion" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.resolucion +'">' +
'<input readonly type="text" id="' + d.row_id +'_resolucion" name="' + d.row_id +'_resolucion" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.resolucion +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.areaPaginas') ?>' +
'<input type="text" id="' + d.row_id +'_areaPaginas" name="' + d.row_id +'_areaPaginas" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.areaPaginas +'">' +
'<input readonly type="text" id="' + d.row_id +'_areaPaginas" name="' + d.row_id +'_areaPaginas" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.areaPaginas +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gotasNegro') ?>' +
'<input type="text" id="' + d.row_id +'_gotasNegro" name="' + d.row_id +'_gotasNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasNegro +'">' +
'<input readonly type="text" id="' + d.row_id +'_gotasNegro" name="' + d.row_id +'_gotasNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasNegro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gotasCyan') ?>' +
'<input type="text" id="' + d.row_id +'_gotasCyan" name="' + d.row_id +'_gotasCyan" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasCyan +'">' +
'<input readonly type="text" id="' + d.row_id +'_gotasCyan" name="' + d.row_id +'_gotasCyan" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasCyan +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gotasMagenta') ?>' +
'<input type="text" id="' + d.row_id +'_gotasMagenta" name="' + d.row_id +'_gotasMagenta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasMagenta +'">' +
'<input readonly type="text" id="' + d.row_id +'_gotasMagenta" name="' + d.row_id +'_gotasMagenta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasMagenta +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gotasAmarillo') ?>' +
'<input type="text" id="' + d.row_id +'_gotasAmarillo" name="' + d.row_id +'_gotasAmarillo" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasAmarillo +'">' +
'<input readonly type="text" id="' + d.row_id +'_gotasAmarillo" name="' + d.row_id +'_gotasAmarillo" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gotasAmarillo +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.precioPagNegro') ?>' +
'<input type="text" id="' + d.row_id +'_precioPagNegro" name="' + d.row_id +'_precioPagNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioPagNegro +'">' +
'<input readonly type="text" id="' + d.row_id +'_precioPagNegro" name="' + d.row_id +'_precioPagNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioPagNegro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.precioPagColor') ?>' +
'<input type="text" id="' + d.row_id +'_precioPagColor" name="' + d.row_id +'_precioPagColor" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioPagColor +'">' +
'<input readonly type="text" id="' + d.row_id +'_precioPagColor" name="' + d.row_id +'_precioPagColor" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioPagColor +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.factorAltura') ?>' +
'<input type="text" id="' + d.row_id +'_factorAltura" name="' + d.row_id +'_factorAltura" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.factorAltura +'">' +
'<input readonly type="text" id="' + d.row_id +'_factorAltura" name="' + d.row_id +'_factorAltura" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.factorAltura +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.factorAnchura') ?>' +
'<input type="text" id="' + d.row_id +'_factorAnchura" name="' + d.row_id +'_factorAnchura" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.factorAnchura +'">' +
'<input readonly type="text" id="' + d.row_id +'_factorAnchura" name="' + d.row_id +'_factorAnchura" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.factorAnchura +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.paginasPliego') ?>' +
'<input type="text" id="' + d.row_id +'_paginasPliego" name="' + d.row_id +'_paginasPliego" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.paginasPliego +'">' +
'<input readonly type="text" id="' + d.row_id +'_paginasPliego" name="' + d.row_id +'_paginasPliego" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.paginasPliego +'">' +
'</div>' +
'</div>' +
'</td>' +
@ -260,54 +260,54 @@ function format(d) {
'<td></td>'+
'<td></td>'+
'<td colspan="10">'+
'<div class="row flex-grow-1 d-flex justify-content-center align-items-end">' +
'<div class="row flex-grow-1 d-flex align-items-end">' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.metrosPapelLibro') ?>' +
'<input type="text" id="' + d.row_id +'_metrosPapelLibro" name="' + d.row_id +'_metrosPapelLibro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosPapelLibro +'">' +
'<input readonly type="text" id="' + d.row_id +'_metrosPapelLibro" name="' + d.row_id +'_metrosPapelLibro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosPapelLibro +'">' +
'</div>' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.metrosPapelTotal') ?>' +
'<input type="text" id="' + d.row_id +'_metrosPapelTotal" name="' + d.row_id +'_metrosPapelTotal" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosPapelTotal +'">' +
'<input readonly type="text" id="' + d.row_id +'_metrosPapelTotal" name="' + d.row_id +'_metrosPapelTotal" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.metrosPapelTotal +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.clicksLibro') ?>' +
'<input type="text" id="' + d.row_id +'_clicksLibro" name="' + d.row_id +'_clicksLibro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.clicksLibro +'">' +
'<input readonly type="text" id="' + d.row_id +'_clicksLibro" name="' + d.row_id +'_clicksLibro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.clicksLibro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaNegro') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaNegro" name="' + d.row_id +'_gTintaNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaNegro +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaNegro" name="' + d.row_id +'_gTintaNegro" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaNegro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaCyan') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaCyan" name="' + d.row_id +'_gTintaCyan" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaCyan +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaCyan" name="' + d.row_id +'_gTintaCyan" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaCyan +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaMagenta') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaMagenta" name="' + d.row_id +'_gTintaMagenta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaMagenta +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaMagenta" name="' + d.row_id +'_gTintaMagenta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaMagenta +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaAmarillo') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaAmarillo" name="' + d.row_id +'_gTintaAmarillo" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaAmarillo +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaAmarillo" name="' + d.row_id +'_gTintaAmarillo" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaAmarillo +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.clicksPedido') ?>' +
'<input type="text" id="' + d.row_id +'_clicksPedido" name="' + d.row_id +'_clicksPedido" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.clicksPedido +'">' +
'<input readonly type="text" id="' + d.row_id +'_clicksPedido" name="' + d.row_id +'_clicksPedido" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.clicksPedido +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.totalClicks') ?>' +
'<input type="text" id="' + d.row_id +'_totalClicksPedido" name="' + d.row_id +'_totalClicksPedido" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalClicksPedido +'">' +
'<input readonly type="text" id="' + d.row_id +'_totalClicksPedido" name="' + d.row_id +'_totalClicksPedido" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalClicksPedido +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.totalTinta') ?>' +
'<input type="text" id="' + d.row_id +'_totalTinta" name="' + d.row_id +'_totalTinta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalTinta +'">' +
'<input readonly type="text" id="' + d.row_id +'_totalTinta" name="' + d.row_id +'_totalTinta" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalTinta +'">' +
'</div>' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.totalCorte') ?>' +
'<input type="text" id="' + d.row_id +'_totalCorte" name="' + d.row_id +'_totalCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalCorte +'">' +
'<input readonly type="text" id="' + d.row_id +'_totalCorte" name="' + d.row_id +'_totalCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalCorte +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.totalImpresion') ?>' +
'<input type="text" id="' + d.row_id +'_totalImpresion" name="' + d.row_id +'_totalImpresion" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalImpresion +'">' +
'<input readonly type="text" id="' + d.row_id +'_totalImpresion" name="' + d.row_id +'_totalImpresion" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.totalImpresion +'">' +
'</div>' +
'</div>' +
'</td>' +
@ -316,34 +316,34 @@ function format(d) {
'<td></td>'+
'<td></td>'+
'<td colspan="10">'+
'<div class="row flex-grow-1 d-flex justify-content-center align-items-end" >' +
'<div class="row flex-grow-1 d-flex align-items-end" >' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.velocidadCorte') ?>' +
'<input type="text" id="' + d.row_id +'_velocidadCorte" name="' + d.row_id +'_velocidadCorte" class="lp-cell lp-input lp-cell-disabled" readonly value="' + d.velocidadCorte +'">' +
'<input readonly type="text" id="' + d.row_id +'_velocidadCorte" name="' + d.row_id +'_velocidadCorte" class="lp-cell lp-input lp-cell-disabled" readonly value="' + d.velocidadCorte +'">' +
'</div>' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.precioHoraCorte') ?>' +
'<input type="text" id="' + d.row_id +'_precioHoraCorte" name="' + d.row_id +'_precioHoraCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioHoraCorte +'">' +
'<input readonly type="text" id="' + d.row_id +'_precioHoraCorte" name="' + d.row_id +'_precioHoraCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.precioHoraCorte +'">' +
'</div>' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') +
'<?= lang('Presupuestos.tiempoCorte') ?>' +
'<input type="text" id="' + d.row_id +'_tiempoCorte" name="' + d.row_id +'_tiempoCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.tiempoCorte +'">' +
'<input readonly type="text" id="' + d.row_id +'_tiempoCorte" name="' + d.row_id +'_tiempoCorte" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.tiempoCorte +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaNegroPed') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaNegroPed" name="' + d.row_id +'_gTintaNegroPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaNegroPed +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaNegroPed" name="' + d.row_id +'_gTintaNegroPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaNegroPed +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaCyanPed') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaCyanPed" name="' + d.row_id +'_gTintaCyanPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaCyanPed +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaCyanPed" name="' + d.row_id +'_gTintaCyanPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaCyanPed +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaMagentaPed') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaMagentaPed" name="' + d.row_id +'_gTintaMagentaPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaMagentaPed +'">' +
'<input readonly type="text" id="' + d.row_id +'_gTintaMagentaPed" name="' + d.row_id +'_gTintaMagentaPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaMagentaPed +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gTintaAmarilloPed') ?>' +
'<input type="text" id="' + d.row_id +'_gTintaAmarilloPed" name="' + d.row_id +'_gTintaAmarilloPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaAmarilloPed +'">'+
'<input readonly type="text" id="' + d.row_id +'_gTintaAmarilloPed" name="' + d.row_id +'_gTintaAmarilloPed" class="lp-cell lp-cell-disabled lp-input ' + d.row_class +'-input" readonly value="' + d.gTintaAmarilloPed +'">'+
'</div>' +
'</div>' +
'</td>' +
@ -1173,7 +1173,6 @@ function change_lp_bn_maquina(){
}
function change_lp_bn_paginas(){
if( parseInt($('#lp_bn_paginas').val())>0 &&
@ -1186,6 +1185,23 @@ function change_lp_bn_paginas(){
}
}
function change_lp_bn_aFavorFibra(){
if( parseInt($('#lp_bn_paginas').val())>0 &&
parseInt($('#lp_bn_papel option:selected').val())>0 &&
$('#lp_bn_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bn_papelImpresion option:selected').val())>0
){
var rowData = tableLineasPresupuesto.row('#lp_bn').data()
rowData.aFavorFibra = $('#lp_bn_aFavorFibra').prop('checked')
tableLineasPresupuesto.row('#lp_bn').data(rowData).draw(false)
calcularPresupuesto_bn(false, true);
}
}
function calcularPresupuesto_bn(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1203,6 +1219,7 @@ function calcularPresupuesto_bn(input_data={}, updatedTipologias = false){
}
var datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior',
color: 0,
hq: 0,
@ -1218,6 +1235,11 @@ function calcularPresupuesto_bn(input_data={}, updatedTipologias = false){
<?= csrf_token() ?? "token" ?> : <?= csrf_token() ?>v
};
// Si es inkjet, existe este check
if ($('#lp_bn_aFavorFibra').length){
datos.a_favor_fibra = $('#lp_bn_aFavorFibra').prop('checked')
}
if(updatedTipologias){
datos.gota_negro= $('#lp_bn_gotaNegro').val()
datos.gota_color= $('#lp_bn_gotaColor').val()
@ -1242,9 +1264,11 @@ function calcularPresupuesto_bn(input_data={}, updatedTipologias = false){
value.fields.papel_generico_id === input_data.papel_generico_id &&
value.fields.papel_impresion_id === input_data.papel_impresion_id) {
// Si viene del comparador
if(Object.keys(input_data).length == 0){
value.fields.check_papel_total = $('#lp_bn' + '_checkPapel').is(":checked")?1:0
value.fields.check_impresion_total = $('#lp_bn' + '_checkClicks').is(":checked")?1:0
}
else{
value.fields.check_papel_total = 1
@ -1352,6 +1376,7 @@ function eventos_lp_bn(isInkjet = false){
if(isInkjet){
$('.lp-bn-tipologia').bind("change", change_lp_bn_tipologia);
$('#lp_bn_defecto').bind("click", por_defecto_lp_bn);
$('#lp_bn_aFavorFibra').bind("change", change_lp_bn_aFavorFibra);
}
$('#lp_bn_checkPapel').bind("change", {id_linea: 'lp_bn'}, update_total_linea);
@ -1497,7 +1522,7 @@ function change_lp_color_tipologia(){
}
function por_defecto_lp_bn(){
function por_defecto_lp_color(){
if( parseInt($('#lp_color_paginas').val())>0 &&
parseInt($('#lp_color_papel option:selected').val())>0 &&
@ -1509,6 +1534,24 @@ function por_defecto_lp_bn(){
}
}
function change_lp_color_aFavorFibra(){
if( parseInt($('#lp_color_paginas').val())>0 &&
parseInt($('#lp_color_papel option:selected').val())>0 &&
$('#lp_color_gramaje option:selected').text().length>0 &&
parseInt($('#lp_color_papelImpresion option:selected').val())>0
){
var rowData = tableLineasPresupuesto.row('#lp_color').data()
rowData.aFavorFibra = $('#lp_color_aFavorFibra').prop('checked')
tableLineasPresupuesto.row('#lp_color').data(rowData).draw(false)
calcularPresupuesto_color(false, true);
}
}
function calcularPresupuesto_color(input_data={}, updatedTipologias = false){
const dimension = getDimensionLibro();
@ -1526,6 +1569,7 @@ function calcularPresupuesto_color(input_data={}, updatedTipologias = false){
}
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior',
color: 1,
hq: 0,
@ -1550,6 +1594,11 @@ function calcularPresupuesto_color(input_data={}, updatedTipologias = false){
datos.amarillo= $('#lp_color_cobAmarillo').val()
}
// Si es inkjet, existe este check
if ($('#lp_color_aFavorFibra').length){
datos.a_favor_fibra = $('#lp_color_aFavorFibra').prop('checked')
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1648,6 +1697,7 @@ function eventos_lp_color(isInkjet = false){
if(isInkjet){
$('.lp-color-tipologia').bind("change", change_lp_color_tipologia);
$('#lp_color_defecto').bind("click", por_defecto_lp_color);
$('#lp_color_aFavorFibra').bind("change", change_lp_color_aFavorFibra);
}
$('#lp_color_checkPapel').bind("change", {id_linea: 'lp_color'}, update_total_linea);
@ -1804,6 +1854,21 @@ function por_defecto_lp_bnhq(){
}
}
function change_lp_bnhq_aFavorFibra(){
if( parseInt($('#lp_bnhq_paginas').val())>0 &&
parseInt($('#lp_bnhq_papel option:selected').val())>0 &&
$('#lp_bnhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_bnhq_papelImpresion option:selected').val())>0
){
var rowData = tableLineasPresupuesto.row('#lp_bnhq').data()
rowData.aFavorFibra = $('#lp_bnhq_aFavorFibra').prop('checked')
tableLineasPresupuesto.row('#lp_bnhq').data(rowData).draw(false)
calcularPresupuesto_bnhq(false, true);
}
}
function calcularPresupuesto_bnhq(input_data={}, updatedTipologias = false){
@ -1822,6 +1887,7 @@ function calcularPresupuesto_bnhq(input_data={}, updatedTipologias = false){
}
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior',
color: 0,
hq: 1,
@ -1846,6 +1912,11 @@ function calcularPresupuesto_bnhq(input_data={}, updatedTipologias = false){
datos.amarillo= $('#lp_bnhq_cobAmarillo').val()
}
// Si es inkjet, existe este check
if ($('#lp_bnhq_aFavorFibra').length){
datos.a_favor_fibra = $('#lp_bnhq_aFavorFibra').prop('checked')?1:0
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -1943,6 +2014,7 @@ function eventos_lp_bnhq(isInkjet = false){
if(isInkjet){
$('.lp-bnhq-tipologia').bind("change", change_lp_bnhq_tipologia);
$('#lp_bnhq_defecto').bind("click", por_defecto_lp_bnhq);
$('#lp_bnhq_aFavorFibra').bind("change", change_lp_bnhq_aFavorFibra);
}
$('#lp_bnhq_checkPapel').bind("change", {id_linea: 'lp_bnhq'}, update_total_linea);
@ -2103,6 +2175,21 @@ function por_defecto_lp_colorhq(){
}
function change_lp_colorhq_aFavorFibra(){
if( parseInt($('#lp_colorhq_paginas').val())>0 &&
parseInt($('#lp_colorhq_papel option:selected').val())>0 &&
$('#lp_colorhq_gramaje option:selected').text().length>0 &&
parseInt($('#lp_colorhq_papelImpresion option:selected').val())>0
){
var rowData = tableLineasPresupuesto.row('#lp_colorhq').data()
rowData.aFavorFibra = $('#lp_colorhq_aFavorFibra').prop('checked')
tableLineasPresupuesto.row('#lp_colorhq').data(rowData).draw(false)
calcularPresupuesto_colorhq(false, true);
}
}
function calcularPresupuesto_colorhq(input_data={}, updatedTipologias = false){
@ -2121,6 +2208,7 @@ function calcularPresupuesto_colorhq(input_data={}, updatedTipologias = false){
}
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior',
color: 1,
hq: 1,
@ -2145,6 +2233,11 @@ function calcularPresupuesto_colorhq(input_data={}, updatedTipologias = false){
datos.amarillo= $('#lp_colorhq_cobAmarillo').val()
}
// Si es inkjet, existe este check
if ($('#lp_colorhq_aFavorFibra').length){
datos.a_favor_fibra = $('#lp_colorhq_aFavorFibra').prop('checked')?1:0
}
$.ajax({
type: "POST",
url: "/cosidotapablanda/datatable",
@ -2242,6 +2335,7 @@ function eventos_lp_colorhq(isInkjet = false){
if(isInkjet){
$('.lp-colorhq-tipologia').bind("change", change_lp_colorhq_tipologia);
$('#lp_colorhq_defecto').bind("click", por_defecto_lp_colorhq);
$('#lp_colorhq_aFavorFibra').bind("change", change_lp_colorhq_aFavorFibra);
}
$('#lp_colorhq_checkPapel').bind("change", {id_linea: 'lp_colorhq'}, update_total_linea);
@ -2412,6 +2506,7 @@ function calcularPresupuesto_rot_bn(fromComparador=false, updatedTipologias=fals
}
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior_rot',
color: 0,
hq: 0,
@ -2745,6 +2840,7 @@ function calcularPresupuesto_rot_color(fromComparador=false, updatedTipologias=f
paginas_color = isNaN(parseInt($('#lp_rot_color_numPagColor').val()))?input_data.paginas:parseInt($('#lp_rot_color_numPagColor').val())
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'interior_rot',
color: 1,
hq: 0,
@ -2786,6 +2882,7 @@ function calcularPresupuesto_rot_color(fromComparador=false, updatedTipologias=f
if(data.lineas.length >0){
// Se cogen los valores de la linea con los datos correspondientes
$.each(data.lineas, function(key, value) {
console.log(value.fields.num_formas)
fibra = $('#lp_rot_color_aFavorFibra').prop('checked')
if(fromComparador){
if(value.fields.maquina_id === input_data.maquina_id &&
@ -3060,6 +3157,7 @@ function calcularPresupuesto_cubierta(fromComparador=false, input_data={}){
let datos = {
tipo_impresion_id: <?php echo $tipo_impresion_id ?>,
type: 'cubierta',
color: 1,
hq: 1,
@ -3317,16 +3415,16 @@ function fill_lp_from_bbdd(){
switch(lp.tipo){
case 'lp_bn':
eventos_lp_bn()
eventos_lp_bn(lp.maquina_tipo=='inkjet'?true:false)
break
case 'lp_bnhq':
eventos_lp_bnhq()
eventos_lp_bnhq(lp.maquina_tipo=='inkjet'?true:false)
break
case 'lp_color':
eventos_lp_color()
eventos_lp_color(lp.maquina_tipo=='inkjet'?true:false)
break
case 'lp_colorhq':
eventos_lp_colorhq()
eventos_lp_colorhq(lp.maquina_tipo=='inkjet'?true:false)
break
case 'lp_rot_bn':
eventos_lp_rot_bn()

16
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_previewItems.php
View File

@ -740,50 +740,50 @@
$('#tab-pv-bn').on( "click", function() {
previewInteriorPlana('bn');
previewInteriorPlana('bn', <?php echo $isCosido; ?>);
} );
$('#tab-pv-bnhq').on( "click", function() {
previewInteriorPlana('bnhq');
previewInteriorPlana('bnhq', <?php echo $isCosido; ?>);
} );
$('#tab-pv-color').on( "click", function() {
previewInteriorPlana('color');
previewInteriorPlana('color', <?php echo $isCosido; ?>);
} );
$('#tab-pv-colorhq').on( "click", function() {
previewInteriorPlana('colorhq');
previewInteriorPlana('colorhq', <?php echo $isCosido; ?>);
} );
$('#tab-pv-rot-bn').on( "click", function() {
previewRotativa('rot_bn');
previewRotativa('rot_bn', <?php echo $isCosido; ?>);
} );
$('#tab-pv-rot-color').on( "click", function() {
previewRotativa('rot_color');
previewRotativa('rot_color', <?php echo $isCosido; ?>);
} );
$('#tab-pv-cubierta').on( "click", function() {
previewInteriorPlana('cubierta');
previewInteriorPlana('cubierta', <?php echo $isCosido; ?>);
} );
$('#tab-pv-esquema-cubierta').on( "click", function() {
previewEsquemaCubierta('ec');
previewEsquemaCubierta('ec', <?php echo $isCosido; ?>);
} );

25
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/previews.js
View File

@ -1,5 +1,5 @@
// Global parameters
var _isCosido = true;
//var _isCosido = true;
var pvObj;
var sangradoTexto = "Sangrado 5 mm";
@ -7,7 +7,7 @@ var sangradoValor = parseFloat(5); // mm
var offsetSolapaValor = parseFloat(0); // mm
function previewInteriorPlana(lpTagName) {
function previewInteriorPlana(lpTagName, isCosido) {
// Local parameters
let guardaV = 0;
@ -15,7 +15,7 @@ function previewInteriorPlana(lpTagName) {
let styleText = {size: 12, family: 'Public Sans'};
// Get the preview Object parameters
getObjetoLP(lpTagName);
getObjetoLP(lpTagName, isCosido);
// Configuracion de las guardas
// Guarda vertical
@ -83,7 +83,7 @@ function previewInteriorPlana(lpTagName) {
_pvPlana.update();
}
function previewRotativa(lpTagName) {
function previewRotativa(lpTagName, isCosido) {
// Local parameters
let styleText = {size: 12, family: 'Public Sans'};
@ -92,7 +92,7 @@ function previewRotativa(lpTagName) {
let guardaH = 0;
// Get the preview Object parameters
getObjetoLP(lpTagName);
getObjetoLP(lpTagName, isCosido);
// Calculos
// Configuracion de las guardas
@ -186,14 +186,14 @@ function getDecimalPart(floatNumber) {
}
function previewEsquemaCubierta(lpTagName) {
function previewEsquemaCubierta(lpTagName, isCosido) {
// Variables locales
let altoLibro, anchoLibro, lomoLibro, anchoSolapa, anchoCubierta, altoSangrado, anchoSangrado;
let styleCotas = {size: 12, family: 'Public Sans'};
// Get the preview Object parameters
getObjetoLP(lpTagName);
getObjetoLP(lpTagName, isCosido);
// Definicion de los parametros del Esquema de Cubierta (EC)
if (pvObj.anchoSolapa == 0) {
@ -360,7 +360,7 @@ function getLomoLibro() {
}
function getObjetoLP(lpName) {
function getObjetoLP(lpName, _isCosido) {
let rowData = null;
@ -455,10 +455,11 @@ function getObjetoLP(lpName) {
case 'rot_bn':
case 'rot_color':
if ((pvObj.anchoImpresion / pvObj.altoForma) > (pvObj.anchoImpresion / pvObj.anchoForma)) {
let auxReg = pvObj.anchoForma;
pvObj.anchoForma = pvObj.altoForma;
pvObj.altoForma = auxReg;
// Conditional assignements depending on rotation of the printing shape
if (pvObj.orientacionFormas == 'v') {
let auxReg = pvObj.altoForma;
pvObj.altoForma = pvObj.anchoForma;
pvObj.anchoForma = auxReg;
}
$(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
pvObj.altoClick = isNaN(parseFloat(rowData.alto_click))?305:parseFloat(rowData.alto_click);

9
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/viewCosidotapablandaList.php
View File

@ -9,8 +9,8 @@
<div class="card card-info">
<div class="card-header">
<h3 class="card-title"><?=lang('Presupuestos.presupuestoCosidotapablandaList') ?></h3>
<?=anchor(route_to('newCosidotapablanda'), lang('Basic.global.addNew').' '.lang('Presupuestos.presupuesto'), ['class'=>'btn btn-primary ']); ?>
<h3 class="card-title"><?= $pageTitle ?></h3>
<?=anchor(route_to('newCosidotapablanda', $tipo_impresion_id), lang('Basic.global.addNew').' '.lang('Presupuestos.presupuesto'), ['class'=>'btn btn-primary ']); ?>
</div><!--//.card-header -->
<div class="card-body">
<?= view('themes/_commonPartialsBs/_alertBoxes'); ?>
@ -155,6 +155,9 @@ theTable = $('#tableOfPresupuestos').DataTable({
},
ajax : $.fn.dataTable.pipeline( {
url: '<?= route_to('dataTableOfCosidotapablanda') ?>',
data: function (d) {
d.tipo_impresion_id = '<?php echo $tipo_impresion_id; ?>';
},
method: 'POST',
headers: {'X-Requested-With': 'XMLHttpRequest'},
async: true,
@ -218,7 +221,7 @@ theTable.on( 'draw.dt', function () {
$(document).on('click', '.btn-edit', function(e) {
window.location.href = `/presupuestos/cosidotapablanda/edit/${$(this).attr('data-id')}`;
window.location.href = `/presupuestos/cosidotapablanda/edit/${$(this).attr('data-id')}/`;
});