Merge pull request 'dev-wahyu' (#187) from dev-wahyu into staging

Reviewed-on: ordo/adw-backend#187

app/Http/Controllers/AssignMaterialController.php

@@ -69,6 +69,12 @@ class AssignMaterialController extends Controller
 	public function delete($id)
 	{
 		$data = AssignMaterial::where('id', $id)->first();
+        $reports = ReportActivityMaterial::where('assign_material_id', $data->id)->get();
+        if (isset($reports)) {
+			foreach ($reports as $report) {
+				$report->delete();
+			}
+        }
 
 		if($data->delete())
 			return response()->json(['status'=>'success','message'=>'Data deleted!','code'=> 200], 200);

app/Http/Controllers/DivisiController.php

@@ -86,7 +86,8 @@ class DivisiController extends Controller
         $dataGet = $builder->get();
         $totalRecord = $countBuilder->count();
         return response()->json(['status'=>'success','code'=>200,'data'=>$dataGet, 'totalRecord'=>$totalRecord], 200);
-
+		//return $this->list();
+		// cant use builder for this case
 	}
 
 	public function list()

app/Http/Controllers/ProjectController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers;
 
+use DateTime;
 use App\Models\Link;
 use App\Models\User;
 use App\Models\Image;
@@ -366,7 +367,16 @@ class ProjectController extends Controller
 	}
 
 	public static function setSyncDate($activity_id, $activity, $report) {
-		$status = AssignMaterial::select('status_activity')->where('activity_id', $activity_id)->first();
+		$status = AssignMaterial::where('activity_id', $activity_id)->first();
+		if (!isset($status)) {
+			$reports = array(
+				'activity_id' => $activity_id,
+				'min_date' => new DateTime($activity->start_date),
+				'max_date' => new DateTime($activity->end_date),
+				'status' => 'open'
+			);
+			return $reports;
+		}
 		if (!isset($status->status_activity)) {
 			$status->status_activity = 'open';
 		}
@@ -406,7 +416,6 @@ class ProjectController extends Controller
 				$firstReport = ReportActivityMaterial::where('activity_id', $activity_id)->orderBy('report_date')->first();
 				$reports[] = ProjectController::setSyncDate($activity_id, $activity, $firstReport);
 			}
-			$activity->reports = $reports;
 		}
 		/* return response()->json(['status'=>'success','data'=> $reports,'code'=>200], 200); */
 		/* return response()->json(['status'=>'success','data'=> $activities,'code'=>200], 200); */
@@ -429,6 +438,18 @@ class ProjectController extends Controller
 			$activity->save();
 		}
 
+		foreach($activities as $activity) {
+			$successor = Link::where('t_activity_id', $activity->id)->first();
+			if ($successor) {
+				$predecessor = Activity::find($successor->s_activity_id);
+				$activity->start_date = $predecessor->end_date;
+				$end_date = new DateTime($activity->start_date);
+				$end_date->modify("+" . $activity->duration . " days");
+				$activity->end_date = $end_date->format("Y-m-d H:i:sO");
+			}
+			$activity->save();
+		}
+
 		return response()->json(['status'=>'success','message'=>'Synchronize to report success!','code'=>200], 200);
 	}
 
@@ -476,7 +497,7 @@ class ProjectController extends Controller
 
         return response()->json(['status' => 'success', 'code' => 200, 'data' => $userProyek, 'totalRecord' => $totalRecord], 200);
     }
