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

corregido bug de foco lp. añadidos decimales gotas. cambiado a tipo number inputs rot

Browse Source
This commit is contained in:
Jaime Jiménez
2024-03-06 18:02:53 +01:00
parent 130dbba303
commit c3087ba203
5 changed files with 48 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ci4/app/Controllers/Presupuestos/Cosidotapablanda.php
View File

@ -496,8 +496,8 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
'magenta' => floatval($reqData['magenta']) ?? 0,
'amarillo' => floatval($reqData['amarillo']) ?? 0,
'cg' => floatval($reqData['cg']) ?? 0,
'gota_negro' => intval($reqData['gota_negro']) ?? 0,
'gota_color' => intval($reqData['gota_color']) ?? 0,
'gota_negro' => floatval($reqData['gota_negro']) ?? 0,
'gota_color' => floatval($reqData['gota_color']) ?? 0,
);
array_push($datosTipolog, $data);
}
@ -541,8 +541,8 @@ class Cosidotapablanda extends \App\Controllers\GoBaseResourceController
'cyan' => floatval($reqData['cyan']) ?? 0,
'magenta' => floatval($reqData['magenta']) ?? 0,
'amarillo' => floatval($reqData['amarillo']) ?? 0,
'gota_negro' => intval($reqData['gota_negro']) ?? 0,
'gota_color' => intval($reqData['gota_color']) ?? 0,
'gota_negro' => floatval($reqData['gota_negro']) ?? 0,
'gota_color' => floatval($reqData['gota_color']) ?? 0,
);
array_push($datosTipolog, $data);
}

26
ci4/app/Controllers/Presupuestos/Presupuestotiradasalternativas.php
View File

@ -156,12 +156,12 @@ class Presupuestotiradasalternativas extends \App\Controllers\GoBaseResourceCont
'rotativa_gota_negro' => 0,
'rotativa_gota_color' => 0,
);
$parametrosRotativa->rotativa_gota_negro = intval($linea['gotaNegro']?? 0);
$parametrosRotativa->rotativa_gota_color = intval($linea['gotaColor']?? 0);
$parametrosRotativa->rotativa_negro = intval($linea['cobNegro'] ?? 0);
$parametrosRotativa->rotativa_cyan = intval($linea['cobCyan'] ?? 0);
$parametrosRotativa->rotativa_magenta = intval($linea['cobMagenta']?? 0);
$parametrosRotativa->rotativa_amarillo = intval($linea['cobAmarillo']?? 0);
$parametrosRotativa->rotativa_gota_negro = floatval($linea['gotaNegro']?? 0);
$parametrosRotativa->rotativa_gota_color = floatval($linea['gotaColor']?? 0);
$parametrosRotativa->rotativa_negro = floatval($linea['cobNegro'] ?? 0);
$parametrosRotativa->rotativa_cyan = floatval($linea['cobCyan'] ?? 0);
$parametrosRotativa->rotativa_magenta = floatval($linea['cobMagenta']?? 0);
$parametrosRotativa->rotativa_amarillo = floatval($linea['cobAmarillo']?? 0);
break;
case 'lp_cubierta':
$uso = 'cubierta';
@ -195,13 +195,13 @@ class Presupuestotiradasalternativas extends \App\Controllers\GoBaseResourceCont
if (!is_null($datosTipolog)) {
$datosTipolog = [];
$data_temp = (object)array(
'negro' => intval($linea['cobNegro'] ?? 0),
'cyan' => intval($linea['cobCyan'] ?? 0),
'magenta' => intval($linea['cobMagenta']?? 0),
'amarillo' => intval($linea['cobAmarillo']?? 0),
'cg' => intval($linea['cobCG'] ?? 0),
'gota_negro' => intval($linea['gotaNegro']?? 0),
'gota_color' => intval($linea['gotaColor']?? 0),
'negro' => floatval($linea['cobNegro'] ?? 0),
'cyan' => floatval($linea['cobCyan'] ?? 0),
'magenta' => floatval($linea['cobMagenta']?? 0),
'amarillo' => floatval($linea['cobAmarillo']?? 0),
'cg' => floatval($linea['cobCG'] ?? 0),
'gota_negro' => floatval($linea['gotaNegro']?? 0),
'gota_color' => floatval($linea['gotaColor']?? 0),
);
array_push($datosTipolog, $data_temp);
}

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

