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

Reviewed-on: ordo/adw-backend#299

app/Http/Controllers/ProjectController.php

@@ -80,18 +80,24 @@ class ProjectController extends Controller
         if (empty($id) || !is_int((int)$id))
             return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
-        $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,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'])) {
+
-            $result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id')
+        // if (!is_null($result->first()['divisi_id'])) {
-            ->addSelect(DB::raw('m_divisi.name AS nama_divisi'));
+        //     $result->leftJoin('m_divisi', 'mp.divisi_id', '=', 'm_divisi.id')
-        }
+        //     ->addSelect(DB::raw('m_divisi.name AS nama_divisi'));
-
+        // }
-        $result = $result->first();
+		$result = Project::select('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','md.name as divisi_name', 'nickname')
+							->join('m_divisi as md','md.id', '=', 'm_proyek.divisi_id')
+							->where('m_proyek.id', $id)
+							->first();
 		if(!$result)
 			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);