Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/container/OutlookPA.js

@@ -226,6 +226,9 @@ export default class OutlookPA extends Component {
                             item.revision
                         ]
                     })
+                    dataTable.push([
+                        5, "Corporate Annual Target", 0, "not-yet", 39, false, 0
+                    ])
                     let dataTableRevision = response.data.data.map((item, index) => {
                         return [
                             item.report_id,
@@ -233,7 +236,7 @@ export default class OutlookPA extends Component {
                             ""
                         ]
                     })
-                    // console.log(dataTable);
+                    console.log(dataTable);
                     this.setState({ dataTable, loading: false, dataTableRevision, dataForRevision: response.data.data })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
@@ -618,7 +621,7 @@ export default class OutlookPA extends Component {
                     visibleBS: false,
                     visiblePL: false,
                     visibleTP: false,
-                    visibleCF: true,
+                    visibleCF: false,
                     visibleCAT: true
                 })
             }
@@ -1362,6 +1365,7 @@ export default class OutlookPA extends Component {
                 name: "Action",
                 options: {
                     customBodyRender: (val, tableMeta) => {
+                        console.log(tableMeta)
                         return (
                             <div style={{ display: 'flex' }}>
                                 <button

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -89,7 +89,7 @@ export default class CorporateAnnualTargetRO extends Component {
         let checkLastStatus = false
         let checkStatus = false
         let checkPrevRev = false
-
+        console.log('skuy');
         if (this.props.isApprover) {
             checkApprover = true
         } else {
@@ -114,7 +114,8 @@ export default class CorporateAnnualTargetRO extends Component {
             checkStatus = false
         }
 
-        this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
+        // this.setState({ viewOnly: !checkApprover && checkLastStatus && checkStatus && checkPrevRev })
+        this.setState({viewOnly: true})
     }
 
     getItemHierarki() {
@@ -620,7 +621,7 @@ export default class CorporateAnnualTargetRO extends Component {
                 "october": stateFR ? i[0] == 3 ? String(i[20]) : String(Number(i[20].value).toFixed(1)) : String(i[20]),
                 "november": stateFR ? i[0] == 3 ? String(i[21]) : String(Number(i[21].value).toFixed(1)) : String(i[21]),
                 "december": stateFR ? i[0] == 3 ? String(i[22]) : String(Number(i[22].value).toFixed(1)) : String(i[22]),
-                "total_current_year": String(Number(i[23]).toFixed(1)) == "" ? "0.0" : String(Number(i[23]).toFixed(1)),
+                "current_year_total": String(Number(i[23]).toFixed(1)) == "" ? "0.0" : String(Number(i[23]).toFixed(1)),
                 "strategic": String(i[24]),
                 "pic": String(i[25])
             })