Merge pull request 'staging' (#57) from staging into master

Reviewed-on: ordo/adw-frontend#57

src/views/Dashboard/DashboardBOD.js

@@ -307,8 +307,10 @@ const DashboardBOD = () => {
           let actualProgress = 0;
           let selisihProgress = 0;
 
-					// planningProgress = item.scurve[0].data.percentagePlan[item.scurve[0].data.percentagePlan.length - 1]
+          if(item.scurve && item.scurve[0]) {
-					// actualProgress = item.scurve[0].data.percentageReal[item.scurve[0].data.percentageReal.length - 1]
+            planningProgress = item.scurve[0].data.percentagePlan[item.scurve[0].data.percentagePlan.length - 1]
+					  actualProgress = item.scurve[0].data.percentageReal[item.scurve[0].data.percentageReal.length - 1]
+          }
 					
           selisihProgress = planningProgress - actualProgress
 

src/views/SimproV2/CreatedProyek/DialogFormProyek.js

@@ -654,8 +654,8 @@ const DialogFormProyek = ({
 								<Option key="warning" value="warning">
 									Warning
 								</Option>
-								<Option key="danger" value="danger">
+								<Option key="overrun" value="overrun">
-									Danger
+									Overrun
 								</Option>
 							</Select>
 						</FormGroup>