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

src/container/MonthlyReport.js

@@ -1148,6 +1148,7 @@ export default class MonthlyReport extends Component {
                         periode={this.state.periode.periode}
                         monthlyReportId={this.state.monthlyReportId}
                         month={this.state.month}
+                        onClickClose={() => this.setState({ visibleOI: false, visibleMonthlyReport: true })}
                     />
                 )}
             </div >

src/container/OutlookPA.js

@@ -214,6 +214,7 @@ export default class OutlookPA extends Component {
     getDetailUser() {
         let userId = localStorage.getItem(Constant.USER)
         api.create().getDetailUser(userId).then((response) => {
+            // console.log(response);
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === 'success') {
@@ -379,7 +380,7 @@ export default class OutlookPA extends Component {
                         // console.log(this.state.lastStatus);
                         this.historyApproval()
                         this.getLatestPeriodSubmit()
-                        api.create().checkApprover().then(response => {
+                        api.create().checkApproverOLPA().then(response => {
                             // console.log(response);
                             if (response.data.data.is_approver === true) {
                                 this.setState({ isApprover: true, checkApprover: true })
@@ -896,6 +897,7 @@ export default class OutlookPA extends Component {
                                             {...this.state.listPeriode}
                                             id="periode"
                                             onChange={(event, newInputValue) => this.setState({ periode: newInputValue }, () => {
+                                                // console.log(this.state.isApprover, this.state.company);
                                                 if (this.state.isApprover === true) {
                                                     this.getCompanySubmitted()
                                                 } else {