-  public function detail($id){
+  public function detail(Request $request, $id, $gantt_id = null, $s_curve = null){
 		if(empty($id) || !is_int((int)$id))
 			return response()->json(['status'=>'failed','message'=>'id is required!','code'=>400], 400);
 
@@ -484,37 +505,49 @@ class ProjectController extends Controller
 
 		if(!$result)
 			return response()->json(['status'=>'failed','message'=> 'Data not found!','code'=> 404], 404);
-
+        if (!isset($gantt_id)) {
             $gantt = MasterFunctionsHelper::getLatestGantt($id);
-		$result->projectManager = User::where('id', $result->pm_id)->value('name');
-		$result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->where("version_gantt_id", $gantt['last_gantt_id'])->first();
-        // dd($result->header->start_date);
             $ganttId = $gantt['last_gantt_id'];
+        } else {
+            $ganttId = $gantt_id;
+        }
+		$result->projectManager = User::where('id', $result->pm_id)->value('name');
 
+        if (isset($s_curve)) {
+            $result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->first();
+            $actualStartExist = Activity::where('proyek_id', $id)->whereNotNull('actual_start')->exists();
+            $actualEndExist = Activity::where('proyek_id', $id)->whereNotNull('actual_end')->exists();
+            $query = Activity::where('proyek_id', $id);
+        } else {
+            $result->header = Activity::whereNull('parent_id')->where("proyek_id", $id)->where("version_gantt_id", $ganttId)->first();
             $actualStartExist = Activity::where('version_gantt_id', $ganttId)->whereNotNull('actual_start')->exists();
             $actualEndExist = Activity::where('version_gantt_id', $ganttId)->whereNotNull('actual_end')->exists();
+            $query = Activity::where('version_gantt_id', $ganttId);
+        }
 
         if ($actualStartExist) {
-			$startDate = Activity::where('version_gantt_id', $ganttId)
-				->orderBy('actual_start')
-				->value('start_date');
+            $startDate = $query->orderBy('actual_start')->value('start_date');
         } else {
-			$startDate = Activity::where('version_gantt_id', $ganttId)
-				->orderBy('start_date')
-				->value('start_date');
+            $startDate = $query->orderBy('start_date')->value('start_date');
         }
+
         if ($actualEndExist) {
-			$endDate = Activity::where('version_gantt_id', $ganttId)
-				->orderByDesc('actual_end')
-				->value('end_date');
+            $endDate = $query->orderByDesc('actual_end')->value('end_date');
         } else {
-			$endDate = Activity::where('version_gantt_id', $ganttId)
-				->orderByDesc('end_date')
-				->value('end_date');
+            $endDate = $query->orderByDesc('end_date')->value('end_date');
         }
+
+        $plannedStart = Activity::where('version_gantt_id', $ganttId)
+				->orderBy('planned_start')
+				->value('planned_start');
+        $plannedEnd = Activity::where('version_gantt_id', $ganttId)
+				->orderByDesc('planned_end')
+				->value('planned_end');
         $result->header->start_date = $startDate;
         $result->header->end_date = $endDate;
-		return response()->json(['status'=>'success','code'=> 200,'data'=>$result, 'gantt'=>$gantt], 200);
+        $result->header->planned_start = $plannedStart;
+        $result->header->planned_end = $plannedEnd;
+		return response()->json(['status'=>'success','code'=> 200,'data'=>$result, 'gantt'=>$ganttId], 200);
 	}
 
 	public function getOverdueActivities(Request $request){

app/Http/Controllers/ReportActivityMaterialController.php

@@ -59,6 +59,14 @@ class ReportActivityMaterialController extends Controller
 					"updated_by" => $this->currentName
 				);
 				Activity::where('id', $request->activity_id)->update($dataUpdate);
+			} else {
+				$sumAssignMaterial = AssignMaterial::where('activity_id', $request->activity_id)->sum('qty_planning');
+				$sumReportActivityMaterial = ReportActivityMaterial::where('activity_id', $request->activity_id)->sum('qty');
+				$dataUpdate = array(
+					"persentase_progress" => $sumReportActivityMaterial/$sumAssignMaterial*100,
+					"updated_by" => $this->currentName
+				);
+				Activity::where('id', $request->activity_id)->update($dataUpdate);
 			}
 
 			return response()->json(['status'=>'success','message'=>'Update data status successfully ', 'code'=>200]);
@@ -114,12 +122,14 @@ class ReportActivityMaterialController extends Controller
 				->addIndexColumn()
 				->addColumn('action', function($row){
 					$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="info btn btn-info btn-sm btn-ram-image" data-toggle="tooltip" title="Lihat Foto Report" data-placement="top"><i class="fa fa-image"></i></a>';
+					if ($row->status_activity != 'done') {
 						$actionBtn .= '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete" data-toggle="tooltip" title="Hapus Report" data-placement="top"><i class="fa fa-trash"></i></a>';
+					}
 					return $actionBtn;
 				})
 				->rawColumns(['action'])->make(true);
 		}else{
-			$data = ReportActivityMaterial::select("report_activity_material.*", "u.name as human_resource")
+			$data = ReportActivityMaterial::select("report_activity_material.*", "u.name as human_resource", "amta.status_activity")
 				->join("assign_material_to_activity as amta", "amta.id", "=", "report_activity_material.assign_material_id")
 				->join("m_req_material as m", "m.id", "=", "amta.material_id")
 				->join("m_users as u", "u.id", "=", "report_activity_material.user_id")
@@ -131,7 +141,9 @@ class ReportActivityMaterialController extends Controller
 				->addIndexColumn()
 				->addColumn('action', function($row){
 					$actionBtn = '<a href="javascript:void(0)" data-id="'.$row->id.'" class="info btn btn-info btn-sm btn-ram-image" data-toggle="tooltip" title="Lihat Foto Report" data-placement="top"><i class="fa fa-image"></i></a>';
+					if ($row->status_activity != 'done') {
 						$actionBtn .= '<a href="javascript:void(0)" data-id="'.$row->id.'" class="delete btn btn-danger btn-sm btn-ram-delete" data-toggle="tooltip" title="Hapus Report" data-placement="top"><i class="fa fa-trash"></i></a>';
+					}
 					return $actionBtn;
 				})
 				->rawColumns(['action'])->make(true);

routes/web.php

@@ -58,7 +58,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
 		$router->post('/project/add', 'ProjectController@add');
 		$router->put('/project/update/{id}', 'ProjectController@update');
 		$router->get('/project/edit/{id}', 'ProjectController@edit');
-		$router->get('/project/detail/{id}', 'ProjectController@detail');
+		$router->get('/project/detail/{id}[/{gantt_id}[/{s_curve}]]', 'ProjectController@detail');
 		$router->delete('/project/delete/{id}', 'ProjectController@delete');
 		$router->get('/project/list', 'ProjectController@list');
 		$router->get('/project/set-baseline/{gantt_id}', 'ProjectController@setBaseline');