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

src/container/Laporan/SubHolding.js

@@ -671,7 +671,7 @@ export default class SubHolding extends Component {
                                         getOptionLabel={(option) => titleCase(option.label)}
                                         id="typereport"
                                         onChange={(event, newInputValue) => this.setState({ report: newInputValue, loading: true, previewTable: false }, () => {
-                                            this.getSubmission()
+                                            this.getReportType()
                                         })}
                                         disableClearable
                                         style={{ width: 250 }}
@@ -685,7 +685,7 @@ export default class SubHolding extends Component {
                                         id="company"
                                         disabled={this.state.intent === 'Home' ? true : false}
                                         onChange={(event, newInputValue) => this.setState({ company: newInputValue, loading: true, previewTable: false }, () => {
-                                            this.getSubmission()
+                                            this.getReportType()
                                         })}
                                         disableClearable
                                         style={{ width: 250 }}
@@ -698,7 +698,7 @@ export default class SubHolding extends Component {
                                         {...this.state.listPeriode}
                                         id="periode"
                                         onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
-                                            this.getSubmission()
+                                            this.getReportType()
                                         })}
                                         disabled={this.state.intent === 'Home' ? true : false}
                                         disableClearable

src/container/MonthlyReport.js

@@ -759,9 +759,10 @@ export default class MonthlyReport extends Component {
                         company={this.state.company}
                         revision={this.state.revisionTable}
                         periode={this.state.periode.periode}
-                        submissionID={this.state.submissionID}
+                        // submissionID={this.state.submissionID}
+                        monthlyReportId={this.state.monthlyReportId}
+                        month={this.state.month}
                         // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
-                        // onClickClose={() => this.setState({ visibleTP: false, visibleBudgetTahunan: true })}
                         // getReport={this.getCompanyActive.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
                     />

src/router/homeRoutes.js

@@ -17,6 +17,7 @@ import MonthlyReport from '../container/MonthlyReport';
 import DocumentManagement from '../container/DocumentManagement/DocumentManagement';
 import OutlookPA from '../container/OutlookPA';
 import SubHolding from '../container/Laporan/SubHolding';
+import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra'
 
 const routes = [
   {
@@ -91,6 +92,10 @@ const routes = [
     path: "/home/sub-holding",
     main: SubHolding
   },
+  {
+    path: "/home/summary-of-triputra",
+    main: SummaryTriputra
+  },
   {
     path: "*",
     main: screen404