|
|
@ -254,6 +254,7 @@ class PresenceController extends Controller |
|
|
|
$geom = DB::table("assign_hr_to_activity as ahta")->select("ma.geom", "ma.id") |
|
|
|
$geom = DB::table("assign_hr_to_activity as ahta")->select("ma.geom", "ma.id") |
|
|
|
->join("m_activity as ma", "ma.id", "=", "ahta.activity_id") |
|
|
|
->join("m_activity as ma", "ma.id", "=", "ahta.activity_id") |
|
|
|
->where("ahta.user_id", $params->user_id) |
|
|
|
->where("ahta.user_id", $params->user_id) |
|
|
|
|
|
|
|
->whereNotNull("ma.geom") |
|
|
|
->whereDate("ma.start_date", "<=", $params->time) |
|
|
|
->whereDate("ma.start_date", "<=", $params->time) |
|
|
|
->whereDate("ma.end_date", ">=", $params->time) |
|
|
|
->whereDate("ma.end_date", ">=", $params->time) |
|
|
|
->get(); |
|
|
|
->get(); |
|
|
|