Skip to content

T
Tia-dev
Commit b475c848 authored by faisalhamdi's avatar faisalhamdi
Browse files
Options

Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

parents 5b1cc3c3 647efe9e
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 15 deletions
src/container/MonthlyReport/CorporateAnnualTargetMR.js
View file @ b475c848
...@@ -132,7 +132,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -132,7 +132,7 @@ export default class CorporateAnnualTargetMR extends Component {
api.create().getParameterByGroupName({ api.create().getParameterByGroupName({
"group_name": 'ACHIEVEMENT_KPI' "group_name": 'ACHIEVEMENT_KPI'
}).then((response) => { }).then((response) => {
// console.log(response.data) console.log(response.data)
if (response.data) { if (response.data) {
this.setState({ parameterScore: response.data.data }) this.setState({ parameterScore: response.data.data })
} }
...@@ -693,10 +693,9 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -693,10 +693,9 @@ export default class CorporateAnnualTargetMR extends Component {
if (item[12] == '' || String(item[12]) == '0' || String(item[12]) == '0.0') { if (item[12] == '' || String(item[12]) == '0' || String(item[12]) == '0.0') {
totalSW = 0 totalSW = 0
} else { } else {
totalSW = Number(totalScore) * Number(handlePercent) / 100 totalSW = Number(totalScore) * Number(handlePercent) / 1000
} }
totalSW = Number(totalSW).toFixed(2) totalSW = Number(totalSW).toFixed(2)
if (item[0] !== 1 && item[0] !== 4) { if (item[0] !== 1 && item[0] !== 4) {
total += Number(totalSW) total += Number(totalSW)
} }
...@@ -1183,9 +1182,13 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -1183,9 +1182,13 @@ export default class CorporateAnnualTargetMR extends Component {
} }
}) })
} }
if (Number(tableMeta.rowData[12]) > Number(0)){
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(0) dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(totalScore).toFixed(0)
return Number(totalScore).toFixed(0) return Number(totalScore).toFixed(0)
} else {
dataTable2[tableMeta.rowIndex][tableMeta.columnIndex] = Number(0).toFixed(0)
return Number(0).toFixed(0)
}
} }
let someXXX = this.state.aa let someXXX = this.state.aa
......
src/container/MonthlyReport/ListOfCreditFacilities.js
View file @ b475c848
...@@ -117,7 +117,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -117,7 +117,8 @@ export default class ListOfCreditFacilities extends Component {
updateBy: '-', updateBy: '-',
notes: "", notes: "",
viewOnly: true, viewOnly: true,
dataDelete: [] dataDelete: [],
saveTambahan: true
} }
this.fileHandler = this.fileHandler.bind(this); this.fileHandler = this.fileHandler.bind(this);
} }
...@@ -3975,7 +3976,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3975,7 +3976,7 @@ export default class ListOfCreditFacilities extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.setState({totalOutStand: totalLoan}, () => { onClick={() => this.setState({totalOutStand: totalLoan, saveTambahan: false}, () => {
this.handleCalculate() this.handleCalculate()
})} })}
> >
...@@ -3987,7 +3988,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -3987,7 +3988,7 @@ export default class ListOfCreditFacilities extends Component {
className="button" className="button"
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4013,7 +4014,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4013,7 +4014,7 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4149,7 +4150,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4149,7 +4150,7 @@ export default class ListOfCreditFacilities extends Component {
outline: 'none', outline: 'none',
marginRight: 20 marginRight: 20
}} }}
onClick={() => this.setState({totalOutStand: totalLoan}, () => { onClick={() => this.setState({totalOutStand: totalLoan, saveTambahan: false}, () => {
this.handleCalculate() this.handleCalculate()
})} })}
> >
...@@ -4161,7 +4162,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4161,7 +4162,7 @@ export default class ListOfCreditFacilities extends Component {
className="button" className="button"
type="button" type="button"
onClick={() => onClick={() =>
this.state.saveDraft === true ? this.state.saveDraft === true || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
...@@ -4187,7 +4188,7 @@ export default class ListOfCreditFacilities extends Component { ...@@ -4187,7 +4188,7 @@ export default class ListOfCreditFacilities extends Component {
type="button" type="button"
// disabled={this.state.buttonError} // disabled={this.state.buttonError}
onClick={() => onClick={() =>
this.state.saveComp ? this.state.saveComp || this.state.saveTambahan?
this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'}) this.setState({snekbar: true, snekbarMsg: 'Data Incomplete / Diff must be 0'})
: :
this.state.handleTekTekTek == 1 ? null : this.state.handleTekTekTek == 1 ? null :
......
src/container/MonthlyReport/TaxPlanningMR.js
View file @ b475c848
...@@ -150,7 +150,7 @@ export default class TaxPlanningMR extends Component { ...@@ -150,7 +150,7 @@ export default class TaxPlanningMR extends Component {
"months": this.props.month.month_id "months": this.props.month.month_id
} }
api.create().getLastestUpdateMR(payload).then(response => { api.create().getLastestUpdateMR(payload).then(response => {
console.log(response) // console.log(response)
if (response.data) { if (response.data) {
if (response.data.status === "success") { if (response.data.status === "success") {
this.setState({ this.setState({
...@@ -806,7 +806,6 @@ export default class TaxPlanningMR extends Component { ...@@ -806,7 +806,6 @@ export default class TaxPlanningMR extends Component {
const handleTotal = (value, tableMeta, dex) => { const handleTotal = (value, tableMeta, dex) => {
// console.log(tableMeta) // console.log(tableMeta)
let total = 0 let total = 0
dataTable2[tableMeta.rowIndex].map((item, index) => { dataTable2[tableMeta.rowIndex].map((item, index) => {
if (index == 9) { if (index == 9) {
let valItemTBF = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf let valItemTBF = item.tbf == undefined || item.tbf == "" || item.tbf == "undefined" ? 0.0 : item.tbf
......
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