ordo
/
surveyor_indonesia_backend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

fix endline

pull/3/head
wahyu 1 year ago
parent
0c487fc05b
commit
c603efb1a6
1 changed files with 270 additions and 270 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 540
      app/Http/Controllers/ReportActivityController.php

540
app/Http/Controllers/ReportActivityController.php
Unescape View File

@ -1,270 +1,270 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\ReportActivity; use App\Models\ReportActivity;
use App\Models\Activity; use App\Models\Activity;
use App\Models\Image; use App\Models\Image;
use Datatables; use Datatables;
class ReportActivityController extends Controller class ReportActivityController extends Controller
{ {
public function add(Request $request) public function add(Request $request)
{ {
if($request->has('gantt')){ if($request->has('gantt')){
$this->validate($request, [ $this->validate($request, [
'activity_id' => 'required', 'activity_id' => 'required',
'user_id' => 'required', 'user_id' => 'required',
'report_date' => 'required', 'report_date' => 'required',
'job_count_report' => 'required' 'job_count_report' => 'required'
]); ]);
}else{ }else{
$this->validate($request, [ $this->validate($request, [
'activity_id' => 'required', 'activity_id' => 'required',
'user_id' => 'required', 'user_id' => 'required',
'report_date' => 'required', 'report_date' => 'required',
'job_count_report' => 'required', 'job_count_report' => 'required',
'lat' => 'required', 'lat' => 'required',
'lon' => 'required', 'lon' => 'required',
]); ]);
} }
$data = $request->all(); $data = $request->all();
$data['created_by'] = $this->currentName; $data['created_by'] = $this->currentName;
$result = ReportActivity::create($data); $result = ReportActivity::create($data);
if($result){ if($result){
$this->countForProgress($request->activity_id); $this->countForProgress($request->activity_id);
if($request->hasFile("files")){ if($request->hasFile("files")){
$this->uploadImage($request->file('files'), $result->id); $this->uploadImage($request->file('files'), $result->id);
} }
return response()->json(['status'=>'success','message'=>'add report activity, update progress activity successfully!','code'=>200,'last_inserted_id'=>$result->id], 200); return response()->json(['status'=>'success','message'=>'add report activity, update progress activity successfully!','code'=>200,'last_inserted_id'=>$result->id], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'add report activity failed!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'add report activity failed!','code'=>400], 400);
} }
} }
private function uploadImage($files, $ref_id) private function uploadImage($files, $ref_id)
{ {
$dokumen = $files; $dokumen = $files;
$extension = $dokumen->extension(); $extension = $dokumen->extension();
$name = $ref_id.date("YmdHis").".".$extension; $name = $ref_id.date("YmdHis").".".$extension;
$resultMove = $dokumen->move($this->pathImage, $name); $resultMove = $dokumen->move($this->pathImage, $name);
if($resultMove){ if($resultMove){
$data = [ $data = [
'ref_id' => (int)$ref_id, 'ref_id' => (int)$ref_id,
'image' => $name, 'image' => $name,
'category' => "report_activity" 'category' => "report_activity"
]; ];
$result = Image::create($data); $result = Image::create($data);
if($result){ if($result){
return true; return true;
} }
} }
} }
public function edit($id){ public function edit($id){
if(!$id || (int) $id < 0 || $id==""){ if(!$id || (int) $id < 0 || $id==""){
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
die(); die();
} }
$result = ReportActivity::select("report_activity.*", "u.name as user_name")->where("report_activity.id", $id)->join("m_users as u", "u.id", "=", "report_activity.user_id")->first(); $result = ReportActivity::select("report_activity.*", "u.name as user_name")->where("report_activity.id", $id)->join("m_users as u", "u.id", "=", "report_activity.user_id")->first();
if($result){ if($result){
return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200); return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'failed get data report activity, please try again later!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'failed get data report activity, please try again later!','code'=>400], 400);
} }
} }
public function update(Request $request, $id) public function update(Request $request, $id)
{ {
if(!$id || (int) $id < 0 || $id==""){ if(!$id || (int) $id < 0 || $id==""){
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
} }
$data = ReportActivity::find($id); $data = ReportActivity::find($id);
if($data){ if($data){
$dataUpdate = $request->all(); $dataUpdate = $request->all();
$result = $data->update($dataUpdate); $result = $data->update($dataUpdate);
if($result){ if($result){
if($request->hasFile("files")){ if($request->hasFile("files")){
$this->updateImage($request->file('files'), $id); $this->updateImage($request->file('files'), $id);
} }
$this->countForProgress($data->activity_id); $this->countForProgress($data->activity_id);
return response()->json(['status'=>'success','message'=>'data report activity successfully updated!','code'=>200], 200); return response()->json(['status'=>'success','message'=>'data report activity successfully updated!','code'=>200], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'data report activity failed updated!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data report activity failed updated!','code'=>400], 400);
} }
}else{ }else{
return response()->json(['status'=>'failed','message'=>'data report activity not found!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data report activity not found!','code'=>400], 400);
die(); die();
} }
} }
public function updateImage($files, $ref_id) public function updateImage($files, $ref_id)
{ {
$image = Image::where("ref_id", $ref_id)->where("category", "report_activity")->first(); $image = Image::where("ref_id", $ref_id)->where("category", "report_activity")->first();
if($image){ if($image){
if(file_exists($this->pathImage.$image->image)){ if(file_exists($this->pathImage.$image->image)){
unlink($this->pathImage.$image->image); unlink($this->pathImage.$image->image);
} }
$image->delete(); $image->delete();
} }
$dokumen = $files; $dokumen = $files;
$extension = $dokumen->extension(); $extension = $dokumen->extension();
$name = $ref_id.date("YmdHis").".".$extension; $name = $ref_id.date("YmdHis").".".$extension;
$resultMove = $dokumen->move($this->pathImage, $name); $resultMove = $dokumen->move($this->pathImage, $name);
if($resultMove){ if($resultMove){
$data = [ $data = [
'ref_id' => (int)$ref_id, 'ref_id' => (int)$ref_id,
'image' => $name, 'image' => $name,
'category' => "report_activity" 'category' => "report_activity"
]; ];
$result = Image::create($data); $result = Image::create($data);
if($result){ if($result){
return true; return true;
} }
} }
} }
public function delete($id) public function delete($id)
{ {
$data = ReportActivity::find($id); $data = ReportActivity::find($id);
if($data){ if($data){
$delete = $data->delete(); $delete = $data->delete();
}else{ }else{
return response()->json(['status'=>'failed','message'=>'data report activity not found!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data report activity not found!','code'=>400], 400);
die(); die();
} }
if($delete){ if($delete){
$image = Image::where("ref_id", $id)->where("category", "report_activity")->first(); $image = Image::where("ref_id", $id)->where("category", "report_activity")->first();
if($image){ if($image){
if(file_exists($this->pathImage.$image->image)){ if(file_exists($this->pathImage.$image->image)){
unlink($this->pathImage.$image->image); unlink($this->pathImage.$image->image);
} }
$image->delete(); $image->delete();
} }
return response()->json(['status'=>'success','message'=>'data report activity successfully deleted!','code'=>200], 200); return response()->json(['status'=>'success','message'=>'data report activity successfully deleted!','code'=>200], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'data report activity failed deleted!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'data report activity failed deleted!','code'=>400], 400);
} }
} }
private function countForProgress($id) private function countForProgress($id)
{ {
$totalJobs = ReportActivity::where('activity_id', $id)->sum("job_count_report"); $totalJobs = ReportActivity::where('activity_id', $id)->sum("job_count_report");
$dataActivity = Activity::find($id); $dataActivity = Activity::find($id);
$jobsActivity = (int)$dataActivity->jumlah_pekerjaan; $jobsActivity = (int)$dataActivity->jumlah_pekerjaan;
if ($jobsActivity < 1) { if ($jobsActivity < 1) {
return false; return false;
} }
if ($totalJobs < 1) { if ($totalJobs < 1) {
return false; return false;
} }
$persentaseActual = ($totalJobs/$jobsActivity)*100; $persentaseActual = ($totalJobs/$jobsActivity)*100;
$dataUpdate = array( $dataUpdate = array(
"persentase_progress" => $persentaseActual, "persentase_progress" => $persentaseActual,
"updated_by" => $this->currentName "updated_by" => $this->currentName
); );
return $dataActivity->update($dataUpdate); return $dataActivity->update($dataUpdate);
} }
public function search(Request $request) public function search(Request $request)
{ {
$payload = $request->all(); $payload = $request->all();
$dataBuilder = $this->setUpPayload($payload, 'report_activity'); $dataBuilder = $this->setUpPayload($payload, 'report_activity');
$builder = $dataBuilder['builder']; $builder = $dataBuilder['builder'];
$countBuilder = $dataBuilder['count']; $countBuilder = $dataBuilder['count'];
$dataGet = $builder->get(); $dataGet = $builder->get();
$totalRecord = $countBuilder->count(); $totalRecord = $countBuilder->count();
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200); return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
} }
public function list() public function list()
{ {
$data = ReportActivity::all(); $data = ReportActivity::all();
$countData = $data->count(); $countData = $data->count();
if($data){ if($data){
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200); return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'failed get list report activity, please try again later!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'failed get list report activity, please try again later!','code'=>400], 400);
} }
} }
public function searchPoint(Request $request) { public function searchPoint(Request $request) {
$dataPayload = $request->all(); $dataPayload = $request->all();
$reqActivityId = []; $reqActivityId = [];
foreach ($dataPayload['project_id'] as $val) { foreach ($dataPayload['project_id'] as $val) {
$reqActivityId[] = $this->getActivityByProjectId($val); $reqActivityId[] = $this->getActivityByProjectId($val);
} }
$activity_id = []; $activity_id = [];
$getPoints = false; $getPoints = false;
if (count($reqActivityId) > 0) { if (count($reqActivityId) > 0) {
for ($i=0; $i < count($reqActivityId); $i++) { for ($i=0; $i < count($reqActivityId); $i++) {
if (count($reqActivityId[$i]) > 0) { if (count($reqActivityId[$i]) > 0) {
foreach($reqActivityId[$i] as $reqAct) { foreach($reqActivityId[$i] as $reqAct) {
array_push($activity_id, $reqAct->id); array_push($activity_id, $reqAct->id);
} }
} }
} }
} }
if (count($activity_id) > 0) { if (count($activity_id) > 0) {
$getPoints = ReportActivity::select('report_activity.*', 'm_activity.name as activity_name', 'm_activity.jumlah_pekerjaan', 'm_proyek.nama as proyek_name') $getPoints = ReportActivity::select('report_activity.*', 'm_activity.name as activity_name', 'm_activity.jumlah_pekerjaan', 'm_proyek.nama as proyek_name')
->leftJoin('m_activity', 'm_activity.id', '=', 'report_activity.activity_id') ->leftJoin('m_activity', 'm_activity.id', '=', 'report_activity.activity_id')
->leftJoin('m_proyek', 'm_proyek.id', '=', 'm_activity.proyek_id') ->leftJoin('m_proyek', 'm_proyek.id', '=', 'm_activity.proyek_id')
->whereIn('report_activity.activity_id', $activity_id)->get(); ->whereIn('report_activity.activity_id', $activity_id)->get();
} }
if($getPoints){ if($getPoints){
return response()->json(['status'=>'success','code'=>200,'data'=>$getPoints, 'totalRecord'=>count($getPoints)], 200); return response()->json(['status'=>'success','code'=>200,'data'=>$getPoints, 'totalRecord'=>count($getPoints)], 200);
}else{ }else{
return response()->json(['status'=>'failed','message'=>'failed get list points, please try again later!','code'=>400], 400); return response()->json(['status'=>'failed','message'=>'failed get list points, please try again later!','code'=>400], 400);
} }
} }
public function getActivityByProjectId($projectId) { public function getActivityByProjectId($projectId) {
$data = Activity::select('id')->where('proyek_id', $projectId)->get(); $data = Activity::select('id')->where('proyek_id', $projectId)->get();
return $data; return $data;
} }
public function datatables(Request $request){ public function datatables(Request $request){
$id_activity = $request->query('idact'); $id_activity = $request->query('idact');
$data = ReportActivity::select("report_activity.*", "u.name as user_name") $data = ReportActivity::select("report_activity.*", "u.name as user_name")
->join("m_users as u", "u.id", "=", "report_activity.user_id") ->join("m_users as u", "u.id", "=", "report_activity.user_id")
->where('report_activity.activity_id', $id_activity) ->where('report_activity.activity_id', $id_activity)
->get(); ->get();
return Datatables::of($data) return Datatables::of($data)
->addIndexColumn() ->addIndexColumn()
->addColumn('action', function($row){ ->addColumn('action', function($row){
$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn_report_delete"><i class="fa fa-trash"></i></a>'; $actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn_report_delete"><i class="fa fa-trash"></i></a>';
$actionBtn .= ' <a href="javascript:void(0)" data-id="'.$row->id.'" class="edit btn btn-primary btn-sm btn_report_edit"><i class="fa fa-edit"></i></a>'; $actionBtn .= ' <a href="javascript:void(0)" data-id="'.$row->id.'" class="edit btn btn-primary btn-sm btn_report_edit"><i class="fa fa-edit"></i></a>';
return $actionBtn; return $actionBtn;
}) })
->editColumn('report_date', function($row) { ->editColumn('report_date', function($row) {
$date = date_create($row->report_date); $date = date_create($row->report_date);
return date_format($date,"d-m-Y H:i:s"); return date_format($date,"d-m-Y H:i:s");
}) })
->rawColumns(['action'])->make(true); ->rawColumns(['action'])->make(true);
} }
} }

Write Preview
Loading…
Cancel
Save