Browse Source

Merge pull request 'bug fix' (#168) from dev-ardhi into staging

Reviewed-on: ordo/adw-backend#168
pull/3/head
ibnu 1 year ago
parent
commit
7275503fb1
  1. 6
      app/Http/Controllers/MapMonitoringController.php

6
app/Http/Controllers/MapMonitoringController.php

@ -54,9 +54,9 @@ class MapMonitoringController extends Controller
$waypoint = DB::table('m_waypoint')->select('lat', 'lon', 'wptime')->where('user_id', $presensi->user_id)->orderBy('wptime', 'DESC')->first(); $waypoint = DB::table('m_waypoint')->select('lat', 'lon', 'wptime')->where('user_id', $presensi->user_id)->orderBy('wptime', 'DESC')->first();
$tmp[] = array( $tmp[] = array(
'user_id' => $presensi->user_id, 'user_id' => $presensi->user_id,
'wp_lat' => isset($waypoint) ? $waypoint->lat : '-', 'wp_lat' => isset($waypoint) ? $waypoint->lat : null,
'wp_lon' => isset($waypoint) ? $waypoint->lon : '-', 'wp_lon' => isset($waypoint) ? $waypoint->lon : null,
'wp_time' => isset($waypoint) ? $waypoint->wptime : '-', 'wp_time' => isset($waypoint) ? $waypoint->wptime : null,
'clock_in' => $presensi->clock_in, 'clock_in' => $presensi->clock_in,
'clock_out' => $presensi->clock_out, 'clock_out' => $presensi->clock_out,
'clock_in_lat' => $presensi->clock_in_lat, 'clock_in_lat' => $presensi->clock_in_lat,

Loading…
Cancel
Save