Merge branch 'rifka' into 'master'

issue

See merge request !1365

src/container/HomePage.js

@@ -745,9 +745,9 @@ class HomePage extends Component {
                                     pathname: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("master") ? `/home/master-budget/` : String(tableMeta.rowData[3]).toLocaleLowerCase().includes("monthly") ? `/home/monthly-report/` : String(tableMeta.rowData[3]).toLocaleLowerCase().includes("rolling") ? `/home/rolling-outlook/` : `/home/outlook-performance/`,
                                     state: {
                                         userType: 'approver',
-                                        rawData: this.state.rawData[tableMeta.rowIndex],
+                                        rawData: {...this.state.rawData[tableMeta.rowIndex], quarter: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("rolling") ? this.state.quarter.value : null },
                                         month: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("master") ? null : getDataMonth(this.state.rawData[tableMeta.rowIndex]),
-                                        quartal: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("rolling") ? this.state.quarter.value : null
+                                        quarter: String(tableMeta.rowData[3]).toLocaleLowerCase().includes("rolling") ? this.state.quarter.value : null
                                     }
                                 }}>
                                     <button

src/container/RollingOutlook.js

@@ -894,7 +894,7 @@ export default class RollingOutlook extends Component {
                                             <span>INCOMPLETE</span> :
                                             val === "revision" ?
                                                 <span>REVISION</span> :
-                                                val === "approval_process" ?
+                                                val === "approval_proccess" ?
                                                     <span>APPROVAL PROCCESS</span> :
                                                     val === "approval_review" ?
                                                         <span>APPROVAL REVIEW</span> :