diff --git a/ui/src/pages/ProductionProductCostingHasCostDetail.vue b/ui/src/pages/ProductionProductCostingHasCostDetail.vue index 362ec77..bc3b278 100644 --- a/ui/src/pages/ProductionProductCostingHasCostDetail.vue +++ b/ui/src/pages/ProductionProductCostingHasCostDetail.vue @@ -465,19 +465,19 @@
{{ grp.sAciklama3 || 'TANIMSIZ' }} - Toplam Miktar: {{ formatBarQuantity(resolveGroupQuantity(grp)) }} MT + Toplam Miktar: {{ formatBarQuantity(resolveGroupQuantity(grp, gi)) }} MT
- Grup Toplamı TRY: {{ formatBarMoney(resolveGroupTRYTutar(grp, groupTotalsRevision)) }} + Grup Toplamı TRY: {{ formatBarMoney(resolveGroupTRYTutar(grp, gi, groupTotalsRevision)) }} | - USD: {{ formatBarMoney(resolveGroupUSDTutar(grp, groupTotalsRevision)) }} + USD: {{ formatBarMoney(resolveGroupUSDTutar(grp, gi, groupTotalsRevision)) }} - Tanı: {{ resolveGroupIncludedCount(grp) }}/{{ rowsForGroupTotal(grp).length }} kalem + Tanı: {{ resolveGroupIncludedCount(grp, gi) }}/{{ rowsForGroupTotal(grp, gi).length }} kalem | - Ham TRY: {{ formatBarMoney(resolveGroupRawTRYTutar(grp)) }} + Ham TRY: {{ formatBarMoney(resolveGroupRawTRYTutar(grp, gi)) }} shouldIncludeRowInGroupTotal(grp, row)).length +function resolveGroupIncludedCount (grp, groupIndex) { + return rowsForGroupTotal(grp, groupIndex).filter(row => shouldIncludeRowInGroupTotal(grp, row)).length } -function resolveGroupRawTRYTutar (grp) { - return rowsForGroupTotal(grp).reduce((total, row) => total + parseMoneyInput(row?.lTutar), 0) +function resolveGroupRawTRYTutar (grp, groupIndex) { + return rowsForGroupTotal(grp, groupIndex).reduce((total, row) => total + parseMoneyInput(row?.lTutar), 0) } function resolveGroupRowTRYAmount (row) { @@ -2938,20 +2946,20 @@ function resolveGroupRowUSDAmount (row) { return lastValidAmount !== 0 ? lastValidAmount : resolveRowUSDTutar(row) } -function resolveGroupTRYTutar (grp, _revision) { - return rowsForGroupTotal(grp).reduce((total, row) => ( +function resolveGroupTRYTutar (grp, groupIndex, _revision) { + return rowsForGroupTotal(grp, groupIndex).reduce((total, row) => ( total + (shouldIncludeRowInGroupTotal(grp, row) ? resolveGroupRowTRYAmount(row) : 0) ), 0) } -function resolveGroupUSDTutar (grp, _revision) { - return rowsForGroupTotal(grp).reduce((total, row) => ( +function resolveGroupUSDTutar (grp, groupIndex, _revision) { + return rowsForGroupTotal(grp, groupIndex).reduce((total, row) => ( total + (shouldIncludeRowInGroupTotal(grp, row) ? resolveGroupRowUSDAmount(row) : 0) ), 0) } -function resolveGroupQuantity (grp) { - return rowsForGroupTotal(grp).reduce((total, row) => ( +function resolveGroupQuantity (grp, groupIndex) { + return rowsForGroupTotal(grp, groupIndex).reduce((total, row) => ( total + resolveNumericRowQuantity(row) ), 0) }