diff --git a/app/Http/Controllers/PresenceController.php b/app/Http/Controllers/PresenceController.php index a472138..0e844d0 100644 --- a/app/Http/Controllers/PresenceController.php +++ b/app/Http/Controllers/PresenceController.php @@ -44,82 +44,82 @@ class PresenceController extends Controller return response()->json(['status'=>'failed', 'data'=>$data, 'message'=>'Tidak dapat melakukan presensi. Anda berada di luar area kerja.','code'=>200], 200); } - // if($request->type=="out"){ - // $clock_out_loc = $this->getLoc($request->clock_out_lat, $request->clock_out_lng)->display_name; - // $dataUpdate = array( - // "clock_out"=>$request->clock_time, - // "clock_out_lat" => $request->clock_out_lat, - // "clock_out_lng" => $request->clock_out_lng, - // "updated_by"=>$this->currentName, - // "clock_out_loc" => $clock_out_loc, - // "clock_out_boundary" => $statusBoundary - // ); + if($request->type=="out"){ + $clock_out_loc = $this->getLoc($request->clock_out_lat, $request->clock_out_lng)->display_name; + $dataUpdate = array( + "clock_out"=>$request->clock_time, + "clock_out_lat" => $request->clock_out_lat, + "clock_out_lng" => $request->clock_out_lng, + "updated_by"=>$this->currentName, + "clock_out_loc" => $clock_out_loc, + "clock_out_boundary" => $statusBoundary + ); - // $resultUpdate = $this->updateFormAdd($dataUpdate, $request->user_id); - // if($resultUpdate && $resultUpdate > 0){ - // if($statusBoundary){ - // for ($i=0; $i < count($checkLocation); $i++) { - // # code... - // DB::table('clock_in_out_boundary')->insert([ - // "clock_in_out_id" => $resultUpdate, - // "user_id" => $request->user_id, - // "activity_id" => $checkLocation[$i]['activity_id'], - // "type" => $request->type, - // "created_at" => $date, - // "created_by" => $this->currentName - // ]); - // }; - // }; - // $data=array( - // 'id' => $resultUpdate, - // 'boundary' => $statusBoundary - // ); + $resultUpdate = $this->updateFormAdd($dataUpdate, $request->user_id); + if($resultUpdate && $resultUpdate > 0){ + if($statusBoundary){ + for ($i=0; $i < count($checkLocation); $i++) { + # code... + DB::table('clock_in_out_boundary')->insert([ + "clock_in_out_id" => $resultUpdate, + "user_id" => $request->user_id, + "activity_id" => $checkLocation[$i]['activity_id'], + "type" => $request->type, + "created_at" => $date, + "created_by" => $this->currentName + ]); + }; + }; + $data=array( + 'id' => $resultUpdate, + 'boundary' => $statusBoundary + ); - // return response()->json(['status'=>'success', 'data'=>$data,'message'=>'clock out success!','code'=>200], 200); - // } - // else{ - // return response()->json(['status'=>'failed','message'=>'clock out failed please try again!','code'=>400], 400); - // } - // die(); - // } + return response()->json(['status'=>'success', 'data'=>$data,'message'=>'clock out success!','code'=>200], 200); + } + else{ + return response()->json(['status'=>'failed','message'=>'clock out failed please try again!','code'=>400], 400); + } + die(); + } - // $onlyDate = date_format($date,"Y-m-d"); - // $clock_in_loc = $this->getLoc($request->clock_in_lat, $request->clock_in_lng)->display_name; + $onlyDate = date_format($date,"Y-m-d"); + $clock_in_loc = $this->getLoc($request->clock_in_lat, $request->clock_in_lng)->display_name; - // $dataAdd = array( - // 'user_id'=> $request->user_id, - // 'clock_in'=> $request->clock_time, - // 'date_presence'=> $onlyDate, - // 'created_by' => $this->currentName, - // 'clock_in_lat' => $request->clock_in_lat, - // 'clock_in_lng' => $request->clock_in_lng, - // 'clock_in_loc' => $clock_in_loc, - // 'clock_in_boundary' => $statusBoundary - // ); + $dataAdd = array( + 'user_id'=> $request->user_id, + 'clock_in'=> $request->clock_time, + 'date_presence'=> $onlyDate, + 'created_by' => $this->currentName, + 'clock_in_lat' => $request->clock_in_lat, + 'clock_in_lng' => $request->clock_in_lng, + 'clock_in_loc' => $clock_in_loc, + 'clock_in_boundary' => $statusBoundary + ); - // $result = Presence::create($dataAdd); - // $data=array( - // 'id' => $result->id, - // 'boundary' => $statusBoundary - // ); - // if($result){ - // if($statusBoundary){ - // for ($i=0; $i < count($checkLocation); $i++) { - // # code... - // DB::table('clock_in_out_boundary')->insert([ - // "clock_in_out_id" => $result->id, - // "user_id" => $request->user_id, - // "activity_id" => $checkLocation[$i]['activity_id'], - // "type" => $request->type, - // "created_at" => $date, - // "created_by" => $this->currentName - // ]); - // }; - // }; - // return response()->json(['status'=>'success', 'data' => $data,'message'=>'clock in successfully!','code'=>200], 200); - // }else{ - // return response()->json(['status'=>'failed','message'=>'clock in failed!','code'=>400], 400); - // } + $result = Presence::create($dataAdd); + $data=array( + 'id' => $result->id, + 'boundary' => $statusBoundary + ); + if($result){ + if($statusBoundary){ + for ($i=0; $i < count($checkLocation); $i++) { + # code... + DB::table('clock_in_out_boundary')->insert([ + "clock_in_out_id" => $result->id, + "user_id" => $request->user_id, + "activity_id" => $checkLocation[$i]['activity_id'], + "type" => $request->type, + "created_at" => $date, + "created_by" => $this->currentName + ]); + }; + }; + return response()->json(['status'=>'success', 'data' => $data,'message'=>'clock in successfully!','code'=>200], 200); + }else{ + return response()->json(['status'=>'failed','message'=>'clock in failed!','code'=>400], 400); + } } private function checkLocation($params){