Merge pull request 'staging upload 23-05-22' (#61) from staging into master

Reviewed-on: ordo/adw-backend#61

app/Helpers/MasterFunctionsHelper.php

@@ -225,7 +225,7 @@ class MasterFunctionsHelper {
 					// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
 					// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
 						if($checkStatusActivity->status_activity == 'done'){
-							$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
+							$sumPercentageActual+=$keyActualM->bobot_planning;
 							// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
 						}else{
 							if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
@@ -271,7 +271,7 @@ class MasterFunctionsHelper {
 					// 	$tempTtlPercentPlan = 100;
 
 					if($tempTtlPercentActual >= $keyGantt['progress'])
-					$tempTtlPercentActual = $keyGantt['progress'];
+						$tempTtlPercentActual = $keyGantt['progress'];
 					if($tempTtlPercentPlan >= 100)
 						$tempTtlPercentPlan = 100;
 					// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual

app/Http/Controllers/HierarchyFtthController.php

@@ -149,6 +149,30 @@ class HierarchyFtthController extends Controller
         }
       }
     }
+
+    public function getTreeByGantt($gantt_id)
+    {
+      $finalData = [];
+      $gantt = VersionGantt::find($gantt_id);
+      if ($gantt->hierarchy_ftth_id) {
+        $ftth = HierarchyFtth::find($gantt->hierarchy_ftth_id);
+        array_push($finalData, $ftth);
+        if($ftth->parent_id){
+          $this->getParents($finalData, $ftth->parent_id);
+        }
+      } else {
+        return response()->json(['status'=>'success','data'=>$finalData,'code'=>200], 200);
+      }
+      return response()->json(['status'=>'success','data'=>$finalData,'code'=>200], 200);
+    }
+
+    public function getParents(&$data, $id){
+      $ftth = HierarchyFtth::find($id);
+      array_push($data, $ftth);
+      if ($ftth->parent_id) {
+        $this->getParents($data, $ftth->parent_id);
+      }
+    }
     
     public function getTreeByProject($project_id)
     {

routes/web.php

@@ -448,6 +448,7 @@ $router->group(['prefix'=>'api', 'middleware' => 'cors'], function () use ($rout
     $router->put('/hierarchy-ftths/{id}', 'HierarchyFtthController@update');
     $router->delete('/hierarchy-ftths/{id}', 'HierarchyFtthController@destroy');
     $router->get('/hierarchy-ftths/tree/{project_id}', 'HierarchyFtthController@getTreeByProject');
+    $router->get('/hierarchy-ftths/tree-gantt/{gantt_id}', 'HierarchyFtthController@getTreeByGantt');
 
 		$router->post('/map-monitoring/search', 'MapMonitoringController@search');
 	});