Merge branch 'faisal' into 'master'

kloset

See merge request !651

src/container/MonthlyReport.js

@@ -5,8 +5,6 @@ import Images from '../assets/Images';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../library/Utils';
-import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
-import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
 import { ExcelRenderer } from 'react-excel-renderer';
 import UploadFile from "../library/Upload";
 import { format } from 'date-fns';
@@ -19,6 +17,7 @@ import { PropagateLoader } from 'react-spinners';
 import MuiAlert from '@material-ui/lab/Alert';
 import Constant from '../library/Constant';
 import OperatingIndicatorMR from './MonthlyReport/OperatingIndicatorMR';
+import CorporateAnnualTargetMR from './MonthlyReport/CorporateAnnualTargetMR';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -283,7 +282,7 @@ export default class MonthlyReport extends Component {
         let payload = {
             "company_id": this.state.company.company_id,
             "periode": this.state.periode.periode,
-            "month": this.state.month.month_id
+            "months": this.state.month.month_id
         }
         api.create().getMonthlyReportID(payload).then(response => {
             console.log(response);
@@ -795,12 +794,13 @@ export default class MonthlyReport extends Component {
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
-                        submissionID={this.state.submissionID}
+                        monthlyReportId={this.state.monthlyReportId}
+                        month={this.state.month}
                         onClickClose={() => this.setState({ visibleFAM: false, visibleMonthlyReport: true })}
                     />
                 )}
                 {this.state.visibleCAT && (
-                    <CorporateAnnualTarget
+                    <CorporateAnnualTargetMR
                         open={this.props.open}
                         report_id={this.state.report_id}
                         height={this.props.height}
@@ -808,7 +808,8 @@ export default class MonthlyReport extends Component {
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
-                        submissionID={this.state.submissionID}
+                        monthlyReportId={this.state.monthlyReportId}
+                        month={this.state.month}
                         onClickClose={() => this.setState({ visibleCAT: false, visibleMonthlyReport: true })}
                     />
                 )}

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -45,13 +45,14 @@ export default class FixedAssetsMovementMR extends Component {
         this.getItemHierarki()
     }
 
-    async getItemHierarki() {
+    getItemHierarki() {
         let payload = {
             "report_id": this.props.report_id,
             "revision": Number(this.props.revision),
             "periode": this.props.periode,
             "company_id": this.props.company.company_id,
-            "submission_id": this.props.submissionID
+            "monthly_report_id": this.props.monthlyReportId,
+            "month": this.props.month
         }
         api.create().getDetailReportMB(payload).then(response => {
             // console.log(response);
@@ -348,7 +349,7 @@ export default class FixedAssetsMovementMR extends Component {
         ]
         let data = [
             ["Total Assets", { a: "2", b: "3", c: "4" }, "5", { a: "6", b: "7", c: "8", d: "9", e: "10", f: "11" }],
-            ["Total Assets", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11"]
+            ["Total Assets", { a: "12", b: "13", c: "14" }, "15", { a: "16", b: "17", c: "18", d: "19", e: "110", f: "111" }]
         ]
 
         return (