Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Env dev

See merge request !2409

.env_staging

 // contents of .env 
 
-REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
+REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-debug
 REACT_APP_URL_MAIN_FE=/web-staging
+GENERATE_SOURCEMAP=false
\ No newline at end of file

package.json

 {
   "name": "my-app",
   "version": "0.1.0",
-  "homepage": "http://localhost:8080/web/", 
+  "homepage": "http://localhost:8080/web-staging/",
   "private": true,
   "dependencies": {
     "@date-io/date-fns": "^1.3.13",

src/assets/sass/app.css

 .main-color{
-  background-color: #273b80 !important;
+  background-color: #319c23 !important;
 }
 
 /* for staging */

src/container/Menu/Home.js

@@ -71,7 +71,7 @@ const useStyles = makeStyles((theme) => ({
       easing: theme.transitions.easing.sharp,
       duration: theme.transitions.duration.enteringScreen,
     }),
-    backgroundColor: '#273b80'
+    backgroundColor: '#319c23'
   },
   topleftClose: {
     borderRight: 0,
@@ -87,7 +87,7 @@ const useStyles = makeStyles((theme) => ({
     },
     padding: 20,
     display: 'flex',
-    backgroundColor: '#273b80'
+    backgroundColor: '#319c23'
   },
   drawerOpen: {
     width: drawerWidth,

src/container/OutlookPA/OutlookPA.js

@@ -820,9 +820,15 @@ export default class OutlookPA extends Component {
     }
 
     clickDetail(item, id, revision, status, tableKey) {
+        let items = ''
+        if (item === 'Corporate Annual Target') {
+            items = 'CAT'
+        } else {
+            items = item
+        }
         const listTable = tableKey === 'CAT' ? this.state.dataForRevisionCAT : this.state.dataForRevision
         listTable.map(i => {
-            if (i.report_name === item) {
+            if (i.report_name === items) {
                 if (i.revision == revision) {
                     this.setState({ prevRevision: true })
                 } else {
@@ -872,8 +878,7 @@ export default class OutlookPA extends Component {
                     visibleCF: true,
                     visibleCAT: false
                 })
-                // } else if (item === 'Corporate Annual Target') {
-            } else if (item === 'CAT') {
+            } else if (item === 'Corporate Annual Target') {
                 this.setState({
                     visibleOutlookPA: false,
                     visibleBS: false,

src/container/RollingOutlook/RollingOutlook.js

@@ -868,9 +868,15 @@ export default class RollingOutlook extends Component {
     }
 
     clickDetail(item, id, revision, status, tableKey) {
+        let items = ''
+        if (item === 'Corporate Annual Target') {
+            items = 'CAT'
+        } else {
+            items = item
+        }
         const listTable = tableKey === 'CAT' ? this.state.dataForRevisionCAT : this.state.dataForRevision
         listTable.map(i => {
-            if (i.report_name === item) {
+            if (i.report_name === items) {
                 if (i.revision == revision) {
                     this.setState({ prevRevision: true })
                 } else {
@@ -920,7 +926,7 @@ export default class RollingOutlook extends Component {
                     visibleTP: true,
                     visibleCF: false,
                 })
-            } else if (item === 'CAT') {
+            } else if (item === 'Corporate Annual Target') {
                 this.setState({
                     visibleRollingOutlook: false,
                     visibleBS: false,

src/library/Constant.js

@@ -5,7 +5,7 @@ const Constant = {
     EMAIL: 'TOKEN',
     PASSWORD: 'PASSWORD',
     URL_BE_DEV: '${process.env.REACT_APP_URL_MAIN_BE}',
-    URL_BE_STAGING: 'https://tia.eksad.com/tia-reporting-staging',
+    URL_BE_STAGING: 'https://tia.eksad.com/tia-reporting-debug',
     URL_BE_DEMO: 'https://tia.eksad.com/tia-reporting-demo',
     URL_BE_PROD: 'https://dashboard.triputra-group.com/tia-reporting',
     URL_FE_DEV: 'https://tia.eksad.com/tia-web-dev',
@@ -25,6 +25,10 @@ const Constant = {
         MTD: 'Monthly Historical',
         YTD: 'Annual Historical',
     },
+    COLORS_TEXT_COLUMNS: {
+        active: '#5198ea',
+        disabled: '#000000de',
+    }
 }