Merge branch 'dev-msy' of https://git.oslog.id/OSPRO/ADW-FrontEnd into dev-msy

src/views/DashboardPMOV1/index.js

@@ -148,15 +148,16 @@ const DashboardPM = () => {
           </Col>
         </Row>
         <Row style={{ marginTop: '15px' }}>
-          <Col span={24} style={{ margin: '0px 0px 0px 0px' }}>
+          <Col span={24} style={{ margin: '0px 0px 0px 0px' }}> 
-            <Collapse>
+            <Collapse> 
-              <Panel key="1">
+            
+              <Panel header="More Iformation Chart" key="1"> 
                 <Row style={{ margin: '10px 10px 0px 10px' }}>
                   <Col span={8} >
                     <Row>
                       <Col span={24}>
                         <h6 class="text-center">Car Management</h6>
-                        <h6 class="text-center">Total Vehicles: -</h6>
+                        {/* <h6 class="text-center">Total Vehicles: -</h6> */}
                       </Col>
                     </Row>
                     <Row
@@ -169,11 +170,11 @@ const DashboardPM = () => {
                     >
                       <Col span={12}>
                         <BoxDashboardNoIcon
-                          value="-"
                           bgColor="#5e5c70"
-                          title="On Duty"
+                          title=""
+                          value={<i style={{ color: '#fff' }} class="zmdi zmdi-truck zmdi-hc-2x"></i>}
                         />
-                      </Col>
+                      </Col> 
                       <Col span={12}>
                         <BoxDashboardNoIcon
                           value="-"
@@ -190,12 +191,19 @@ const DashboardPM = () => {
                         lg: 32,
                       }}
                     >
-                      <Col span={12}>
+                      {/* <Col span={12}>
                         <BoxDashboardNoIcon
                           bgColor="#5e5c70"
                           title=""
                           value={<i style={{ color: '#fff' }} class="zmdi zmdi-truck zmdi-hc-2x"></i>}
                         />
+                      </Col> */}
+                      <Col span={12}>
+                        <BoxDashboardNoIcon
+                          value="-"
+                          bgColor="#5e5c70"
+                          title="On Duty"
+                        />
                       </Col>
                       <Col span={12}>
                         <BoxDashboardNoIcon

src/views/DashboardProject/index.js

@@ -132,7 +132,7 @@ const DashboardProject = () => {
   const [CURRENCYSYMBOL, SET_CURRENCYSYMBOL] = useState([])
   const [BUDGETHEALTH, SET_BUDGETHEALTH] = useState([])
   const [COMMENT, SET_COMMENT] = useState([])
-  const [MANPOWER, SET_MANPOWER] = useState([])
+  const [MANPOWER, SET_MANPOWER] = useState([0])
   const [DATAKURVAS, SET_DATAKURVAS] = useState([])
   const [CHARTKURVAS, SET_CHARTKURVAS] = useState([]);