fix(remove):adw integration

app/Helpers/MasterFunctionsHelper.php

@@ -12,30 +12,6 @@ use DateTime;
 class MasterFunctionsHelper
 {
 
-	public static function curlReq($url, $token = "")
-	{
-		if (!$token)
-			$token = config('api.adw_token');
-
-		$ch = curl_init();
-
-		curl_setopt($ch, CURLOPT_URL, $url);
-		$headers = [
-			'Authorization: ' . $token
-		];
-
-		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, FALSE);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_VERBOSE, true);
-		curl_setopt($ch, CURLOPT_STDERR, fopen('php://stderr', 'w'));
-
-		$output = curl_exec($ch);
-		curl_close($ch);
-
-		return json_decode($output);
-	}
-
 	public static function countDays($ganttId, $start, $end)
 	{
 		$dayOffs = VersionGantt::where('id', $ganttId)->first()->config_dayoff;

app/Http/Controllers/Controller.php

@@ -295,11 +295,7 @@ class Controller extends BaseController
     private function curlRequest($url)
     {
         $ch = curl_init();
-        // $headers = [
-        // 	'Authorization: '.$token
-        // ];
         curl_setopt($ch, CURLOPT_URL, $url);
-        // curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
         curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 
         $response = curl_exec($ch);

app/Http/Controllers/DashboardBoDController.php

@@ -21,38 +21,6 @@ class DashboardBoDController extends Controller
 		return $year;
 	}
 
-	private function curlReq($url, $token)
-	{
-		$ch = curl_init();
-		$headers = [
-			'Authorization: ' . $token
-		];
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-		$response = curl_exec($ch);
-		if ($response === false)
-			$response = curl_error($ch);
-		curl_close($ch);
-
-		return json_decode($response);
-	}
-
-	private function getInvoiceIntegration($search)
-	{
-		if(empty($search))
-			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-
-		$url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
-		$token = config('api.adw_token');
-		$response = $this->curlReq($url, $token);
-
-		if(@$response->data->project_no == "")
-			return null;
-
-		return $response;
-	}
 
 	// to do
 	public function getCompanyCashFlow($year = '%')
@@ -63,27 +31,22 @@ class DashboardBoDController extends Controller
 		// we can't use eloquent's sum() method because someone decided to use varchar as datatype in rencana_biaya field
 		$totalBudgets = Project::select(DB::raw('SUM(CAST("rencana_biaya" AS DOUBLE PRECISION))'))
 			->where('mulai_proyek', 'like', $year)
-			/* ->orWhere('akhir_proyek', 'like', $year) */
 			->pluck('sum')
 			->first();
 
 		$projects = Project::where('mulai_proyek', 'like', $year)
-			/* ->orWhere('akhir_proyek', 'like', $year) */
 			->get();
 		foreach ($projects as $project) {
 			$project->expenses = 0;
 
 			$resp = null;
 			if ($project->kode_sortname != "") {
-				$resp = $this->getInvoiceIntegration($project->kode_sortname);
+				$cost =  0;
-				/* $resp = $project->kode_sortname; */
-				$cost = $resp->data->total_cost ?? 0;
 				$cost = substr($cost, 0, strpos($cost, "."));
 				$totalExpenditure += (int) $cost;
-				$totalInvoice += $resp->data->total_invoice_amount ?? 0;
+				$totalInvoice += 0;
-				$totalPaidInvoice += $resp->data->total_invoice_paid_amount ?? 0;
+				$totalPaidInvoice += 0;
 			}
-
 		}
 
 		return response()->json([
@@ -100,19 +63,15 @@ class DashboardBoDController extends Controller
 	{
 		$year = $this->interpolateYear($year);
 		$projects = Project::where('mulai_proyek', 'like', $year)
-			/* ->orWhere('akhir_proyek', 'like', $year) */
 			->get();
 		$return = [];
 		foreach ($projects as $project) {
-			$resp = null;
 			if ($project->kode_sortname != "") {
-				$resp = $this->getInvoiceIntegration($project->kode_sortname);
 				array_push($return, [
 					'project' => $project->nama,
 					'project_code' => $project->kode_sortname,
-					'invoiced' => $resp->data->total_invoice_amount ?? 0,
+					'invoiced' =>  0,
-					'paid' => $resp->data->total_invoice_paid_amount ?? 0,
+					'paid' => 0,
-					'response' => $resp,
 				]);
 			}
 		}
@@ -150,12 +109,10 @@ class DashboardBoDController extends Controller
 				if ($selisihProgress > 0 && $selisihProgress <= 5) {
 					$return['warning'] += 1;
 					$projects[$index]->status = 'warning';
-				}
+				} elseif ($selisihProgress == 0) {
-				elseif ($selisihProgress == 0){
 					$return['on-schedule'] += 1;
 					$projects[$index]->status = 'on-schedule';
-				}
+				} else {
-				else {
 					$return['behind-schedule'] += 1;
 					$projects[$index]->status = 'behind-schedule';
 				}
@@ -193,11 +150,9 @@ class DashboardBoDController extends Controller
 				$selisihProgress = $planningProgress - $actualProgress;
 				if ($selisihProgress > 0 && $selisihProgress <= 5) {
 					$warning++;
-				}
+				} elseif ($selisihProgress == 0) {
-				elseif ($selisihProgress == 0){
 					$onSchedule++;
-				}
+				} else {
-				else {
 					$behindSchedule++;
 				}
 			}
@@ -358,15 +313,13 @@ class DashboardBoDController extends Controller
 			$lastGantt = MasterFunctionsHelper::getLatestGantt($project->id);
 
 			if ($project->kode_sortname != "") {
-				$resp = $this->getInvoiceIntegration($project->kode_sortname);
 				$project->invoice = [
-					'invoiced' => $resp->data->total_invoice_amount ?? 0,
+					'invoiced' =>  0,
-					'paid' => $resp->data->total_invoice_paid_amount ?? 0,
+					'paid' => 0,
 				];
 			}
 
 			$project->pm = User::find($project->pm_id);
-			/* $project->header = Activity::where('proyek_id', $project->id)->where('version_gantt_id', $lastGantt['last_gantt_id'])->whereNull('parent_id')->first(); */
 			if (!isset($lastGantt['last_gantt_id'])) {
 				$project->manPowers = 0;
 			} else {

app/Http/Controllers/ProjectController.php

@@ -334,10 +334,13 @@ class ProjectController extends Controller
 				'projectsByPhase' => $projectsByPhase,
 				'projectTypes' => $projectTypes,
 				'projectsByType' => $projectsByType,
-	        ], 200);
+			],
+			200
+		);
 	}
 
