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

arreglado factor resumen y cambiado texto

Browse Source
This commit is contained in:
Jaime Jiménez
2025-02-20 20:24:54 +01:00
parent 627d59444b
commit 851b224149
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
httpdocs/assets/js/safekat/pages/presupuestoAdmin/sections/resumen.js
View File

@ -117,8 +117,8 @@ class Resumen {
totalPapel += parseFloat($('#' + rowData.row_id + '_totalPapelPedido').val())
margenPapel += parseFloat($('#' + rowData.row_id + '_margenPapelPedido').val())
sumForFactor += parseFloat($('#' + rowData.row_id + '_totalPapelPedido').val())
sumForFactor -= parseFloat($('#' + rowData.row_id + '_margenPapelPedido').val())
//sumForFactor += parseFloat($('#' + rowData.row_id + '_totalPapelPedido').val())
//sumForFactor -= parseFloat($('#' + rowData.row_id + '_margenPapelPedido').val())
}
if (rowData.check_impresion_total) {
@ -128,7 +128,7 @@ class Resumen {
totalImpresion += parseFloat($('#' + rowData.row_id + '_totalClicks').val())
margenImpresion += parseFloat($('#' + rowData.row_id + '_margenClicks').val())
sumForFactor += parseFloat($('#' + rowData.row_id + '_totalClicks').val())
//sumForFactor += parseFloat($('#' + rowData.row_id + '_totalClicks').val())
if (rowData.maquinaTipo == 'inkjet') {
totalImpresion += parseFloat(rowData.totalTinta)
@ -136,7 +136,7 @@ class Resumen {
sumForFactor += (parseFloat(rowData.totalTinta) + parseFloat(rowData.totalCorte))
}
sumForFactor -= parseFloat($('#' + rowData.row_id + '_margenClicks').val())
//sumForFactor -= parseFloat($('#' + rowData.row_id + '_margenClicks').val())
/*if (!isNaN(parseFloat($('#' + rowData.row_id + '_totalTinta').val()))) {
totalImpresion += parseFloat($('#' + rowData.row_id + '_totalTinta').val())
@ -151,6 +151,9 @@ class Resumen {
margenImpresion += parseFloat(margenPorHoras) + parseFloat(costeMaquinaHoras);
sumForFactor += totalImpresion;
sumForFactor += totalPapel;
let porcentajeMargenPapel = isNaN(margenPapel / (totalPapel) * 100.0) ? 0 : margenPapel / (totalPapel) * 100.0
$('#porcentajeMargenPapel').text(porcentajeMargenPapel.toFixed(0) + '%')
$('#totalCostePapel').text((this.addSeparatorsNF(totalPapel.toFixed(2), ".", ",", ".")) + "€")
@ -173,7 +176,7 @@ class Resumen {
margenImpresion = parseFloat($('#margenImpresion').attr('val'))
}
sumForFactorPonderado = sumForFactor;
//sumForFactorPonderado = sumForFactor;
if (updateServicios) {