Merge branch 'GGMAC' into 'master'

update progress report

See merge request !1508

src/container/Home.js

@@ -11,6 +11,7 @@ import IconButton from '@material-ui/core/IconButton';
 import MenuIcon from '@material-ui/icons/Menu';
 import ExpandMore from '@material-ui/icons/ExpandMore'
 import ExpandLess from '@material-ui/icons/ExpandLess'
+import ReportIcon from '@material-ui/icons/PriorityHigh'
 import ChevronLeftIcon from '@material-ui/icons/ChevronLeft';
 import ListItem from '@material-ui/core/ListItem';
 import ListItemIcon from '@material-ui/core/ListItemIcon';
@@ -566,6 +567,17 @@ export default function MiniDrawer() {
               }
             </div>
           ))}
+          <Link to={`${url}/progress-reports`}>
+            <div style={{ paddingLeft: 5 }} className={selectedIndex === 'progress-reports' ? "active" : ""}>
+              <a data-tip={'progress-reports'} data-for={'progress-reports'}>
+                <ListItem button key={'progress-reports'} onClick={() => selectIndex('progress-reports')}>
+                  <ListItemIcon style={{ minWidth: open ? 40 : 56}}><ReportIcon style={{marginLeft: -5}}/></ListItemIcon>
+                  <Typography style={{ fontFamily: 'Nunito Sans, sans-serif', color: '#525355', fontSize: 14 }}>{'Progress Report'}</Typography>
+                </ListItem>
+              </a>
+              {!open && (<ReactTooltip border={true} id={'Progress Report'} place="bottom" type="light" effect="solid" />)}
+            </div>
+          </Link>
         </List>
         {open && setting.length > 0 &&
           <div style={{ marginLeft: 20 }}>

src/router/homeRoutes.js

@@ -20,6 +20,7 @@ import OutlookPA from '../container/OutlookPA';
 import SubHolding from '../container/Laporan/SubHolding';
 import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra';
 import MasterDataCAT from '../container/MasterData/MasterDataCAT/MasterDataCAT'
+import ProgressReport from '../container/ProgressReport'
 
 const routes = [
   {
@@ -106,6 +107,10 @@ const routes = [
     path: "/home/dashboard-financial",
     main: DashboardFinancial
   },
+  {
+    path: "/home/progress-reports",
+    main: ProgressReport
+  },
   {
     path: "*",
     main: screen404