ordo
/
surveyor_indonesia_backend
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request 'staging upload 23-05-20' (#58) from staging into master 

Reviewed-on: ordo/adw-backend#58
pull/3/head
ibnu 2 years ago
parent
800e31c8af 4a57e85a8d
commit
351a70a98a
1 changed files with 31 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 45
      app/Helpers/MasterFunctionsHelper.php

45
app/Helpers/MasterFunctionsHelper.php
Unescape View File

@ -223,17 +223,27 @@ class MasterFunctionsHelper {
->first();
$dataTempReport [$w]['percentage'] = ($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
// if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
if($checkStatusActivity->status_activity == 'done'){
$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
}else{
$sumPercentageActual+=(($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning)*(95/100);
if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
$sumPercentageActual+=(($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning)*(95/100);
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
}else{
$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
// $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
}
}
// }else if($checkStatusActivity->status_activity == 'done'){
// $sumPercentageActual+=0;
}else{
$sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
}
// }else {
// if($checkStatusActivity->status_activity == 'done'){
// $sumPercentageActual+=($keyActualM->qty/$keyActualM->qty)*$keyActualM->bobot_planning;
// }else{
// $sumPercentageActual+=($keyActualM->qty/$sumVolActual->ttl_qty_plan)*$keyActualM->bobot_planning;
// }
// }
$totalACWP += $keyActualM->biaya_actual/$keyActualM->duration;
} catch (\DivisionByZeroError $e) {
@ -246,7 +256,7 @@ class MasterFunctionsHelper {
$arr_ActualM[] = array(
'date'=>$dt->format("Y-m-d"),
'percentPlan'=>$sumPercentagePlan,
'percentActual'=>$sumPercentageActual,
'percentActual'=> $sumPercentageActual,
'plan'=>$dataTempPlan,
'actual'=>$dataTempReport,
);
@ -254,12 +264,19 @@ class MasterFunctionsHelper {
$tempTtlPercentPlan+= $sumPercentagePlan;
$tempTtlPercentActual+= $sumPercentageActual;
if($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= 100){
if($tempTtlPercentActual >= 100)
$tempTtlPercentActual = 100;
// if($tempTtlPercentPlan >= 100 || $tempTtlPercentActual >= $keyGantt['progress'];){
// if($tempTtlPercentActual >= 100)
// $tempTtlPercentActual = 100;
// if($tempTtlPercentPlan >= 100)
// $tempTtlPercentPlan = 100;
if($tempTtlPercentActual >= $keyGantt['progress'])
$tempTtlPercentActual = $keyGantt['progress'];
if($tempTtlPercentPlan >= 100)
$tempTtlPercentPlan = 100;
}
// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual
// }
$currentACWP += $totalACWP;
$currentBCWP += $totalBCWP;
@ -304,8 +321,8 @@ class MasterFunctionsHelper {
$dataResponse = array(
"date" =>$tempDate,
"percentage" =>$tempPercentage,
"percentagePlan" => $tempPercentagePlan,
"percentageReal" => $tempPercentageReal,
"percentagePlan" => $tempPercentagePlan,
"percentageReal" => $tempPercentageReal,
"data_details" =>$arr_ActualM,
"budget_control" =>array("current_budget"=> $totalRencanaBudget,
"acwp" => round($totalACWP,0),

Write Preview
Loading…
Cancel
Save