Merge branch 'GGMAC' into 'master'

update

See merge request !1241

src/container/HomePage.js

@@ -1081,7 +1081,7 @@ class HomePage extends Component {
                                         />
                                     </div>
                                     <Paper style={{ width: 450, padding: 20, borderRadius: 10, marginTop: 5 }}>
-                                        <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>{`Monthly Report - ${bulan} ${tahun} ${this.state.valueSubmitMR}/${this.state.listSubcoMR.length}`}</Typography>
+                                        <Typography style={{ fontWeight: 'bold', textDecorationLine: 'underline' }}>{`Monthly Report - ${this.state.month.month_value} ${this.state.periodeMR.periode} ${this.state.valueSubmitMR}/${this.state.listSubcoMR.length}`}</Typography>
                                         {this.state.listSubcoMR.map((item, index) => {
                                             return (
                                                 <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 10, paddingLeft: 10 }}>
@@ -1107,7 +1107,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>