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

src/container/MonthlyReport/BalanceSheetMR.js

@@ -130,7 +130,7 @@ export default class BalanceSheetMR extends Component {
 
     getSettingControl() {
         let body = {
-            group: 'THRESHOLD_VARIANCE',
+            group: 'THRESHOLD_CONTROL',
             company_id: this.props.company.company_id,
             type: 'BALANCE_SHEET'
         }

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -345,7 +345,8 @@ export default class CorporateAnnualTargetMR extends Component {
                     periode: this.props.periode,
                     report_id: this.props.report_id,
                     months: this.props.month.month_id,
-                    corporate_annual_target: payload
+                    corporate_annual_target: payload,
+                    status: "submitted"
                 }
                 console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0], judulColumn: resp.rows[0][0] })
@@ -356,7 +357,7 @@ export default class CorporateAnnualTargetMR extends Component {
     checkUpload() {
         this.setState({loading: true})
         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(response)
             if (response.data) {
@@ -428,7 +429,9 @@ export default class CorporateAnnualTargetMR extends Component {
             "report_id": this.props.report_id,
             "status": type,
             "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));
         api.create('UPLOAD').uploadMonthlyReportCAT(body).then(response => {
@@ -570,9 +573,12 @@ export default class CorporateAnnualTargetMR extends Component {
             "report_id": this.props.report_id,
             "status": type,
             "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 => {
             console.log(response);

src/container/MonthlyReport/TaxPlanningMR.js

@@ -359,7 +359,8 @@ export default class TaxPlanningMR extends Component {
                     periode: this.props.periode,
                     report_id: this.props.report_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] })
                 // console.log(this.state.judulColumn)