Merge branch 'dev-riri' into 'ENV-DEV'

update remark 2

See merge request !2212

src/container/MonthlyReport/LOCFMR.js

@@ -149,7 +149,7 @@ export default class LOCF extends Component {
         if (this.props.dataTablelocf !== prevProps.dataTablelocf) {
             let array = this.props.dataTablelocf
             let datas = array[array.length - 1]
-            this.setState({ dataTable: this.props.dataTablelocf, diff: datas[46], loanTotal: datas[47], perBS: datas[48] })
+            this.setState({ dataTable: this.props.dataTablelocf, diff: datas[47], loanTotal: datas[48], perBS: datas[49] })
         }
         if (this.props.loadingChild !== prevProps.loadingChild) {
             this.setState({ loading: this.props.loadingChild })
@@ -272,7 +272,7 @@ export default class LOCF extends Component {
                             item.locf.other_ratio4_financial,
                             item.locf.other_ratio4_current === null ? "0.0" : item.locf.other_ratio4_current === "" ? "0.0" : item.locf.other_ratio4_current,
                             item.locf.notes,
-                            item.diff,
+                            item.diff == 0 ? "0.0" : item.diff,
                             item.total_loan,
                             item.per_bs,
                             // index
@@ -336,7 +336,7 @@ export default class LOCF extends Component {
                         item.locf.other_ratio4_financial,
                         item.locf.other_ratio4_current === null ? "0.0" : item.locf.other_ratio4_current === "" ? "0.0" : item.locf.other_ratio4_current,
                         item.locf.notes,
-                        item.diff,
+                        item.diff == 0 ? "0.0" : item.diff,
                         item.total_loan,
                         item.per_bs
                         // index
@@ -3501,7 +3501,7 @@ export default class LOCF extends Component {
                                     <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
                                 </div>
                                 <div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
-                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
+                                    <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
                                 </div>
                             </div>
                         </div>

src/container/MonthlyReport/LOVMR.js

@@ -1770,7 +1770,7 @@ export default class LOV extends Component {
                                     <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Diff</Typography>
                                 </div>
                                 <div style={{ borderStyle: 'solid', borderWidth: '0px 1px 1px 1px', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
-                                <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
+                                <Typography style={{ fontSize: '14px', color: Number(this.state.diff) > '0.0' || Number(this.state.diff) < '0.0' ? 'red' : '#4b4b4b' }}><NumberFormat value={this.state.diff == 0 ? "0.0" : this.state.diff} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
                                 </div>
                             </div>
                         </div>