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

src/container/MonthlyReport/BalanceSheetMR.js

@@ -303,7 +303,7 @@ export default class BalanceSheetMR extends Component {
                             orders: i[0] === undefined ? "" : String(i[0]).trim(),
                             item_report_id: i[1] === undefined ? "" : String(i[1]).trim(),
                             item_report: i[2] === undefined ? "" : String(i[2]).trim(),
-                            actual: i[3] === undefined ? "0" : reg.test(String(i[2])) === false ? "0" : String(i[3]).trim(),
+                            actual: i[3] === undefined ? "0" : reg.test(String(i[3])) === false ? "0" : String(i[3]).trim(),
                             mtd_vs_previous_month: i[4] === undefined ? "" : String(i[4]).trim(),
                             mtd_vs_mb: i[5] === undefined ? "" : String(i[5]).trim(),
                             mtd_vs_rb: i[6] === undefined ? "" : String(i[6]).trim(),
@@ -709,7 +709,7 @@ export default class BalanceSheetMR extends Component {
                             let data = tableMeta.rowData[20] == null? [] : tableMeta.rowData[20]
                             let indexID = data.findIndex((val) => val.item_formula == String(`${item}`))
                             if (indexID !== -1) {
-                                console.log(tableMeta)
+                                // console.log(tableMeta)
                                 let valuezz = data[indexID].value
                                 anjay.push(valuezz == "" ? 0 : valuezz)
                             }
@@ -1858,7 +1858,7 @@ export default class BalanceSheetMR extends Component {
                             </div>
 
                             <div style={{ marginTop: 20, width: this.props.width - (this.props.open === true ? 400 : 150) }}>
-                                {/* {!this.state.loading && ( */}
+                                {!this.state.loading && (
                                     <MuiThemeProvider theme={getMuiTheme()}>
                                         <MUIDataTable
                                             data={dataTable2}
@@ -1866,7 +1866,7 @@ export default class BalanceSheetMR extends Component {
                                             options={options}
                                         />
                                     </MuiThemeProvider>
-                                {/* )} */}
+                                )}
                             </div>
 
                             <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
@@ -2014,7 +2014,7 @@ export default class BalanceSheetMR extends Component {
                                     <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) }}>
-                                    {this.state.dataLoaded && (
+                                    {this.state.dataLoaded && !this.state.loading && (
                                         <MuiThemeProvider theme={getMuiTheme()}>
                                             <MUIDataTable
                                                 data={dataTable2}

src/container/MonthlyReport/CashFlowMR.js

@@ -427,7 +427,7 @@ export default class CashFlowMR 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.month.month_value} {this.props.periode} (rev.{this.props.revision})</Typography>
+                                    <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>Period : {String(this.props.month.month_value).toLocaleUpperCase()} {this.props.periode} (rev.{this.props.revision})</Typography>
                                     <Typography style={{ fontSize: '11px', color: '#4b4b4b' }}>in IDR mn</Typography>
                                 </div>
                                 <div style={{ width: '50%' }}>

src/container/MonthlyReport/FixedAssetsMovementMR.js

@@ -1374,7 +1374,7 @@ export default class FixedAssetsMovementMR extends Component {
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5 }}>Notes : {this.state.notesUpdate}</Typography>
                             </div>
                             <div className="grid grid-2x" style={{ padding: 20 }}>
-                                <div className="col-1" style={{ paddingLeft: 0, }}>
+                                <div className="col-1" style={{ paddingLeft: 0 }}>
                                     <button
                                         type="button"
                                         onClick={() => this.setState({ loading: true }, () => {
@@ -1405,8 +1405,7 @@ export default class FixedAssetsMovementMR extends Component {
                                                 backgroundColor: 'transparent',
                                                 cursor: 'pointer',
                                                 borderColor: 'transparent',
-                                                outline: 'none',
-                                                marginRight: 20
+                                                outline: 'none'
                                             }}
                                             onClick={() => {
                                                 this.setState({loading: true}, () => {
@@ -1524,7 +1523,7 @@ export default class FixedAssetsMovementMR extends Component {
                                     )}
                                 </div>
                                 <div className="grid grid-2x" style={{ marginTop: 20 }}>
-                                    <div className="col-1">
+                                    <div className="col-1" style={{ paddingLeft: 0 }}>
                                         <button
                                             type="button"
                                             onClick={() => this.setState({ loading: true, visibleFAMMR: true }, () => {
@@ -1546,7 +1545,7 @@ export default class FixedAssetsMovementMR extends Component {
                                     </div>
                                     {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                         (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === "draft" || this.props.status === 'submitted') ? */}
-                                    <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
+                                    <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', paddingRight: 5 }}>
                                         <button
                                             className="button"
                                             type="button"
@@ -1584,7 +1583,7 @@ export default class FixedAssetsMovementMR extends Component {
                                                 this.state.saveDraft === true ?
                                                     null :
                                                     this.state.handleTekTekTek === 1 ? null :
-                                                        this.setState({ handleTekTekTek: 1 }, () => {
+                                                        this.setState({ handleTekTekTek: 1, loading: true }, () => {
                                                             this.uploadFAMMR('draft')
                                                         })
                                             }
@@ -1607,7 +1606,7 @@ export default class FixedAssetsMovementMR extends Component {
                                                     this.setState({ alert: true, messageAlert: 'Data is not complete !', tipeAlert: 'warning' })
                                                     :
                                                     this.state.handleTekTekTek === 1 ? null :
-                                                        this.setState({ handleTekTekTek: 1 }, () => {
+                                                        this.setState({ handleTekTekTek: 1, loading: true }, () => {
                                                             this.uploadFAMMR('submitted')
                                                         })}
                                             style={{

src/container/MonthlyReport/TaxPlanningMR.js

@@ -574,7 +574,7 @@ export default class TaxPlanningMR extends Component {
                                 }
                             } else {
                                 let data = tableMeta.rowData[12]
-                                let indexID = data.findIndex((val) => val.item_formula == String(`${item}`) && val.periode == Number(this.props.periode))
+                                let indexID = data.findIndex((val) => val.item_formula == String(`@${item}`) && val.periode == Number(this.props.periode))
                                 if (indexID !== -1) {
                                     let valuezz = data[indexID].value
                                     anjay.push(valuezz == "" ? 0 : valuezz)