Merge branch 'dev/arfin' into 'ENV-DEPLOYMENT'

Dev/arfin

See merge request !1623

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -826,14 +826,14 @@ export default class CorporateAnnualTargetRO extends Component {
 
                     } else {
                         let convertID = -1
-                        if (tableMeta.rowData[11].value == 'FORMULA') {
+                        if (tableMeta.rowData[10].value == 'FORMULA') {
                             let indexIDReport = dataTable2.findIndex((val) => val[1] == item)
-                            convertID = dataTable2[indexIDReport][31]
+                            convertID = dataTable2[indexIDReport][26]
                         }
-                        let indexID = dataTable2.findIndex((val) => val[31] == (convertID == -1 ? item : convertID))
+                        let indexID = dataTable2.findIndex((val) => val[26] == (convertID == -1 ? item : convertID))
                         if (indexID !== -1) {
                             let valuezz = dataTable2[indexID][tableMeta.columnIndex].value == undefined ? dataTable2[indexID][tableMeta.columnIndex] : dataTable2[indexID][tableMeta.columnIndex].value
-                            if (item == dataTable2[tableMeta.rowIndex][31]) {
+                            if (item == dataTable2[tableMeta.rowIndex][26]) {
                                 anjay.push(0)
                             } else {
                                 anjay.push(valuezz == "" ? "0" : valuezz)
@@ -847,8 +847,8 @@ export default class CorporateAnnualTargetRO extends Component {
                 }
             })
             // if (tableMeta.rowData[11].value == 'FORMULA') {
-            //     console.log(anjay)
-            //     console.log(column)
+                // console.log(anjay)
+                // console.log(column)
 
             // }
 
@@ -1445,7 +1445,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
@@ -1545,7 +1545,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
@@ -1645,7 +1645,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q2" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
@@ -1745,7 +1745,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
@@ -1845,7 +1845,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
@@ -1945,7 +1945,7 @@ export default class CorporateAnnualTargetRO extends Component {
                             {
                                 tableMeta.rowData[0] === 1 || tableMeta.rowData[0] === 2 || tableMeta.rowData[0] === 4 ?
                                     null :
-                                    this.state.get_for == "view" ?
+                                    this.state.get_for == "view" || this.props.quartal == "q3" ?
                                         <NumberFormat
                                             thousandSeparator={true}
                                             style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}