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

src/api/index.js

@@ -189,8 +189,9 @@ const create = (type = "") => {
   const getAllMasterDataCat = () => api.get('item_report_company/get_all_item_report_company')
   const getParentItemReport = (body) => api.post('item_report/get_parent_item_report_default', body)
   const saveMasterDataCat = (body) => api.post('item_report_company/create_item_report_company', body)
-  const getDetailMasterDataCat = (idCompany, years) => api.get(`item_report_company/get_item_report_company_by_companyid_years/${idCompany}/${years}`)
-  const deleteMasterDataCat = (idCompany, years) => api.get(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
+  const getDetailMasterDataCat = (idCompany, years) => api.get(`item_report_company/get_item_report_company_by_company_id_years/${idCompany}/${years}`)
+  const deleteMasterDataCat = (idCompany, years) => api.post(`item_report_company/delete_item_report_company/${idCompany}/${years}`)
+  const updateMasterDataCat = (body) => api.post('item_report_company/update_item_report_company', body)
 
   //Transaction
   const getReportTypeBody = (body) => api.post('transaction/master_budget/get_all_report', body)
@@ -746,6 +747,7 @@ const create = (type = "") => {
     getAllMasterDataCat,
     getParentItemReport,
     saveMasterDataCat,
+    updateMasterDataCat,
     getDetailMasterDataCat,
     deleteMasterDataCat,
     getListChildDashboardCAT,

src/container/MasterData/MasterDataCAT/EditMasterDataCAT.js

@@ -144,7 +144,7 @@ export default class EditMasterDataCAT extends Component {
                     // console.log(this.props.data)
                     // console.log(this.state.latestPeriode)
                     // console.log(periodeData)
-                    console.log(index)
+                    // console.log(index)
                     this.setState({ listPeriode: defaultProps, periode: index === -1 ? periodeData[0] : periodeData[index], loading: false })
                 }
             }
@@ -218,6 +218,7 @@ export default class EditMasterDataCAT extends Component {
         console.log(simpan)
         let payload = {
             "company_id": this.state.company.company_id,
+            "company_old": this.props.data[8],
             "years": this.state.periode.periode,
             "detail": simpan
         }
@@ -381,8 +382,8 @@ export default class EditMasterDataCAT extends Component {
                                     <Autocomplete
                                         {...this.state.listCompany}
                                         id="company"
-                                        onChange={(event, newInputValue) => this.setState({ company_name: newInputValue }, () => this.getParent(), this.clearMessage())}
-                                        debug
+                                        onChange={(event, newInputValue) => this.setState({ company: newInputValue }, () => this.getParentIR(), this.clearMessage())}
+                                        disableClearable
                                         style={{ width: 250 }}
                                         renderInput={(params) =>
                                             <TextField {...params}
@@ -410,7 +411,7 @@ export default class EditMasterDataCAT extends Component {
                                         onChange={(event, newInputValue) => this.setState({ periode: newInputValue, loading: true, previewTable: false }, () => {
                                             this.getParentIR()
                                         })}
-                                        debug
+                                        disableClearable
                                         renderInput={(params) =>
                                             <TextField {...params}
                                                 label="Year"

src/container/MasterData/MasterDataCAT/MasterDataCAT.js

@@ -749,6 +749,35 @@ export default class MasterDataCAT extends Component {
         })
     }
 
+    updateReportItems = (payload) => {
+        this.setState({ add: false, edit: false })
+        api.create().updateMasterDataCat(payload).then(response => {
+            console.log(payload);
+            console.log(response);
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
+                        this.getData()
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
+        })
+    }
+
     downloadFile = async () => {
         let res = await fetch(
             `${process.env.REACT_APP_URL_MAIN_BE}/public/attachment/download_file?fileName=ItemReportTemplate&&fileType=xlsx`
@@ -1141,7 +1170,7 @@ export default class MasterDataCAT extends Component {
                         onClickClose={() => this.setState({ edit: false })}
                         data={this.state.rowData}
                         refresh={this.getData.bind(this)}
-                        updateReportItems={this.createReportItems.bind(this)}
+                        updateReportItems={this.updateReportItems.bind(this)}
                     />
                 )}
                 {this.state.popupError && (

src/container/RollingOutlook/CashFlowRO.js

@@ -1955,7 +1955,7 @@ export default class CashFlow extends Component {
         return (
             <div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
-                    <Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
+                    <Typography style={{ fontSize: '16px', color: 'white' }}>Rolling Outlook & Revision CAT</Typography>
                 </div>
                 <Snackbar open={this.state.alert} autoHideDuration={3000} onClose={() => this.closeAlert()}>
                     <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
@@ -1965,7 +1965,7 @@ export default class CashFlow extends Component {
                 <div style={{ flex: 1, padding: 20, width: '100%' }}>
                     <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                         <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >
-                            <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Budget Tahunan - Cash Flow</Typography>
+                            <Typography style={{ fontSize: '12px', color: '#4b4b4b', margin: 10 }}>Rolling Outlook - Cash Flow</Typography>
                         </div>
                         <div style={{ padding: 20 }}>
                             <div style={{ display: 'flex', justifyContent: 'space-between' }}>

src/container/RollingOutlook/OperatingIndicatorRO.js

@@ -2045,8 +2045,7 @@ export default class OperatingIndicatorRO extends Component {
                                 {!this.state.emptyData && <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.data.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}
-                                        </Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.data.periode} {String(this.props.quartal).toLocaleUpperCase()}</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>

src/container/RollingOutlook/ProfitLossRO.js

@@ -910,7 +910,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `${Number(this.props.periode) - 1} Total`,
+                name: `${Number(this.props.periode) - 1} Total Actual`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -2184,7 +2184,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `${this.props.periode} Total`,
+                name: `${this.props.periode} Total Outlook`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -2316,7 +2316,7 @@ export default class ProfitLossROO extends Component {
                                 <div style={{ display: 'flex', justifyContent: 'space-between' }}>
                                     <div>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
+                                        <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision})</Typography>
                                         <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                     </div>
                                     <div style={{ width: '50%' }}>
@@ -2540,7 +2540,7 @@ export default class ProfitLossROO extends Component {
                             <div style={{ padding: 20 }}>
                                 <div>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>{this.props.company.company_name}</Typography>
-                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} (rev.{this.props.revision}) {String(this.props.quarter).toLocaleUpperCase()}</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {this.props.periode} {String(this.props.quarter).toLocaleUpperCase()} (rev.{this.props.revision}) </Typography>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>