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

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/container/Laporan/SubHolding.js

@@ -1974,7 +1974,7 @@ export default class SubHolding extends Component {
                                 }
 
                                 let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : Number(item.cash_flow.quarter_actual)
-                                let quarter = item.cash_flow.quarter == '' ? 0 : Number(item.cash_flow.quarter)
+                                let quarter = item.cash_flow.quarter_mb == '' ? 0 : Number(item.cash_flow.quarter_mb)
                                 // let persenQuarter = Number(quarter_actual / quarter)
                                 let persenQuarter = 0
                                 if (quarter  < 0) {
@@ -2015,8 +2015,8 @@ export default class SubHolding extends Component {
                                     // isNaN(persenYtd)? 0 : persenYtd * 100,
                                     item.cash_flow.ytd_last_year,
                                     item.cash_flow.quarter_actual,
-                                    item.cash_flow.quarter,
-                                    isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity' ? (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0 ? -0 : 0) : (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0 ? persenQuarter * -100 : persenQuarter * 100),
+                                    item.cash_flow.quarter_mb,
+                                    isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity' ? (item.cash_flow.quarter_mb == '' || item.cash_flow.quarter_mb == 0 ? -0 : 0) : (item.cash_flow.quarter_mb == '' || item.cash_flow.quarter_mb == 0 ? persenQuarter * -100 : persenQuarter * 100),
                                     // isNaN(persenQuarter)? 0 : persenQuarter * 100,
                                     item.cash_flow.quarter_last_year,
                                     item.cash_flow.fy_actual,
@@ -2067,7 +2067,7 @@ export default class SubHolding extends Component {
                             }
 
                             let quarter_actual = item.cash_flow.quarter_actual == '' ? 0 : Number(item.cash_flow.quarter_actual)
-                            let quarter = item.cash_flow.quarter == '' ? 0 : Number(item.cash_flow.quarter)
+                            let quarter = item.cash_flow.quarter_mb == '' ? 0 : Number(item.cash_flow.quarter_mb)
                             // let persenQuarter = Number(quarter_actual / quarter)
                             let persenQuarter = 0
                             if (quarter  < 0) {
@@ -2108,8 +2108,8 @@ export default class SubHolding extends Component {
                                 // isNaN(persenYtd)? 0 : persenYtd * 100,
                                 item.cash_flow.ytd_last_year,
                                 item.cash_flow.quarter_actual,
-                                item.cash_flow.quarter,
-                                isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity' ? (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0 ? -0 : 0) : (item.cash_flow.quarter == '' || item.cash_flow.quarter == 0 ? persenQuarter * -100 : persenQuarter * 100),
+                                item.cash_flow.quarter_mb,
+                                isNaN(persenQuarter) || persenQuarter == 'Infinity' || persenQuarter == '-Infinity' ? (item.cash_flow.quarter_mb == '' || item.cash_flow.quarter_mb == 0 ? -0 : 0) : (item.cash_flow.quarter_mb == '' || item.cash_flow.quarter_mb == 0 ? persenQuarter * -100 : persenQuarter * 100),
                                 // isNaN(persenQuarter)? 0 : persenQuarter * 100,
                                 item.cash_flow.quarter_last_year,
                                 item.cash_flow.fy_actual,

src/container/RollingOutlook/CorporateAnnualTargetRO.js

@@ -189,8 +189,8 @@ export default class CorporateAnnualTargetRO extends Component {
                                 item.formula,
                                 item.level,
                                 item.description,
-                                // item.weight == '' ? Number(0).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
-                                item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(Number(weight * 100)).toFixed(1),
+                                item.weight == '' ? Number(weight).toFixed(1) : Number(Number(item.weight) * 100).toFixed(1),
+                                // item.corporate_annual_target.weight == "" ? Number(0).toFixed(1) : Number(Number(weight * 100)).toFixed(1),
                                 item.corporate_annual_target.uom,
                                 item.kpi_type == "" ? null : { value: item.kpi_type },
                                 item.max_ach == "" ? null : { value: titleCase(item.max_ach) },

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/Progress/ProgressReport'
 
 const routes = [
   {
@@ -106,6 +107,10 @@ const routes = [
     path: "/home/dashboard-financial",
     main: DashboardFinancial
   },
+  {
+    path: "/home/progress-reports",
+    main: ProgressReport
+  },
   {
     path: "*",
     main: screen404