Merge branch 'GGMAC' into 'master'

update lagi yg kesekian kalinya

See merge request !1527

src/container/MonthlyReport/BalanceSheetMR.js

@@ -767,7 +767,7 @@ export default class BalanceSheetMR extends Component {
 
                 // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
 
-                total = String(selisih).includes('-') && String(total).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+                total = String(selisih).includes('-')  && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[10])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
 
                 // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10])) * 100)
@@ -786,7 +786,7 @@ export default class BalanceSheetMR extends Component {
                 || R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100
 
                 // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
-                total = String(selisih).includes('-') && String(total).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+                total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[7]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
                 // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][7])) * 100)
                 // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
@@ -799,7 +799,7 @@ export default class BalanceSheetMR extends Component {
                 || R.equals(selisih/prevMonth, -Infinity) ? 0 : (selisih/prevMonth) * 100
 
                 // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
-                total = String(selisih).includes('-') && String(total).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+                total = String(selisih).includes('-') && Number(tableMeta.rowData[9]) < Number(tableMeta.rowData[8])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
                 // total = R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), NaN) ? '0' : R.equals((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])), Infinity) ? "0" : Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])
                 // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][15]) / Number(dataTable2[tableMeta.rowIndex][8])) * 100)

src/container/MonthlyReport/ProfitLossMR.js

@@ -827,7 +827,7 @@ export default class ProfitLossMR extends Component {
                 //     console.log(prevMonth)
                 //     console.log(total)
                 // }'
-                total = String(selisih).includes('-') && String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+                total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[12])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
                 // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = String(selisih).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 // total = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])
@@ -846,7 +846,7 @@ export default class ProfitLossMR extends Component {
                     || R.equals(selisih / prevMonth, Infinity)
                     || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
 
-                total = String(selisih).includes('-') && String(total).includes('-')? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+                total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[9])? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
                 // if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'corporate income tax') {
                 //     console.log(String(selisih).includes('-'))
@@ -864,8 +864,8 @@ export default class ProfitLossMR extends Component {
                     || R.equals(selisih / prevMonth, NaN)
                     || R.equals(selisih / prevMonth, Infinity)
                     || R.equals(selisih / prevMonth, -Infinity) ? 0 : (selisih / prevMonth) * 100
-                    
-                total = String(selisih).includes('-') && String(total).includes('-') ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
+
+                total = String(selisih).includes('-') && Number(tableMeta.rowData[10]) < Number(tableMeta.rowData[12]) ? Number(total * -1).toFixed(1) : Number(total).toFixed(1)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = total
                 // total = Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])
                 // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][17]) / Number(dataTable2[tableMeta.rowIndex][9])) * 100)