Merge pull request 'add filter scurve' (#221) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#221

app/Helpers/MasterFunctionsHelper.php

@@ -375,7 +375,7 @@ class MasterFunctionsHelper
 					// }
 
 
-					$totalACWP += $keyActualM->biaya_actual / $keyActualM->duration;
+					$totalACWP += $keyActualM->duration > 0 ? $keyActualM->biaya_actual / $keyActualM->duration : 0;
 				} catch (\DivisionByZeroError $e) {
 					return response()->json(['message' => $e->getMessage()]);
 				}
@@ -555,6 +555,7 @@ class MasterFunctionsHelper
 				->join('assign_material_to_activity AS amta', 'amta.activity_id', '=', 'a.id')
 				->where('a.type_activity', 'task')
 				->where('a.bobot_planning', '>', 0)
+				->where('a.proyek_id', '=', $projectId)
 				->whereDate('amta.plan_date', '<=', $dt->format("Y-m-d"))
 				->whereDate('amta.plan_date', '>', $minSevenDays)
 				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id');
@@ -563,6 +564,7 @@ class MasterFunctionsHelper
 				->join('assign_hr_to_activity AS ahta', 'ahta.activity_id', '=', 'a.id')
 				->where('a.type_activity', 'task')
 				->where('a.bobot_planning', '>', 0)
+				->where('a.proyek_id', '=', $projectId)
 				->whereDate('a.start_date', '<=', $dt->format("Y-m-d"))
 				->whereDate('a.start_date', '>', $minSevenDays)
 				->select('a.bobot_planning', 'a.biaya_actual', 'a.duration', 'a.persentase_progress', 'a.id')