Merge pull request 'staging' (#170) from staging into master

Reviewed-on: ordo/adw-backend#170

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();
                 $tmp[] = array(
                     'user_id' => $presensi->user_id,
-                    'wp_lat' => isset($waypoint) ? $waypoint->lat : '-',
+                    'wp_lat' => isset($waypoint) ? $waypoint->lat : $presensi->clock_in_lat,
-                    'wp_lon' => isset($waypoint) ? $waypoint->lon : '-',
+                    'wp_lon' => isset($waypoint) ? $waypoint->lon : $presensi->clock_in_lng,
-                    'wp_time' => isset($waypoint) ? $waypoint->wptime : '-',
+                    'wp_time' => isset($waypoint) ? $waypoint->wptime : $presensi->clock_in,
                     'clock_in' => $presensi->clock_in,
                     'clock_out' => $presensi->clock_out,
                     'clock_in_lat' => $presensi->clock_in_lat,