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

Merge pull request 'add company_id' (#33) from dev-wahyun into staging 

Reviewed-on: ibnu/generic-ospro-backend#33
pull/1/head
farhantock 10 months ago
parent
08ad35fac1 ad7f148f37
commit
45da8fd80c
4 changed files with 129 additions and 125 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. 5
      app/Http/Controllers/HumanResourceController.php
  2. 5
      app/Http/Controllers/ProjectController.php
  3. 241
      app/Http/Controllers/ProjectRoleController.php
  4. 3
      app/Http/Controllers/RoleController.php

5
app/Http/Controllers/HumanResourceController.php
Unescape View File

@ -16,7 +16,8 @@ class HumanResourceController extends Controller
'role_id' => 'required', 'role_id' => 'required',
'name' => 'required', 'name' => 'required',
'ktp_number' => 'required|numeric|unique:m_users,ktp_number', 'ktp_number' => 'required|numeric|unique:m_users,ktp_number',
'employee_type' => 'required' 'employee_type' => 'required',
'company_id' => 'required'
]); ]);
$data = $request->all(); $data = $request->all();
@ -118,7 +119,7 @@ class HumanResourceController extends Controller
public function list() public function list()
{ {
$data = HumanResource::select('id', 'name', 'role_id')->get(); $data = HumanResource::select('id', 'name', 'role_id','company_id')->get();
$countData = $data->count(); $countData = $data->count();
if ($data) { if ($data) {

5
app/Http/Controllers/ProjectController.php
Unescape View File

@ -53,7 +53,8 @@ class ProjectController extends Controller
'mulai_proyek' => 'required', 'mulai_proyek' => 'required',
'akhir_proyek' => 'required', 'akhir_proyek' => 'required',
'rencana_biaya' => 'required', 'rencana_biaya' => 'required',
'type_proyek_id' => 'required' 'type_proyek_id' => 'required',
'company_id' => 'required'
]); ]);
$data = $request->all(); $data = $request->all();
@ -83,7 +84,7 @@ class ProjectController extends Controller
$result = Project::query() $result = Project::query()
->from('m_proyek AS mp') ->from('m_proyek AS mp')
->where('mp.id', $id) ->where('mp.id', $id)
->selectRaw('value_proyek,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status'); ->selectRaw('value_proyek,mp.company_id,scoupe_of_work,kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,rencana_biaya,biaya_actual,company,pm_id,type_proyek_id,divisi_id,persentase_progress,keterangan,durasi_proyek,progress_by_worklog,currency_symbol,late_consequence,assumtion,currency_code,currency_name,project_objectives,considered_success_when,potential_risk,testing_environment,budget_health,phase_id,calculation_status');
if (!is_null($result->first()['divisi_id'])) { if (!is_null($result->first()['divisi_id'])) {
$result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id') $result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id')

241
app/Http/Controllers/ProjectRoleController.php
Unescape View File

@ -1,120 +1,121 @@
<?php <?php
namespace App\Http\Controllers; namespace App\Http\Controllers;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Models\ProjectRole; use App\Models\ProjectRole;
class ProjectRoleController extends Controller class ProjectRoleController extends Controller
{ {
public function add(Request $request) public function add(Request $request)
{ {
$this->validate($request, [ $this->validate($request, [
'name' => 'required', 'name' => 'required',
'description' => 'required' 'description' => 'required',
]); 'company_id' => 'required'
]);
$data = $request->all();
$data = $request->all();
$data['created_by'] = $this->currentName;
$data['created_by'] = $this->currentName;
$result = ProjectRole::create($data);
$result = ProjectRole::create($data);
if($result){
return response()->json(['status'=>'success','message'=>'add data project role successfully!','code'=>200], 200); if($result){
}else{ return response()->json(['status'=>'success','message'=>'add data project role successfully!','code'=>200], 200);
return response()->json(['status'=>'failed','message'=>'add data project role failed!','code'=>400], 400); }else{
} return response()->json(['status'=>'failed','message'=>'add data project role failed!','code'=>400], 400);
} }
}
public function edit($id){
if(!$id || (int) $id < 0 || $id==""){ public function edit($id){
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400); if(!$id || (int) $id < 0 || $id==""){
die(); return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
} die();
}
$result = ProjectRole::find($id);
$result = ProjectRole::find($id);
if($result){
return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200); if($result){
}else{ return response()->json(['status'=>'success','code'=>200,'data'=>$result], 200);
return response()->json(['status'=>'failed','message'=>'failed get data project role, please try again later!','code'=>400], 400); }else{
} return response()->json(['status'=>'failed','message'=>'failed get data project role, 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==""){ {
return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400); if(!$id || (int) $id < 0 || $id==""){
} return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
}
$data = ProjectRole::find($id);
$data = ProjectRole::find($id);
if($data){
$result = $data->update($request->all()); if($data){
}else{ $result = $data->update($request->all());
return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400); }else{
die(); return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
} die();
}
if($result){
return response()->json(['status'=>'success','message'=>'data project role successfully updated!','code'=>200], 200); if($result){
}else{ return response()->json(['status'=>'success','message'=>'data project role successfully updated!','code'=>200], 200);
return response()->json(['status'=>'failed','message'=>'data project role failed updated!','code'=>400], 400); }else{
} return response()->json(['status'=>'failed','message'=>'data project role failed updated!','code'=>400], 400);
} }
}
public function delete($id)
{ public function delete($id)
$data = ProjectRole::find($id); {
$data = ProjectRole::find($id);
if($data){
$delete = $data->delete(); if($data){
}else{ $delete = $data->delete();
return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400); }else{
die(); return response()->json(['status'=>'failed','message'=>'data project role not found!','code'=>400], 400);
} die();
}
if($delete){
return response()->json(['status'=>'success','message'=>'data project role successfully deleted!','code'=>200], 200); if($delete){
}else{ return response()->json(['status'=>'success','message'=>'data project role successfully deleted!','code'=>200], 200);
return response()->json(['status'=>'failed','message'=>'data project role failed deleted!','code'=>400], 400); }else{
} return response()->json(['status'=>'failed','message'=>'data project role failed deleted!','code'=>400], 400);
} }
}
public function search(Request $request)
{ public function search(Request $request)
$payload = $request->all(); {
$dataBuilder = $this->setUpPayload($payload, 'm_role_proyek'); $payload = $request->all();
$builder = $dataBuilder['builder']; $dataBuilder = $this->setUpPayload($payload, 'm_role_proyek');
$countBuilder = $dataBuilder['count']; $builder = $dataBuilder['builder'];
$dataGet = $builder->get(); $countBuilder = $dataBuilder['count'];
$totalRecord = $countBuilder->count(); $dataGet = $builder->get();
return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200); $totalRecord = $countBuilder->count();
} return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
}
public function list()
{ public function list()
$data = ProjectRole::all(); {
$countData = $data->count(); $data = ProjectRole::all();
$countData = $data->count();
if($data){
return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200); if($data){
}else{ return response()->json(['status'=>'success','code'=>200,'data'=>$data, 'totalRecord'=>$countData], 200);
return response()->json(['status'=>'failed','message'=>'failed get list project role, please try again later!','code'=>400], 400); }else{
} return response()->json(['status'=>'failed','message'=>'failed get list project role, please try again later!','code'=>400], 400);
} }
}
public function select(Request $request){
$search = $request->query('search'); public function select(Request $request){
if($search && !empty($search)){ $search = $request->query('search');
$data = ProjectRole::where("name", 'like', '%'.$search.'%')->get(); if($search && !empty($search)){
}else{ $data = ProjectRole::where("name", 'like', '%'.$search.'%')->get();
$data = ProjectRole::all(); }else{
} $data = ProjectRole::all();
}
return response()->json($data);
} return response()->json($data);
} }
}

3
app/Http/Controllers/RoleController.php
Unescape View File

@ -12,7 +12,8 @@ class RoleController extends Controller
{ {
$this->validate($request, [ $this->validate($request, [
'name' => 'string|required|unique:m_roles,name,NULL,id,company_id,' . $request->input('company_id'), 'name' => 'string|required|unique:m_roles,name,NULL,id,company_id,' . $request->input('company_id'),
'description' => 'required' 'description' => 'required',
'company_id' => 'required'
]); ]);
$data = $request->all(); $data = $request->all();

Write Preview
Loading…
Cancel
Save