@ -90,6 +90,18 @@ const papelGenericoRotativaColorList = <?php echo json_encode($papelGenericoRota
// variable para controlar el foco en los inputs
let focused = 0;
function change_focus(){
// se comprueba que el elemento es un input
if($('#'+focused).is('input')){
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
}
}
// Formatting function for row details - modify as you need
function format(d) {
@ -167,7 +179,7 @@ function format(d) {
'</div>'+
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.numPagColor') ?>' +
'<input type="text" id="' + d.row_id +'_numPagColor" name="' + d.row_id +'_numPagColor" class="lp-cell lp-input' + (d.row_id.includes('color')?'" ':' lp-cell-disabled" readonly ') + ' value="' + d.numPagColor +'">' +
'<input type="number" id="' + d.row_id +'_numPagColor" name="' + d.row_id +'_numPagColor" class="lp-cell lp-input no-spinner' + (d.row_id.includes('color')?'" ':' lp-cell-disabled" readonly ') + ' value="' + d.numPagColor +'">' +
'</div>' +
((d.row_id.includes('rot'))?'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.saturacion') ?>' +
@ -175,32 +187,32 @@ function format(d) {
'</div>':'') +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobNegro') ?>' +
'<input type="text" id="' + d.row_id +'_cobNegro" name="' + d.row_id +'_cobNegro" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobNegro +'">' +
'<input type="number" id="' + d.row_id +'_cobNegro" name="' + d.row_id +'_cobNegro" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobNegro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobCyan') ?>' +
'<input type="text" id="' + d.row_id +'_cobCyan" name="' + d.row_id +'_cobCyan" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobCyan +'">' +
'<input type="number" id="' + d.row_id +'_cobCyan" name="' + d.row_id +'_cobCyan" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobCyan +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobMagenta') ?>' +
'<input type="text" id="' + d.row_id +'_cobMagenta" name="' + d.row_id +'_cobMagenta" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobMagenta +'">' +
'<input type="number" id="' + d.row_id +'_cobMagenta" name="' + d.row_id +'_cobMagenta" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobMagenta +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobAmarillo') ?>' +
'<input type="text" id="' + d.row_id +'_cobAmarillo" name="' + d.row_id +'_cobAmarillo" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobAmarillo +'">' +
'<input type="number" id="' + d.row_id +'_cobAmarillo" name="' + d.row_id +'_cobAmarillo" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobAmarillo +'">' +
'</div>' +
((!d.row_id.includes('rot'))?
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.cobCG') ?>' +
'<input type="text" id="' + d.row_id +'_cobCG" name="' + d.row_id +'_cobCG" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobCG +'">' +
'<input type="number" id="' + d.row_id +'_cobCG" name="' + d.row_id +'_cobCG" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.cobCG +'">' +
'</div>':'') +
'<div class="col-md-12 col-lg-1">' +
'<?= lang('Presupuestos.gotaNegro') ?>' +
'<input type="text" id="' + d.row_id +'_gotaNegro" name="' + d.row_id +'_gotaNegro" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.gotaNegro +'">' +
'<input type="number" id="' + d.row_id +'_gotaNegro" name="' + d.row_id +'_gotaNegro" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.gotaNegro +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1 ">' +
'<?= lang('Presupuestos.gotaColor') ?>' +
'<input type="text" id="' + d.row_id +'_gotaColor" name="' + d.row_id +'_gotaColor" class="lp-cell lp-input ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.gotaColor +'">' +
'<input type="number" id="' + d.row_id +'_gotaColor" name="' + d.row_id +'_gotaColor" class="lp-cell lp-input no-spinner ' + d.row_class +'-input ' + d.row_class +'-tipologia" value="' + d.gotaColor +'">' +
'</div>' +
'<div class="col-md-12 col-lg-1" style="display: grid;" >' +
'<?= lang('Presupuestos.aFavorFibra') ?>' +
@ -612,7 +624,7 @@ var tableLineasPresupuesto = new DataTable('#tableLineasPresupuesto',{
.addClass('form-control form-select-sm lp-cell lp-select ' + row.row_class + '-select')
.css('min-width', '40px')
var option = '<option value="" selected>'+data+'</option>';
var option = '<option value="" selected>'+ parseInt(data)+'</option>';
select.append(option);
return select[0].outerHTML
@ -812,8 +824,8 @@ function processRowData(row, rowId, rowClass){
data.cobCyan = isNaN(parseFloat(row.datosTipologias.cyan)) ? "" : parseFloat(row.datosTipologias.cyan).toFixed(2)
data.cobMagenta = isNaN(parseFloat(row.datosTipologias.magenta)) ? "" : parseFloat(row.datosTipologias.magenta).toFixed(2)
data.cobAmarillo = isNaN(parseFloat(row.datosTipologias.amarillo)) ? "" : parseFloat(row.datosTipologias.amarillo).toFixed(2)
data.gotaNegro = isNaN(parseFloat(row.datosTipologias.gota_negro)) ? "" : parseFloat(row.datosTipologias.gota_negro).toFixed(0)
data.gotaColor = isNaN(parseFloat(row.datosTipologias.gota_color)) ? "" : parseFloat(row.datosTipologias.gota_color).toFixed(0)
data.gotaNegro = isNaN(parseFloat(row.datosTipologias.gota_negro)) ? "" : parseFloat(row.datosTipologias.gota_negro).toFixed(2)
data.gotaColor = isNaN(parseFloat(row.datosTipologias.gota_color)) ? "" : parseFloat(row.datosTipologias.gota_color).toFixed(2)
data.resolucion = isNaN(parseFloat(row.resolucion)) ? "" : parseFloat(row.resolucion).toFixed(0)
data.areaPaginas = isNaN(parseFloat(row.superficie)) ? "" : parseFloat(row.superficie).toFixed(2)
@ -859,7 +871,7 @@ function processRowData(row, rowId, rowClass){
if(!rowId.includes('rot')){
data.cobCG = isNaN(parseFloat(row.datosTipologias.cg)) ? "" : parseFloat(row.datosTipologias.cg).toFixed(2)
data.gotasCG = isNaN(parseFloat(row.num_gotas_cg)) ? "" : parseFloat(row.num_gotas_cg).toFixed(0)
data.gotasCG = isNaN(parseFloat(row.num_gotas_cg)) ? "" : parseFloat(row.num_gotas_cg).toFixed(2)
data.gTintaCG = isNaN(parseFloat(row.peso_gotas_cg)) ? "" : parseFloat(row.peso_gotas_cg).toFixed(2)
data.gTintaCGPed = isNaN(parseFloat(row.peso_gotas_cg_pedido)) ? "" : parseFloat(row.peso_gotas_cg_pedido).toFixed(2)
}
@ -2221,11 +2233,7 @@ function fill_lp_bnhq(row, fromComparator=false){
}
$("#tableLineasPresupuesto").DataTable().columns.adjust();
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
change_focus();
}
function eventos_lp_bnhq(isInkjet = false){
@ -2562,11 +2570,7 @@ function fill_lp_colorhq(row, fromComparator=false){
}
$("#tableLineasPresupuesto").DataTable().columns.adjust();
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
change_focus();
}
function eventos_lp_colorhq(isInkjet = false){
@ -2909,12 +2913,7 @@ function fill_lp_rot_bn(row, fromComparador=false){
$('.lp_rot_bn').css('display', '')
$("#tableLineasPresupuesto").DataTable().columns.adjust();
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
change_focus();
}
function eventos_lp_rot_bn(){
@ -3258,12 +3257,7 @@ function fill_lp_rot_color(row, fromComparador=false){
}
$("#tableLineasPresupuesto").DataTable().columns.adjust();
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
change_focus();
}
function eventos_lp_rot_color(){
@ -3536,11 +3530,7 @@ function fill_lp_cubierta(row, fromComparador=false){
}
$("#tableLineasPresupuesto").DataTable().columns.adjust();
if(focused){
$('#'+focused).focus();
$('#'+focused).select();
focused = 0;
}
change_focus();
}
function eventos_lp_cubierta(){

2
ci4/app/Views/themes/backend/vuexy/form/presupuestos/cosidotapablanda/_tiradasAlternativasItems.php
View File

@ -18,7 +18,7 @@
<p><?= lang('Presupuestos.tiradasInfoIVA') ?></p>
<input type="hidden" name="tirada_alternativa_json_data" id="tirada_alternativa_json_data" class="form-control" value='<?= isset($presupuestoEntity->tirada_alternativa_json_data)?$presupuestoEntity->tirada_alternativa_json_data:'' ?>'></input>
<div class='d-flex justify-content-end '>
<input id="tirada_alt" type="number" style="width: 10% !important; display: inline-flex !important" class="form-control" value="1" min="1" step="1">
<input id="tirada_alt" type="number" style="width: 120px !important; display: inline-flex !important" class="form-control" value="1" min="1" step="1">
<button id="add_tirada_alt" type="button" class="btn btn-secondary waves-effect waves-light"><i class="ti ti-circle-plus"></i></button>
</div>
<table id="tableTiradas" class="comparator-table table dt-responsive dataTable" style="width: 100%;">

2
httpdocs/themes/vuexy/css/sk-datatables.css
View File

@ -116,7 +116,7 @@ div.draw-rot-shapes {
}
/* CSS class to remove number input spinner */
.no-spinner {
.no-spinner {
/* For Firefox */
-moz-appearance: textfield;
}