Commit 81c31f87 authored by fahrur huzain's avatar fahrur huzain

Merge branch 'ENV-STAGING' of http://103.44.149.204/d.arizona/tia-dev into fahrur/audit

parents fe09cd12 3aa6d643
...@@ -1467,6 +1467,8 @@ export default class CorporateAnnualTarget extends Component { ...@@ -1467,6 +1467,8 @@ export default class CorporateAnnualTarget extends Component {
}) })
if (valz == 'FORMULA') { if (valz == 'FORMULA') {
dataTable2[tableMeta.rowIndex][0] = 5 dataTable2[tableMeta.rowIndex][0] = 5
} else {
dataTable2[tableMeta.rowIndex][0] = 3
} }
dataTable2[tableMeta.rowIndex][25] = valz == 'FORMULA' ? 0 : ((valz == 'SUM' ? total : (valz == 'AVG' ? (total / 12) : lastValz))) dataTable2[tableMeta.rowIndex][25] = valz == 'FORMULA' ? 0 : ((valz == 'SUM' ? total : (valz == 'AVG' ? (total / 12) : lastValz)))
} }
......
...@@ -204,7 +204,7 @@ class MaintenanceMode extends Component { ...@@ -204,7 +204,7 @@ class MaintenanceMode extends Component {
// ] // ]
} }
console.log(payload); console.log(payload);
this.setState({ visibleAlertSave: true }) this.setState({ visibleAlertSave: this.state.maintenanceStatus == 0 ? true : false })
api.create().createMaintenanceMode(payload).then((response) => { api.create().createMaintenanceMode(payload).then((response) => {
console.log(response) console.log(response)
this.setState({ loading: true }) this.setState({ loading: true })
...@@ -273,7 +273,7 @@ class MaintenanceMode extends Component { ...@@ -273,7 +273,7 @@ class MaintenanceMode extends Component {
// ] // ]
} }
console.log(payload); console.log(payload);
this.setState({ visibleAlertSave: true }) this.setState({ visibleAlertSave: this.state.maintenanceStatus == 0 ? true : false })
api.create().updateMaintenanceMode(payload).then((response) => { api.create().updateMaintenanceMode(payload).then((response) => {
console.log(response) console.log(response)
this.setState({ loading: true }) this.setState({ loading: true })
......
...@@ -1742,7 +1742,7 @@ export default class LOV extends Component { ...@@ -1742,7 +1742,7 @@ export default class LOV extends Component {
</div> </div>
<div style={{ display: 'flex', flexDirection: 'row' }}> <div style={{ display: 'flex', flexDirection: 'row' }}>
<div style={{ padding: 5 }}> <div style={{ padding: 5 }}>
<Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Total Outstanding Loan</Typography> <Typography style={{ fontSize: '12px', color: '#4b4b4b' }}>Total Investment</Typography>
</div> </div>
<div style={{ border: '1px solid black', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}> <div style={{ border: '1px solid black', padding: 5, minWidth: 200, display: 'flex', justifyContent: 'flex-end' }}>
<Typography style={{ fontSize: '14px', color: '#4b4b4b' }}><NumberFormat value={this.state.perBS} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography> <Typography style={{ fontSize: '14px', color: '#4b4b4b' }}><NumberFormat value={this.state.perBS} displayType={'text'} thousandSeparator={true} prefix={''} /></Typography>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment