Merge branch 'staging' of https://git.oslog.id/ordo/adw-backend into Dev-Farhan

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')

app/Http/Controllers/PresenceController.php

@@ -135,13 +135,23 @@ class PresenceController extends Controller
         $checkLocation = $this->checkLocation($request);
         $statusBoundary = false;
         $date = date_create($request->time);
+        $statusRestriction = HumanResource::select('status_boundary')->where('id', $request->user_id)->first();
         // assign and in boundary
-        if(count($checkLocation) > 0 && $checkLocation[0]['boundary']){
-            $statusBoundary = true;
+        if (count($checkLocation) > 0 && $statusRestriction->status_boundary == true)
+        {
+            if ($checkLocation[0]['boundary'] == true)
+            {
+                $statusBoundary = true;
+            } else {
+                $statusBoundary = false;
+            }
         }
-        $statusRestriction = HumanResource::select('status_boundary')->where('id', $request->user_id)->first();
-        if (!$statusRestriction->status_boundary) {
-            $statusBoundary = true;
+        // assign and not in boundary or in boundary
+        else {
+            if ($checkLocation[0]['boundary'] == true || $checkLocation[0]['boundary'] == false)
+            {
+                $statusBoundary = true;
+            }
         }
         // not assign
         if(!$checkLocation[0]['status_assign'] && $checkLocation[0]['boundary'] == false && $statusBoundary == false){