Merge branch 'didam' into 'master'

apdet

See merge request !466

src/api/index.js

@@ -215,6 +215,7 @@ const create = (type = "") => {
   const createOpetaingInd = (body) => api.post('transaction/operating_indicator/create_submission_report', body)
   const checkUploadOperatingInd = (body) => api.post('transaction/operating_indicator/check_import', body)
   const uploadOperatingInd = (body) => api.post('transaction/operating_indicator/import_operating_indicator', body)
+  const getLastestUpdateOI = (body) => api.post('transaction/operating_indicator/get_latest_update', body)
   const getDashboard = (body) => api.get('transaction/get_dashboard')
   const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
 
@@ -389,6 +390,7 @@ const create = (type = "") => {
     getLastPeriod,
     getSubmitMasterBudget,
     createPeriodeRevision,
+    getLastestUpdateOI,
     getOutlookPAID,
     getLastPeriodOLPA,
     getCompanySubmittedOLPA,

src/container/MonthlyReport.js

@@ -5,7 +5,6 @@ import Images from '../assets/Images';
 import api from '../api';
 import Autocomplete from '@material-ui/lab/Autocomplete';
 import { titleCase } from '../library/Utils';
-import ProfitLoss from './BudgetTahunan/ProfitLoss';
 import TaxPlanning from './BudgetTahunan/TaxPlanning';
 import FixedAssetsMovement from './BudgetTahunan/FixedAssetsMovement';
 import CorporateAnnualTarget from './BudgetTahunan/CorporateAnnualTarget';
@@ -13,6 +12,7 @@ import { ExcelRenderer } from 'react-excel-renderer';
 import UploadFile from "../library/Upload";
 import { format } from 'date-fns';
 import BalanceSheetMR from './MonthlyReport/BalanceSheetMR';
+import ProfitLossMR from './MonthlyReport/ProfitLossMR';
 
 export default class MonthlyReport extends Component {
     constructor(props) {
@@ -162,6 +162,7 @@ export default class MonthlyReport extends Component {
     }
 
     clickDetail(item, id, revision, status) {
+        console.log(item)
         this.setState({
             report_id: id,
             revisionTable: revision,
@@ -176,7 +177,7 @@ export default class MonthlyReport extends Component {
                     visibleFAM: false,
                     visibleTP: false,
                 })
-            } else if (item === 'Profit & Loss') {
+            } else if (item === 'Profit Loss') {
                 this.setState({
                     visibleMonthlyReport: false,
                     visibleBS: false,
@@ -550,10 +551,18 @@ export default class MonthlyReport extends Component {
                     />
                 )}
                 {this.state.visiblePL && (
-                    <ProfitLoss
+                    <ProfitLossMR
+                        open={this.props.open}
                         report_id={this.state.report_id}
+                        height={this.props.height}
+                        width={this.props.width}
                         company={this.state.company}
-                        onClickClose={() => this.setState({ visiblePL: false, visibleMonthlyReport: true })}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        submissionID={this.state.submissionID}
+                        // saveToMasterBudget={this.saveToMasterBudget.bind(this)}
+                        onClickClose={() => this.setState({ visiblePL: false, visibleBudgetTahunan: true })}
+                        // getReport={this.getCompanyActive.bind(this)}
                     />
 
                 )}

src/container/OprIndicator/OperatingIndicatorDetail.js

@@ -50,9 +50,29 @@ export default class BalanceSheet extends Component {
         this.fileHandler = this.fileHandler.bind(this);
     }
 
+    getLatestUpdate() {
+        let payload = {
+            "operating_indicator_id": this.props.data.operatingIndID,
+            "report_id": this.props.data.report_id,
+            "company_id": this.props.data.company.company_id,
+            "periode": this.props.data.periode,
+        }
+        api.create().getLastestUpdateOI(payload).then(response => {
+            console.log(response.data)
+            if (response.data) {
+                if (response.data.status === "success") {
+                    this.setState({
+                        updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
+                    })
+                }
+            }
+        })
+    }
+
     componentDidMount() {
         // this.getItemHierarki()
         this.getDataDetail()
+        this.getLatestUpdate()
         console.log(this.props);
     }
 
@@ -1261,6 +1281,7 @@ export default class BalanceSheet extends Component {
                                         />
                                     </MuiThemeProvider>
                                 </div>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
                             </div>
                             <div className="grid grid-2x">
                                 <div className="col-1">