|
|
|
@ -35,15 +35,9 @@ class MapMonitoringController extends Controller
|
|
|
|
|
'tcio.clock_out', |
|
|
|
|
'tcio.clock_in_lat', |
|
|
|
|
'tcio.clock_in_lng', |
|
|
|
|
'tcio.clock_out_lat', |
|
|
|
|
'tcio.clock_out_lng', |
|
|
|
|
'tcio.clock_in_loc', |
|
|
|
|
'tcio.clock_out_loc', |
|
|
|
|
'tcio.clock_in_boundary', |
|
|
|
|
'tcio.clock_out_boundary', |
|
|
|
|
'mu.username', |
|
|
|
|
'tcio.date_presence', |
|
|
|
|
'tcio.created_at' |
|
|
|
|
) |
|
|
|
|
->join('m_users as mu', 'mu.id', '=', 'tcio.user_id') |
|
|
|
|
->where('mu.id', $key->user_id) |
|
|
|
@ -61,19 +55,12 @@ class MapMonitoringController extends Controller
|
|
|
|
|
'user_id' => $presensi->user_id, |
|
|
|
|
'clock_in' => $presensi->clock_in, |
|
|
|
|
'clock_out' => $presensi->clock_out, |
|
|
|
|
'date_presence' => $presensi->date_presence, |
|
|
|
|
'clock_in_lat' => $presensi->clock_in_lat, |
|
|
|
|
'clock_in_lng' => $presensi->clock_in_lng, |
|
|
|
|
'clock_out_lat' => $presensi->clock_out_lat, |
|
|
|
|
'clock_out_lng' => $presensi->clock_out_lng, |
|
|
|
|
'clock_in_loc' => $presensi->clock_in_loc, |
|
|
|
|
'clock_out_loc' => $presensi->clock_out_loc, |
|
|
|
|
'clock_in_boundary' => $presensi->clock_in_boundary, |
|
|
|
|
'clock_out_boundary' => $presensi->clock_out_boundary, |
|
|
|
|
'username' => $presensi->username, |
|
|
|
|
'name' => $presensi->fullname, |
|
|
|
|
'image_selfie' => isset($image->image) ? $image->image : '-', |
|
|
|
|
'created_at' => $presensi->created_at, |
|
|
|
|
'presence_status' => $presensi->date_presence == $dateNow ? true : false, //true, //status date_presence, |
|
|
|
|
'projects' => $project |
|
|
|
|
); |
|
|
|
|