Merge branch 'deni-dev(pc)' into 'master'

yby

See merge request !568

src/container/BudgetTahunan.js

@@ -1345,7 +1345,7 @@ export default class BudgetTahunan extends Component {
                         periode={this.state.periode.periode}
                         submissionID={this.state.submissionID}
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
-                        onClickClose={() => this.setState({ visibleCAT: false, visibleBudgetTahunan: true })}
+                        onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
                         getReport={this.getSubmission.bind(this)}
                         isApprover={this.state.isApprover}
                         status={this.state.status}

src/container/BudgetTahunan/CashFlow.js

@@ -42,7 +42,7 @@ export default class CashFlow extends Component {
     }
 
     componentDidMount() {
-        this.setState({loading: true})
+        this.setState({ loading: true })
         this.getItemHierarki()
     }
 
@@ -87,7 +87,7 @@ export default class CashFlow extends Component {
                     item.order,
                     item.condition_it_should_be,
                     item.condition_if_wrong,
-                    item.cash_flow.forecast_formula == null? [] : item.cash_flow.forecast_formula
+                    item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
                 ])
 
                 if (item.children !== null) {
@@ -125,7 +125,7 @@ export default class CashFlow extends Component {
                     item.order,
                     item.condition_it_should_be,
                     item.condition_if_wrong,
-                    item.cash_flow.forecast_formula == null? [] : item.cash_flow.forecast_formula
+                    item.cash_flow.forecast_formula == null ? [] : item.cash_flow.forecast_formula
                 ])
                 if (item.children !== null) {
                     if (item.children.length > 0) {
@@ -154,9 +154,9 @@ export default class CashFlow extends Component {
             a.href = url;
             a.download = 'Master Budget Cash Flow.xlsx';
             a.click();
-            this.setState({loading: false})
+            this.setState({ loading: false })
         } else {
-            this.setState({loading: false})
+            this.setState({ loading: false })
         }
     }
 
@@ -188,13 +188,13 @@ export default class CashFlow extends Component {
             })
 
             baru.map((item, index) => {
-                if (item == '-' || item == '+' || item == '/' || item == '*'|| item == '(' || item == ')') {
+                if (item == '-' || item == '+' || item == '/' || item == '*' || item == '(' || item == ')') {
                     anjay.push(item)
                 } else {
                     if (String(item).includes('#')) {
                         if (forecast !== undefined) {
                             let forecastt = 0
-                            forecast.map((items,index) => {
+                            forecast.map((items, index) => {
                                 if (items.periode == periode) {
                                     forecastt += Number(items.value)
                                 }
@@ -243,7 +243,7 @@ export default class CashFlow extends Component {
             let anjay2 = []
             let kurung = false
             let item1 = []
-            anjay.map((item,index) => {
+            anjay.map((item, index) => {
                 if (item == "(") {
                     kurung = true
                 } else if (item == ")") {
@@ -295,7 +295,7 @@ export default class CashFlow extends Component {
                         }
                     })
 
-                    if (index == anjay2.length -1) {
+                    if (index == anjay2.length - 1) {
                         if (opt == "tambah") {
                             total = Number(total) + Number(totalPrio)
                         } else if (opt == "kurang") {
@@ -381,7 +381,7 @@ export default class CashFlow extends Component {
 
         const handleForecast = (tableMeta, periode, column) => {
             let total = 0
-            // console.log(column)
+            // console.log(tableMeta.rowData)
 
             // console.log(tableMeta.rowIndex)
             // console.log(total)
@@ -460,7 +460,7 @@ export default class CashFlow extends Component {
                 name: `MB 2021`,
                 options: {
                     customHeadRender: (columnMeta) => (
-                        <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0',  top: 0, zIndex: 102 , fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
+                        <th style={{ ...style2, color: '#fff', backgroundColor: '#07a7d0', top: 0, zIndex: 102, fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)", padding: 0 }} >
                             {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                                 <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                             </TableCell> */}
@@ -2206,6 +2206,28 @@ export default class CashFlow extends Component {
                                     />
                                 </MuiThemeProvider>
                             </div>
+                            <div className="grid grid-2x" style={{ marginTop: 20 }}>
+                                <div className="col-1">
+                                    <button
+                                        type="button"
+                                        onClick={() => this.setState({ loading: true }, () => {
+                                            setTimeout(() => {
+                                                this.props.onClickClose()
+                                            }, 100);
+                                        })}
+                                        style={{
+                                            backgroundColor: 'transparent',
+                                            cursor: 'pointer',
+                                            borderColor: 'transparent',
+                                            outline: 'none'
+                                        }}
+                                    >
+                                        <div style={{ backgroundColor: '#019ce5', width: 105, height: 25, borderRadius: 3, justifyContent: 'center', display: 'flex', alignItems: 'center' }}>
+                                            <Typography style={{ fontSize: '11px', color: '#fff', textAlign: 'center' }}>Cancel</Typography>
+                                        </div>
+                                    </button>
+                                </div>
+                            </div>
                         </div>
                     </Paper>
                 </div>

src/container/Laporan/SubHolding.js

@@ -489,7 +489,7 @@ export default class SubHolding extends Component {
                 let url = window.URL.createObjectURL(res);
                 let a = document.createElement('a');
                 a.href = url;
-                a.download = 'Report DB Profit $ Loss.xlsx';
+                a.download = 'Report DB Profit & Loss.xlsx';
                 a.click();
             }
         } else {