Merge branch 'rifka' into 'master'

blank ratio

See merge request !1063

src/container/Laporan/SubHolding.js

@@ -2051,18 +2051,18 @@ export default class SubHolding extends Component {
                                 // console.log(indexIDzz)
                                 if (indexIDzz != -1) {
                                     dataTable2.push([...dataTable[indexIDzz],
-                                    Number(items.ratio.monthly_january).toFixed(2),
-                                    Number(items.ratio.monthly_february).toFixed(2),
-                                    Number(items.ratio.monthly_march).toFixed(2),
-                                    Number(items.ratio.monthly_april).toFixed(2),
-                                    Number(items.ratio.monthly_may).toFixed(2),
-                                    Number(items.ratio.monthly_june).toFixed(2),
-                                    Number(items.ratio.monthly_july).toFixed(2),
-                                    Number(items.ratio.monthly_august).toFixed(2),
-                                    Number(items.ratio.monthly_september).toFixed(2),
-                                    Number(items.ratio.monthly_october).toFixed(2),
-                                    Number(items.ratio.monthly_november).toFixed(2),
-                                    Number(items.ratio.monthly_december).toFixed(2),
+                                    String(items.ratio.monthly_january) == "" ? "" : Number(items.ratio.monthly_january).toFixed(2),
+                                    String(items.ratio.monthly_february) == "" ? "" : Number(items.ratio.monthly_february).toFixed(2),
+                                    String(items.ratio.monthly_march) == "" ? "" : Number(items.ratio.monthly_march).toFixed(2),
+                                    String(items.ratio.monthly_april) == "" ? "" : Number(items.ratio.monthly_april).toFixed(2),
+                                    String(items.ratio.monthly_may) == "" ? "" : Number(items.ratio.monthly_may).toFixed(2),
+                                    String(items.ratio.monthly_june) == "" ? "" : Number(items.ratio.monthly_june).toFixed(2),
+                                    String(items.ratio.monthly_july) == "" ? "" : Number(items.ratio.monthly_july).toFixed(2),
+                                    String(items.ratio.monthly_august) == "" ? "" : Number(items.ratio.monthly_august).toFixed(2),
+                                    String(items.ratio.monthly_september) == "" ? "" : Number(items.ratio.monthly_september).toFixed(2),
+                                    String(items.ratio.monthly_october) == "" ? "" : Number(items.ratio.monthly_october).toFixed(2),
+                                    String(items.ratio.monthly_november) == "" ? "" : Number(items.ratio.monthly_november).toFixed(2),
+                                    String(items.ratio.monthly_december) == "" ? "" : Number(items.ratio.monthly_december).toFixed(2),
                                     ])
                                 }
                                 if (items.children !== null) {
@@ -2075,18 +2075,18 @@ export default class SubHolding extends Component {
                             }
 
                             dataTable2.push([...dataTable[indexID],
-                            Number(item.ratio.monthly_january).toFixed(2),
-                            Number(item.ratio.monthly_february).toFixed(2),
-                            Number(item.ratio.monthly_march).toFixed(2),
-                            Number(item.ratio.monthly_april).toFixed(2),
-                            Number(item.ratio.monthly_may).toFixed(2),
-                            Number(item.ratio.monthly_june).toFixed(2),
-                            Number(item.ratio.monthly_july).toFixed(2),
-                            Number(item.ratio.monthly_august).toFixed(2),
-                            Number(item.ratio.monthly_september).toFixed(2),
-                            Number(item.ratio.monthly_october).toFixed(2),
-                            Number(item.ratio.monthly_november).toFixed(2),
-                            Number(item.ratio.monthly_december).toFixed(2),
+                            String(item.ratio.monthly_january) == "" ? "" : Number(item.ratio.monthly_january).toFixed(2),
+                            String(item.ratio.monthly_february) == "" ? "" : Number(item.ratio.monthly_february).toFixed(2),
+                            String(item.ratio.monthly_march) == "" ? "" : Number(item.ratio.monthly_march).toFixed(2),
+                            String(item.ratio.monthly_april) == "" ? "" : Number(item.ratio.monthly_april).toFixed(2),
+                            String(item.ratio.monthly_may) == "" ? "" : Number(item.ratio.monthly_may).toFixed(2),
+                            String(item.ratio.monthly_june) == "" ? "" : Number(item.ratio.monthly_june).toFixed(2),
+                            String(item.ratio.monthly_july) == "" ? "" : Number(item.ratio.monthly_july).toFixed(2),
+                            String(item.ratio.monthly_august) == "" ? "" : Number(item.ratio.monthly_august).toFixed(2),
+                            String(item.ratio.monthly_september) == "" ? "" : Number(item.ratio.monthly_september).toFixed(2),
+                            String(item.ratio.monthly_october) == "" ? "" : Number(item.ratio.monthly_october).toFixed(2),
+                            String(item.ratio.monthly_november) == "" ? "" : Number(item.ratio.monthly_november).toFixed(2),
+                            String(item.ratio.monthly_december) == "" ? "" : Number(item.ratio.monthly_december).toFixed(2),
                             ])
 
                             if (item.children !== null) {