Merge branch 'rifka' into 'master'

RO : tp cf

See merge request !1342

src/container/RollingOutlook.js

@@ -17,6 +17,7 @@ import BalanceSheetRO from './RollingOutlook/BalanceSheetRO';
 import ProfitLossRO from './RollingOutlook/ProfitLossRO';
 import TaxPlanningRO from './RollingOutlook/TaxPlanningRO';
 import CatRevision from './RollingOutlook/CatRevision';
+import CashFlowRO from './RollingOutlook/CashFlowRO';
 
 var ct = require("../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -41,6 +42,7 @@ export default class RollingOutlook extends Component {
             visiblePL: false,
             visibleTP: false,
             visibleCAT: false,
+            visibleCF: false,
             listAttachment: [],
             visibleUpload: false,
             revisionTable: null,
@@ -647,6 +649,7 @@ export default class RollingOutlook extends Component {
                     visiblePL: false,
                     visibleCAT: false,
                     visibleTP: false,
+                    visibleCF: false,
                 })
             } else if (item === 'Profit Loss') {
                 this.setState({
@@ -655,6 +658,16 @@ export default class RollingOutlook extends Component {
                     visiblePL: true,
                     visibleCAT: false,
                     visibleTP: false,
+                    visibleCF: false,
+                })
+            } else if (item === 'Cash Flow') {
+                this.setState({
+                    visibleRollingOutlook: false,
+                    visibleBS: false,
+                    visiblePL: false,
+                    visibleCAT: false,
+                    visibleTP: false,
+                    visibleCF: true,
                 })
             } else if (item === 'Tax Planning') {
                 this.setState({
@@ -663,6 +676,7 @@ export default class RollingOutlook extends Component {
                     visiblePL: false,
                     visibleCAT: false,
                     visibleTP: true,
+                    visibleCF: false,
                 })
             } else if (item === 'CAT') {
                 this.setState({
@@ -671,6 +685,7 @@ export default class RollingOutlook extends Component {
                     visiblePL: false,
                     visibleCAT: true,
                     visibleTP: false,
+                    visibleCF: false,
                 })
             }
         })
@@ -1480,6 +1495,26 @@ export default class RollingOutlook extends Component {
                     />
                 )}
 
+                {this.state.visibleCF && (
+                    <CashFlowRO
+                        width={this.props.width}
+                        height={this.props.height}
+                        open={this.props.open}
+                        report_id={this.state.report_id}
+                        company={this.state.company}
+                        revision={this.state.revisionTable}
+                        periode={this.state.periode.periode}
+                        rollingOutlookID={this.state.rollingOutlookID}
+                        onClickClose={() => this.setState({ visibleCF: false, visibleRollingOutlook: true })}
+                        refresh={this.getRollingOutlookID.bind(this)}
+                        status={this.state.status}
+                        lastStatus={this.state.lastStatus}
+                        quarter={this.state.quarter.value}
+                        isApprover={this.state.isApprover}
+                        prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
+                    />
+                )}
+
                 {this.state.visibleCAT && (
                     <CatRevision
                         width={this.props.width}