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

Merge pull request 'fix curva S site' (#60) from dev-ibnu into staging 

Reviewed-on: ordo/adw-backend#60
pull/3/head
ibnu 2 years ago
parent
3a392ac677 02eff6fb8c
commit
d426c7684c
1 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/Helpers/MasterFunctionsHelper.php

4
app/Helpers/MasterFunctionsHelper.php
Unescape View File

@ -225,7 +225,7 @@ class MasterFunctionsHelper {
// $sumPercentageActual+=($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'){ 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; // $sumPercentageActual = $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual;
}else{ }else{
if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){ if($keyActualM->qty/$sumVolActual->ttl_qty_plan >= 1){
@ -271,7 +271,7 @@ class MasterFunctionsHelper {
// $tempTtlPercentPlan = 100; // $tempTtlPercentPlan = 100;
if($tempTtlPercentActual >= $keyGantt['progress']) if($tempTtlPercentActual >= $keyGantt['progress'])
$tempTtlPercentActual = $keyGantt['progress']; $tempTtlPercentActual = $keyGantt['progress'];
if($tempTtlPercentPlan >= 100) if($tempTtlPercentPlan >= 100)
$tempTtlPercentPlan = 100; $tempTtlPercentPlan = 100;
// $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual // $sumPercentageActual > $keyGantt['progress'] ? $keyGantt['progress'] : $sumPercentageActual

Write Preview
Loading…
Cancel
Save