|
|
|
@ -19,11 +19,6 @@ class PresenceController extends Controller
|
|
|
|
|
'user_id' => 'required' |
|
|
|
|
]); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// $test = $this->getLoc($request->clock_in_lat, $request->clock_in_lng)->display_name; |
|
|
|
|
// // display_name |
|
|
|
|
// return response()->json(["data"=>$test,'code'=>400], 400); |
|
|
|
|
|
|
|
|
|
$checkLocation = $this->checkLocation($request); |
|
|
|
|
$statusBoundary = false; |
|
|
|
|
$date = date_create($request->clock_time); |
|
|
|
@ -276,14 +271,6 @@ class PresenceController extends Controller
|
|
|
|
|
$builder = $dataBuilder['builder']; |
|
|
|
|
$countBuilder = $dataBuilder['count']; |
|
|
|
|
$dataGet = $builder->get(); |
|
|
|
|
$finalData = []; |
|
|
|
|
|
|
|
|
|
foreach($dataGet as $data){ |
|
|
|
|
// $responseIn = $this->getLoc($clock_in_lat, $clock_in_lng); |
|
|
|
|
// $responseOut = $this->getLoc($clock_in_lat, $clock_in_lng); |
|
|
|
|
$data->clock_in_loc = $responseIn->json()["display_name"]; |
|
|
|
|
$data->clock_out_loc = $responseOut->json()["display_name"]; |
|
|
|
|
} |
|
|
|
|
$totalRecord = $countBuilder->count(); |
|
|
|
|
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200); |
|
|
|
|
} |
|
|
|
@ -311,16 +298,15 @@ class PresenceController extends Controller
|
|
|
|
|
$clock_in_lng = $objRow->clock_in_lng; |
|
|
|
|
$objRow->clock_in_loc = ""; |
|
|
|
|
if (isset($clock_in_lat) && isset($clock_in_lng)) { |
|
|
|
|
$response = Http::get(config('api.nominatim') . "/reverse?lat=".$clock_in_lat."&lon=".$clock_in_lng."&format=json"); |
|
|
|
|
$objRow->clock_in_loc = $response->json()["display_name"]; |
|
|
|
|
$objRow->clock_in_loc = $this->getLoc($clock_in_lat, $clock_in_lng)->display_name; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
$clock_out_lat = $objRow->clock_out_lat; |
|
|
|
|
$clock_out_lng = $objRow->clock_out_lng; |
|
|
|
|
$objRow->clock_out_loc = ""; |
|
|
|
|
if (isset($clock_out_lat) && isset($clock_out_lng)) { |
|
|
|
|
$response = Http::get(config('api.nominatim') . "/reverse?lat=".$clock_out_lat."&lon=".$clock_out_lng."&format=json"); |
|
|
|
|
$objRow->clock_out_loc = $response->json()["display_name"]; |
|
|
|
|
if (isset($clock_out_lat) && isset($clock_out_lng) && $clock_out_lng != null) { |
|
|
|
|
$locAddress = $this->getLoc($clock_out_lat, $clock_out_lng); |
|
|
|
|
$objRow->clock_out_loc = isset($locAddress->display_name) ? $locAddress->display_name : "-"; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -328,5 +314,6 @@ class PresenceController extends Controller
|
|
|
|
|
$presence->clock_out_loc = $objRow->clock_out_loc; |
|
|
|
|
$presence->save(); |
|
|
|
|
} |
|
|
|
|
return response()->json(['status'=>'success','message'=>'success update!','code'=>200], 200); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|