-	public function getListProjectTask($id){
+	public function getListProjectTask($id)
+	{
 		$data = UserToActivity::select("assign_hr_to_activity.user_id as user_id", "m_proyek.*")
 			->where("assign_hr_to_activity.user_id", $id)
 			->join('m_proyek', 'assign_hr_to_activity.proyek_id', '=', 'm_proyek.id')
@@ -350,17 +353,20 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 	}
 
-  public function getSCurve(Request $request){
+	public function getSCurve(Request $request)
+	{
 		$data = MasterFunctionsHelper::getSCurve($request);
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 	}
 
-  public function calculateSCurve(Request $request){
+	public function calculateSCurve(Request $request)
+	{
 		$sCurve = Project::select('scurve')->where('id', $request->project_id)->first();
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => json_decode($sCurve->scurve)], 200);
 	}
 
-  public function sCurveCommand(Request $request){
+	public function sCurveCommand(Request $request)
+	{
 		Artisan::call('calculate:scurve', [
 			'project_id' => $request->project_id
 		]);
@@ -375,12 +381,14 @@ class ProjectController extends Controller
 		// return response()->json(['message' => 'Project not found'], 404);
 	}
 
-  public function getLinearSCurve(Request $request){
+	public function getLinearSCurve(Request $request)
+	{
 		$data = MasterFunctionsHelper::getLinearSCurve($request);
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 	}
 
-	public static function setSyncDate($activity_id, $activity, $report) {
+	public static function setSyncDate($activity_id, $activity, $report)
+	{
 		$status = AssignMaterial::where('activity_id', $activity_id)->first();
 		if (!isset($status)) {
 			$reports = array(
@@ -479,20 +487,7 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'message' => 'Set baseline success!', 'code' => 200], 200);
 	}
 
-  public function getInvoiceIntegration(Request $request) {
-        $ganttCount = VersionGantt::where('proyek_id', $request->id)->count();
-		$search = urlencode($request->search);
-		if(empty($search))
-			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		$url = str_replace("SEARCH", $search, config('api.adw').'/project_cost?project_no=SEARCH');
-
-		$response = MasterFunctionsHelper::curlReq($url);
-        if (isset($request->gantt_id)) {
-            $response->data->total_cost = $response->data->total_cost / $ganttCount;
-        }
 
-		return response()->json(['status'=>'success', 'data'=> $response, 'code'=>200], 200);
-	}
 	public function getByUser($id)
 	{
 		$alias = "utp";
@@ -511,7 +506,8 @@ class ProjectController extends Controller
 
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $userProyek, 'totalRecord' => $totalRecord], 200);
 	}
-  public function detail(Request $request, $id, $gantt_id = null, $s_curve = null){
+	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);
 
@@ -530,8 +526,7 @@ class ProjectController extends Controller
 		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();
-            if($result['type_proyek_id'] === 9)
+			if ($result['type_proyek_id'] === 9) {
-            {
 				$actualEndExist = Activity::where('proyek_id', $id)->exists();
 				$query = Activity::where('proyek_id', $id);
 			} else {
@@ -550,8 +545,7 @@ class ProjectController extends Controller
 		} else {
 			$startDate = $query->orderBy('start_date')->value('start_date');
 		}
-        if($actualEndExist)
+		if ($actualEndExist) {
-        {
 			$maxEndDate = $query->max('id');
 			$endDate = $query->where('id', $maxEndDate)->first()->end_date;
 		}
@@ -569,7 +563,8 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $result, 'gantt' => $ganttId], 200);
 	}
 
-	public function getOverdueActivities(Request $request){
+	public function getOverdueActivities(Request $request)
+	{
 		$payload = $request->all();
 		if (empty($payload['id']) || !is_int((int)$payload['id']))
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
@@ -588,8 +583,7 @@ class ProjectController extends Controller
 			} else {
 				$overdueActivities = Activity::where('version_gantt_id', $payload['gantt'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->whereDate('end_date', '<=', $endDate)->orderBy('end_date', 'asc')->get();
 			}
-		}
+		} else {
-		else {
 			if (isset($payload['scurve'])) {
 				$overdueActivities = Activity::where('proyek_id', $payload['id'])->whereNotNull('parent_id')->where('persentase_progress', '!=', 100)->orderBy('end_date', 'asc')->get();
 			} else {
@@ -601,15 +595,26 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $result], 200);
 	}
 
-  public function getReportDistribution(Request $request){
+	public function getReportDistribution(Request $request)
+	{
 		$payload = $request->all();
 
 		if (empty($payload['project_id']) || !is_int((int)$payload['project_id']))
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
 		$reports = DB::table('assign_material_to_activity as ama')
-			->select('u.name', 'a.name as activity_name', 'ama.qty_planning', 'ram.qty as qty_real','rm.description as material_name', 'rm.uom as material_unit',
+			->select(
-			   	'ram.lat', 'ram.lon', 'ram.description as report_notes', 'ram.report_date')
+				'u.name',
+				'a.name as activity_name',
+				'ama.qty_planning',
+				'ram.qty as qty_real',
+				'rm.description as material_name',
+				'rm.uom as material_unit',
+				'ram.lat',
+				'ram.lon',
+				'ram.description as report_notes',
+				'ram.report_date'
+			)
 			->join('report_activity_material as ram', 'ram.assign_material_id', '=', 'ama.id')
 			->join('m_req_material as rm', 'rm.id', '=', 'ama.material_id')
 			->join('m_activity as a', 'a.id', '=', 'ama.activity_id')
@@ -621,12 +626,14 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $reports], 200);
 	}
 
-  public function getManpower($proyek_id){
+	public function getManpower($proyek_id)
+	{
 		$manCount = UserToProyek::where('proyek_id', $proyek_id)->count();
 		return response()->json(['totalRecord' => $manCount]);
 	}
 
-  public function getAssignedHR($gantt_id){
+	public function getAssignedHR($gantt_id)
+	{
 		$results = UserToActivity::select('assign_hr_to_activity.proyek_id', 'assign_hr_to_activity.user_id', 'm_activity.id', 'm_activity.name', 'm_activity.start_date', 'm_activity.end_date')
 			->join('m_activity', 'm_activity.id', '=', 'assign_hr_to_activity.activity_id')
 			->where('assign_hr_to_activity.version_gantt_id', $gantt_id)
@@ -637,8 +644,17 @@ class ProjectController extends Controller
 	public function dashboard($id)
 	{
 		$data = DB::table('m_proyek as mp')
-					->select('mp.kode_sortname', 'mp.nama as name_project', 'mp.mulai_proyek as start', 'mp.akhir_proyek as finish',
+			->select(
-							'mp.rencana_biaya', 'mp.company', 'mp.currency_symbol', 'mu.name as pm', 'mp.budget_health')
+				'mp.kode_sortname',
+				'mp.nama as name_project',
+				'mp.mulai_proyek as start',
+				'mp.akhir_proyek as finish',
+				'mp.rencana_biaya',
+				'mp.company',
+				'mp.currency_symbol',
+				'mu.name as pm',
+				'mp.budget_health'
+			)
 			->join('m_users as mu', 'mu.id', '=', 'mp.pm_id')
 			->where('mp.id', $id)
 			->first();
@@ -653,8 +669,13 @@ class ProjectController extends Controller
 		$progress = @$rootActivity->persentase_progress ?? 0;
 
 		$commentActivity = DB::table('m_comment_activity as mca')
-								->select('mca.activity_id', 'mca.comment as comment', 'mca.created_by as comment_by', 'mca.created_at as comment_created',
+			->select(
-										 'ma.name as activity')
+				'mca.activity_id',
+				'mca.comment as comment',
+				'mca.created_by as comment_by',
+				'mca.created_at as comment_created',
+				'ma.name as activity'
+			)
 			->join('m_activity as ma', 'ma.id', '=', 'mca.activity_id')
 			->where('ma.proyek_id', $id)
 			->orderBy('comment_by')
@@ -669,7 +690,8 @@ class ProjectController extends Controller
 		return response()->json(['status' => 'success', 'code' => 200, 'data' => $data], 200);
 	}
 
-	private function httpReq($search){
+	private function httpReq($search)
+	{
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, str_replace("ADDR", $search, API_GEOLOCATION));
 
@@ -685,6 +707,4 @@ class ProjectController extends Controller
 
 		return json_decode($output);
 	}
-
 }
-

app/Http/Controllers/RequestMaterialController.php

@@ -8,13 +8,15 @@ use App\Models\MaterialResource;
 
 class RequestMaterialController extends Controller
 {
-	private function sanitizeDecimal($number) {
+	private function sanitizeDecimal($number)
+	{
 		$number = str_replace(".", "", $number);
 		$number = str_replace(",", ".", $number);
 		return $number;
 	}
 
-	public function add(Request $request){
+	public function add(Request $request)
+	{
 		$this->validate($request, [
 			'proyek_id' => 'required',
 			'description' => 'required',
@@ -38,7 +40,8 @@ class RequestMaterialController extends Controller
 		return response()->json(['status' => 'success', 'message' => 'Data added!', 'data' => $result, 'code' => 200], 200);
 	}
 
-	public function edit($id){
+	public function edit($id)
+	{
 		if (empty($id) || !is_int((int)$id))
 			return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
 
@@ -151,51 +154,4 @@ class RequestMaterialController extends Controller
 
 		return response()->json(['status' => 'success', 'message' => 'request material successfully updated!', 'code' => 200], 200);
 	}
-
-	private function curlReq($url, $token){
-		$ch = curl_init();
-		$headers = [
-			'Authorization: '.$token
-		];
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-		$response = curl_exec($ch);
-		if ($response === false)
-			$response = curl_error($ch);
-		curl_close($ch);
-
-		return json_decode($response);
-	}
-
-	public function getMaterialIntegration(Request $request) {
-		$search = urlencode($request->name);
-		if(empty($search))
-			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		$url = str_replace("SEARCH", $search, config('api.adw').'/stock_master?name=SEARCH');
-		$token = config('api.adw_token');
-		$firstResponse = $this->curlReq($url, $token);
-
-		if($firstResponse->total == 0)
-			return response()->json(['status'=>'error', 'message' => 'Data not found!', 'code'=>404], 404);
-
-		$data = $firstResponse->data;
-		$currentPage = 1;
-
-		if($firstResponse->last_page > 0) {
-			do {
-				$currentPage++;
-				$response = $this->curlReq($url.'&page='.$currentPage, $token);
-				foreach($response->data as $d){
-					array_push($data, $d);
-				}
-			} while ($currentPage < 5);
-			// let the user narrow down the search by themself
-			// a searching action with 'cable' keyword could take minutes
-			// because there are >1k items associated with that keyword
-		}
-
-		return response()->json(['status'=>'success', 'data'=> $data, 'total' => count($data), 'code'=>200], 200);
-	}
 }

app/Http/Controllers/UserToProyekController.php

@@ -30,7 +30,8 @@ class UserToProyekController extends Controller
         }
     }
 
-    public function addMultiple(Request $request){
+    public function addMultiple(Request $request)
+    {
         $user_IDs = $request->user_id;
 
         $data = UserToProyek::where([
@@ -69,10 +70,10 @@ class UserToProyekController extends Controller
         } else {
             return response()->json(['status' => 'success', 'message' => 'Project customer successfull created', 'code' => 200]);
         }
-
     }
 
-    public function edit($id){
+    public function edit($id)
+    {
         if (!$id || (int) $id < 0 || $id == "") {
             return response()->json(['status' => 'failed', 'message' => 'id is required!', 'code' => 400], 400);
             die();
@@ -175,7 +176,8 @@ class UserToProyekController extends Controller
         }
     }
 
-    public function select(Request $request){
+    public function select(Request $request)
+    {
 
         $search = $request->query('search');
 
@@ -208,49 +210,4 @@ class UserToProyekController extends Controller
 
         return response()->json($data);
     }
-
-	private function curlReq($url, $token){
-		$ch = curl_init();
-		$headers = [
-			'Authorization: '.$token
-		];
-		curl_setopt($ch, CURLOPT_URL, $url);
-		curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-
-		$response = curl_exec($ch);
-		if ($response === false)
-			$response = curl_error($ch);
-		curl_close($ch);
-
-		return json_decode($response);
-	}
-
-	public function getEmployeeIntegration(Request $request) {
-		$search = urlencode($request->name);
-		if(empty($search))
-			return response()->json(['status'=>'error', 'message'=>'Empty query string!'], 400);
-		$url = str_replace("SEARCH", $search, config('api.adw').'/employees?emp_name=SEARCH');
-		$token = config('api.adw_token');
-		$firstResponse = $this->curlReq($url, $token);
-
-		if($firstResponse->total == 0)
-			return response()->json(['status'=>'error', 'message' => 'Data not found!', 'code'=>404], 404);
-
-		$data = $firstResponse->data;
-		return response()->json([$data]);
-		$currentPage = 1;
-
-		if($firstResponse->last_page > 0) {
-			do {
-				$currentPage++;
-				$response = $this->curlReq($url.'&page='.$currentPage, $token);
-				foreach($response->data as $d){
-					array_push($data, $d);
-				}
-			} while ($currentPage < $firstResponse->last_page);
-		}
-
-		return response()->json(['status'=>'success', 'data'=> $data, 'total' => count($data), 'code'=>200], 200);
-	}
 }