Merge branch 'riri' into 'master'

issue

See merge request !1517

src/container/MonthlyReport/BalanceSheetMR.js

@@ -757,17 +757,44 @@ export default class BalanceSheetMR extends Component {
             //     console.log(tableMeta);
             // }
             if (dex === 1) {
-                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)
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
+                let selisih = Number(dataTable2[tableMeta.rowIndex][11])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][10])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = 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)
+                // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
                 // if (tableMeta.rowData[5] === "Cash and cash equivalent") {
                 // console.log(total);
                 // console.log(Number(dataTable2[tableMeta.rowIndex][11]) / Number(dataTable2[tableMeta.rowIndex][10]));
                 //     console.log(dataTable2[tableMeta.rowIndex]);
                 // }
             } else if (dex === 2) {
-                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)
+                let selisih = Number(dataTable2[tableMeta.rowIndex][13])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][7])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = 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)
             } else if (dex === 3) {
+                let selisih = Number(dataTable2[tableMeta.rowIndex][15])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][8])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = 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)
                 dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)

src/container/MonthlyReport/ProfitLossMR.js

@@ -815,17 +815,47 @@ export default class ProfitLossMR extends Component {
         const handleVariancePercent = (tableMeta, dex, type) => {
             let total = 0
             if (dex === 1) {
+                let selisih = Number(dataTable2[tableMeta.rowIndex][13])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][12])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])
-                total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100), NaN) ? '0' : R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100), Infinity) ? '0' : Number((Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100 == "-Infinity" ? '0' : (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100)
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
+                // total = R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / 
+                // Number(dataTable2[tableMeta.rowIndex][12])) * 100), NaN) ? '0' : 
+                // R.equals(Number((Number(dataTable2[tableMeta.rowIndex][13]) / 
+                // Number(dataTable2[tableMeta.rowIndex][12])) * 100), Infinity) ? '0' : 
+                // Number((Number(dataTable2[tableMeta.rowIndex][13]) / 
+                // Number(dataTable2[tableMeta.rowIndex][12])) * 100 == "-Infinity" ? '0' : 
+                // (Number(dataTable2[tableMeta.rowIndex][13]) / Number(dataTable2[tableMeta.rowIndex][12])) * 100)
             } else if (dex === 2) {
+                let selisih = Number(dataTable2[tableMeta.rowIndex][15])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][8])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = 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)
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
+                // 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)
+                // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
             } else if (dex === 3) {
+                let selisih = Number(dataTable2[tableMeta.rowIndex][17])
+                let prevMonth = Number(dataTable2[tableMeta.rowIndex][9])
+                let total = R.equals(selisih/prevMonth, 0) 
+                || R.equals(selisih/prevMonth, NaN) 
+                || R.equals(selisih/prevMonth, Infinity) 
+                || 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 = 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)
-                dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
+                // 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)
+                // dataTable2[tableMeta.rowIndex][tableMeta.columnIndex + type] = Number(total).toFixed(1)
             }
             return total
         }