Merge branch 'didam' into 'master'

Didam

See merge request !538

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -596,7 +596,7 @@ export default class FixedAssetsMovement extends Component {
         }
         const handleForecast = (tableMeta, periode) => {
             let total = 0
-            if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
+            if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'gain/ (loss) on fixed assets' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'ending balance' || String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
                 // console.log(dataTable2[tableMeta.rowIndex][23])
                 // console.log()
                 let indexID = dataTable2[tableMeta.rowIndex][23].findIndex((val) => val.periode == periode)
@@ -604,7 +604,8 @@ export default class FixedAssetsMovement extends Component {
                     total = dataTable2[tableMeta.rowIndex][23][indexID].value
                 }
             } else {
-
+                total = handleValueFormula(tableMeta.columnIndex, tableMeta)
+                // console.log(dataTable2[tableMeta.rowIndex])
             }
             // if (String(tableMeta.rowData[5]).toLocaleLowerCase() == 'beginning balance') {
             //     total = dataTable2[tableMeta.rowIndex][tableMeta.columnIndex - 1]

src/container/HomePage.js

@@ -239,7 +239,7 @@ class HomePage extends Component {
             </div>
         );
         return (
-            <div style={{ flex: 1, backgroundColor: '#f8f8f8' }}>
+            <div style={{ flex: 1, backgroundColor: '#f8f8f8', minHeight: this.props.height }}>
                 {this.state.loading && loadingComponent}
                 {this.state.isApprover === true ?
                     <div>