Merge branch 'GGMAC' into 'master'

update cat

See merge request !1252

src/container/Laporan/DashboardCAT.js

@@ -501,7 +501,7 @@ export default class DashboardCAT extends Component {
                             this.state.tab === 1 ?
                                 <StrategiMap height={this.props.height} data={this.state.dataDashboard} dataPayload={{ month: this.state.month, periode: this.state.periode, company: this.state.company }} />
                                 :
-                                <KPIs height={this.props.height} width={this.props.open ? this.props.width - 360 : this.props.width - 100} data={this.state.dataDashboard} dataPayload={{ month: this.state.month, periode: this.state.periode, company: this.state.company }} />
+                                <KPIs height={this.props.height} selectedMonth={this.state.selectedMonth} width={this.props.open ? this.props.width - 360 : this.props.width - 100} data={this.state.dataDashboard} dataPayload={{ month: this.state.month, periode: this.state.periode, company: this.state.company }} />
                         }
                     </Paper>
                 </div>}

src/container/MonthlyReport.js

@@ -1775,12 +1775,14 @@ export default class MonthlyReport extends Component {
                 listPL.push({
                     "item_report_id": item[1],
                     "actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1),
+                    "rolling_outlook": item[0] == 1 ? "" : Number(item[6].value_ro).toFixed(1),
                     "notes": item[8]
                 })
             } else {
                 listPL.push({
                     "item_report_id": item[1],
                     "actual": item[0] == 1 ? "" : Number(item[6].value).toFixed(1),
+                    "rolling_outlook": item[0] == 1 ? "" : Number(item[6].value_ro).toFixed(1),
                     "notes": item[8]
                 })
             }