diff --git a/app/Http/Controllers/PresenceController.php b/app/Http/Controllers/PresenceController.php index 400c812..c772c82 100644 --- a/app/Http/Controllers/PresenceController.php +++ b/app/Http/Controllers/PresenceController.php @@ -254,6 +254,7 @@ class PresenceController extends Controller $geom = DB::table("assign_hr_to_activity as ahta")->select("ma.geom", "ma.id") ->join("m_activity as ma", "ma.id", "=", "ahta.activity_id") ->where("ahta.user_id", $params->user_id) + ->whereNotNull("ma.geom") ->whereDate("ma.start_date", "<=", $params->time) ->whereDate("ma.end_date", ">=", $params->time) ->get();