Merge branch 'Faisal' into 'master'

RO Actual!

See merge request !1551

src/container/RollingOutlook/BalanceSheetRO.js

@@ -975,7 +975,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Jan ${this.props.periode}`,
+                name: `Jan ${this.props.periode} Actual`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1021,7 +1021,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Feb ${this.props.periode}`,
+                name: `Feb ${this.props.periode} Actual`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1068,7 +1068,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Mar ${this.props.periode}`,
+                name: `Mar ${this.props.periode} Actual`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1115,7 +1115,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Apr ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Apr ${this.props.periode} Actual` : `Apr ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1248,7 +1248,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `May ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `May ${this.props.periode} Actual` : `May ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1381,7 +1381,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Jun ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Jun ${this.props.periode} Actual` : `Jun ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1514,7 +1514,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Jul ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Jul ${this.props.periode} Actual` : `Jul ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1647,7 +1647,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Aug ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Aug ${this.props.periode} Actual` : `Aug ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1780,7 +1780,7 @@ export default class BalanceSheetRO extends Component {
                     }
                 }
             }, {
-                name: `Sep ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Sep ${this.props.periode} Actual` : `Sep ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -1347,7 +1347,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Jan ${this.props.periode}`,
+            name: `Jan ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1375,7 +1375,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Feb ${this.props.periode}`,
+            name: `Feb ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1402,7 +1402,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Mar ${this.props.periode}`,
+            name: `Mar ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1429,7 +1429,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Apr ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Apr ${this.props.periode} Actual` : `Apr ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1529,7 +1529,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `May ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `May ${this.props.periode} Actual` : `May ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1629,7 +1629,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Jun ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Jun ${this.props.periode} Actual` : `Jun ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1729,7 +1729,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Jul ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Jul ${this.props.periode} Actual` : `Jul ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1829,7 +1829,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Aug ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Aug ${this.props.periode} Actual` : `Aug ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>
@@ -1929,7 +1929,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             }
         }, {
-            name: `Sep ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Sep ${this.props.periode} Actual` : `Sep ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderLeft: '1px #fff solid' }}>

src/container/RollingOutlook/ProfitLossRO.js

@@ -1339,7 +1339,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `Apr ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Apr ${this.props.periode} Actual` : `Apr ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1437,7 +1437,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `May ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `May ${this.props.periode} Actual` : `May ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1535,7 +1535,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `Jun ${this.props.periode}`,
+                name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Jun ${this.props.periode} Actual` : `Jun ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1633,7 +1633,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `Jul ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Jul ${this.props.periode} Actual` : `Jul ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1731,7 +1731,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `Aug ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Aug ${this.props.periode} Actual` : `Aug ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>
@@ -1829,7 +1829,7 @@ export default class ProfitLossROO extends Component {
                     }
                 }
             }, {
-                name: `Sep ${this.props.periode}`,
+                name: this.props.quarter == 'q3' ? `Sep ${this.props.periode} Actual` : `Sep ${this.props.periode}`,
                 options: {
                     customHeadRender: (columnMeta) => (
                         <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96, borderRight: '1px #fff solid' }}>

src/container/RollingOutlook/TaxPlanningRO.js

@@ -1212,7 +1212,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Jan ${this.props.periode}`,
+            name: `Jan ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1301,7 +1301,7 @@ export default class TaxPlanning extends Component {
             }
         },
         {
-            name: `Feb ${this.props.periode}`,
+            name: `Feb ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1391,7 +1391,7 @@ export default class TaxPlanning extends Component {
             }
         },
         {
-            name: `Mar ${this.props.periode}`,
+            name: `Mar ${this.props.periode} Actual`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1480,7 +1480,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Apr ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Apr ${this.props.periode} Actual` : `Apr ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1989,7 +1989,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `May ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `May ${this.props.periode} Actual` : `May ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -2480,7 +2480,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Jun ${this.props.periode}`,
+            name: this.props.quarter == 'q2' || this.props.quarter == 'q3' ? `Jun ${this.props.periode} Actual` : `Jun ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -2971,7 +2971,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Jul ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Jul ${this.props.periode} Actual` : `Jul ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -3462,7 +3462,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Aug ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Aug ${this.props.periode} Actual` : `Aug ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -3953,7 +3953,7 @@ export default class TaxPlanning extends Component {
                 }
             }
         }, {
-            name: `Sep ${this.props.periode}`,
+            name: this.props.quarter == 'q3' ? `Sep ${this.props.periode} Actual` : `Sep ${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >