Merge branch 'GGMAC' into 'master'

test

See merge request !1238

src/container/HomePage.js

@@ -1031,7 +1031,7 @@ class HomePage extends Component {
                                                             </button>
                                                         </Link>
                                                     </div>
-                                                    {item.is_overdue && (
+                                                    {item.is_submit === false && item.is_overdue && (
                                                         <div style={{ backgroundColor: '#f65a4c', paddingRight: 5, paddingLeft: 5, borderRadius: 5, alignSelf: 'center' }}>
                                                             <Typography style={{ fontSize: 11, color: '#fff' }}>Overdue</Typography>
                                                         </div>

src/container/Laporan/DashboardCAT.js

@@ -31,15 +31,19 @@ export default class DashboardCAT extends Component {
             loading: true,
             dataDashboard: [],
             selectedKPI: [],
-            listKPI: []
+            listKPI: [],
+            rawData: {}
         }
     }
 
     componentDidMount() {
+        console.log(this.props)
         this.props.selectIndex('CAT Dashboard')
         let dataStorageCAT = localStorage.getItem(Constant.DATACAT)
+        console.log(dataStorageCAT)
         if (dataStorageCAT != 'datacat') {
             this.setState({selectedKPI: JSON.parse(dataStorageCAT).listKPI})
+            console.log(dataStorageCAT)
         }
         if (this.props.location.state !== undefined) {
             this.setState({ userType: this.props.location.state.userType, intent: 'Home', rawData: this.props.location.state.rawData }, () => {
@@ -103,6 +107,7 @@ export default class DashboardCAT extends Component {
                 if (response.data.status === 'success') {
                     let data = response.data.data
                     let comID = this.state.rawData ? this.state.rawData.companyId : 0
+                    // console.log(comID)
                     let companyData = data.map((item) => {
                         return {
                             company_id: item.company_id,