Merge pull request 'dev-wahyun' (#192) from dev-wahyun into staging

Reviewed-on: ordo/adw-backend#192

app/Http/Controllers/DivisiController.php

@@ -92,7 +92,7 @@ class DivisiController extends Controller
 
 	public function list()
 	{
-		$parentMenus = Divisi::with('children')->whereNull('parent')->get();
+		$parentMenus = Divisi::whereNull('parent')->with('children')->get();
 		$divisions = [];
 		foreach($parentMenus as $menu){
 			$childs = $this->getAllChildren($menu);

app/Http/Controllers/ProjectController.php

@@ -77,7 +77,7 @@ class ProjectController extends Controller
         $result = Project::query()
             ->from('m_proyek AS mp')
             ->where('mp.id', $id)
-            ->selectRaw('kode_sortname,jumlah_stakeholder,nama,mulai_proyek,akhir_proyek,area_kerja,lokasi_kantor,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')