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

Browse Source 
arreglados bugs alto_click y formas_v/h y estetica

See merge request jjimenez/safekat!116
This commit is contained in:
Jaime Jimenez Ortega
2024-01-08 13:51:08 +00:00
parent ee28feacc4 c8539df82b
commit 2e710de44f
2 changed files with 9 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,8 +87,7 @@ function format(d) {
var value = '<tr>'+ var value = '<tr>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td colspan="10">'+
'<td colspan="9">'+
'<div class="row">' + '<div class="row">' +
'<div class="col-md-12 col-lg-1">' + '<div class="col-md-12 col-lg-1">' +
"<?= lang("Presupuestos.numeroPliegos") ?>" + "<?= lang("Presupuestos.numeroPliegos") ?>" +
@ -151,8 +150,7 @@ function format(d) {
'<tr>'+ '<tr>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td colspan="10">'+
'<td colspan="9">'+
'<div class="row">' + '<div class="row">' +
'<div class="col-md-12 col-lg-1">' + '<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>' + '<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>' +
@ -203,8 +201,7 @@ function format(d) {
'<tr class="calculos_' + d.row_id + '" style="display: none;">'+ '<tr class="calculos_' + d.row_id + '" style="display: none;">'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td colspan="10">'+
'<td colspan="9">'+
'<div class="row">' + '<div class="row">' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') + (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') ?>' + '<?= lang('Presupuestos.metrosMinuto') ?>' +
@ -260,8 +257,7 @@ function format(d) {
'<tr class="calculos_' + d.row_id + '" style="display: none;">'+ '<tr class="calculos_' + d.row_id + '" style="display: none;">'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td colspan="10">'+
'<td colspan="9">'+
'<div class="row">' + '<div class="row">' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') + (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') ?>' + '<?= lang('Presupuestos.metrosPapelLibro') ?>' +
@ -317,8 +313,7 @@ function format(d) {
'<tr class="calculos_' + d.row_id + '" style="display: none;">'+ '<tr class="calculos_' + d.row_id + '" style="display: none;">'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td></td>'+
'<td></td>'+ '<td colspan="10">'+
'<td colspan="9">'+
'<div class="row">' + '<div class="row">' +
(d.row_id.includes('rot')?'<div class="col-md-12 col-lg-1">': '<div class="col-md-12 col-lg-1" style="display:none;">') + (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') ?>' + '<?= lang('Presupuestos.velocidadCorte') ?>' +
@ -3044,8 +3039,8 @@ function fill_lp_from_bbdd(){
lp.dimensiones_maquina_impresion = [formas.maquina_impresion_ancho, formas.maquina_impresion_alto] lp.dimensiones_maquina_impresion = [formas.maquina_impresion_ancho, formas.maquina_impresion_alto]
lp.num_formas = { lp.num_formas = {
value : formas.formas, value : formas.formas,
formas_v : formas.formas_v, num_formas_verticales : formas.formas_v,
formas_h : formas.formas_h, num_formas_horizontales : formas.formas_h,
posicion_formas : formas.formas_orientacion posicion_formas : formas.formas_orientacion
} }
lp['tipo_maquina'] = lp['maquina_tipo'] lp['tipo_maquina'] = lp['maquina_tipo']
@ -3167,9 +3162,6 @@ async function fill_bbdd_from_lp(presupuesto_id){
tableLineasPresupuesto.rows().every( function ( rowIdx, tableLoop, rowLoop ) { tableLineasPresupuesto.rows().every( function ( rowIdx, tableLoop, rowLoop ) {
var rowData = this.data(); var rowData = this.data();
console.log(rowData)
console.log(rowData.formas_v)
console.log(rowData.formas_v)
const formas = { const formas = {
maquina_ancho: rowData.maquina_ancho, maquina_ancho: rowData.maquina_ancho,
maquina_alto: rowData.maquina_alto, maquina_alto: rowData.maquina_alto,
@ -3180,7 +3172,6 @@ async function fill_bbdd_from_lp(presupuesto_id){
formas_h: rowData.formas_h, formas_h: rowData.formas_h,
formas_orientacion: rowData.formas_orientacion, formas_orientacion: rowData.formas_orientacion,
} }
console.log(JSON.stringify(formas))
var t_maq_str = rowData.tiempo.split(':'); // split it at the colons var t_maq_str = rowData.tiempo.split(':'); // split it at the colons
var t_maq = 0 var t_maq = 0

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

@ -461,12 +461,9 @@ function getObjetoLP(lpName) {
pvObj.altoForma = auxReg; pvObj.altoForma = auxReg;
} }
$(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma); $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
pvObj.altoClick = 305; //parseFloat($('#lp_' + lpName + '_alto_click').val()); pvObj.altoClick = parseFloat(rowData.alto_click);
pvObj.nFormas = (_isCosido) ? pvObj.nFormas/2 : pvObj.nFormas;
$(pvName + '_nFormas').text(pvObj.nFormas);
pvObj.nFormasH = Math.trunc(pvObj.anchoImpresion / pvObj.anchoForma); pvObj.nFormasH = Math.trunc(pvObj.anchoImpresion / pvObj.anchoForma);
pvObj.nFormasV = Math.trunc((pvObj.altoImpresion - 3) / (pvObj.altoForma + 4)); pvObj.nFormasV = Math.trunc((pvObj.altoImpresion - 3) / (pvObj.altoForma + 4));
//console.log()
break; break;
case 'bn': case 'bn':
@ -480,8 +477,6 @@ function getObjetoLP(lpName) {
pvObj.anchoForma = auxReg; pvObj.anchoForma = auxReg;
} }
$(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma); $(pvName + '_forma').text(pvObj.anchoForma + "x" + pvObj.altoForma);
pvObj.nFormas = (_isCosido) ? pvObj.nFormas/2 : pvObj.nFormas;
$(pvName + '_nFormas').text(pvObj.nFormas);
break; break;
default: default: