Commit bbae27c1 authored by Rifka Kurnia's avatar Rifka Kurnia

Merge branch 'rifka' into 'master'

status dan parameter cat

See merge request !937
parents 6efad3d2 0dd110ed
...@@ -345,7 +345,8 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -345,7 +345,8 @@ export default class CorporateAnnualTargetMR extends Component {
periode: this.props.periode, periode: this.props.periode,
report_id: this.props.report_id, report_id: this.props.report_id,
months: this.props.month.month_id, months: this.props.month.month_id,
corporate_annual_target: payload corporate_annual_target: payload,
status: "submitted"
} }
console.log(body) console.log(body)
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] }) this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
...@@ -356,7 +357,7 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -356,7 +357,7 @@ export default class CorporateAnnualTargetMR extends Component {
checkUpload() { checkUpload() {
this.setState({loading: true}) this.setState({loading: true})
api.create().checkUploadMonthlyReportCAT(this.state.payload).then(response => { api.create().checkUploadMonthlyReportCAT(this.state.payload).then(response => {
console.log(JSON.stringify(this.state.payload)); // console.log(JSON.stringify(this.state.payload));
console.log(this.state.payload) console.log(this.state.payload)
console.log(response) console.log(response)
if (response.data) { if (response.data) {
...@@ -428,7 +429,9 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -428,7 +429,9 @@ export default class CorporateAnnualTargetMR extends Component {
"report_id": this.props.report_id, "report_id": this.props.report_id,
"status": type, "status": type,
"months": this.props.month.month_id, "months": this.props.month.month_id,
"corporate_annual_target": data "corporate_annual_target": data,
"total_score": this.state.totalScore,
"performance": this.state.perfomanceScore
} }
console.log(JSON.stringify(body)); console.log(JSON.stringify(body));
api.create('UPLOAD').uploadMonthlyReportCAT(body).then(response => { api.create('UPLOAD').uploadMonthlyReportCAT(body).then(response => {
...@@ -570,9 +573,12 @@ export default class CorporateAnnualTargetMR extends Component { ...@@ -570,9 +573,12 @@ export default class CorporateAnnualTargetMR extends Component {
"report_id": this.props.report_id, "report_id": this.props.report_id,
"status": type, "status": type,
"months": this.props.month.month_id, "months": this.props.month.month_id,
"corporate_annual_target": data "corporate_annual_target": data,
"total_score": this.state.totalScore,
"performance": this.state.perfomanceScore
} }
console.log(JSON.stringify(payload)); // console.log(JSON.stringify(payload));
console.log(payload);
api.create('UPLOAD').createMonthlyReportCAT(payload).then(response => { api.create('UPLOAD').createMonthlyReportCAT(payload).then(response => {
console.log(response); console.log(response);
......
...@@ -359,7 +359,8 @@ export default class TaxPlanningMR extends Component { ...@@ -359,7 +359,8 @@ export default class TaxPlanningMR extends Component {
periode: this.props.periode, periode: this.props.periode,
report_id: this.props.report_id, report_id: this.props.report_id,
months: this.props.month.month_id, months: this.props.month.month_id,
tax_planning: payload tax_planning: payload,
status: "submitted"
} }
this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] }) this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
// console.log(this.state.judulColumn) // console.log(this.state.judulColumn)
......
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