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

Remove weight pro rate

pull/3/head
Wahyu Ramadhan 2 years ago
parent
9f85cda9a1
commit
9ae2f37029
1 changed files with 45 additions and 45 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. 90
      app/Http/Controllers/ActivityController.php

90
app/Http/Controllers/ActivityController.php
Unescape View File

@ -351,51 +351,51 @@ class ActivityController extends Controller
$activityStack = [];
$hasWeight = false;
foreach ($data['activities'] as $key => $value) {
if(isset($value['weight']) && $value['weight'] != null && $value['weight'] != 0){
$hasWeight = true;
break;
}
}
if(!$hasWeight){
foreach ($data['activities'] as $key => $value) {
if($key == 0){
$data['activities'][$key]['weight'] = 100;
} else {
$parentWeight = 0;
$siblingsCount = 1;
$i = $key;
while($i > 0){
if ($data['activities'][$i - 1]['level'] == $data['activities'][$key]['level']-1){
$parentWeight = $data['activities'][$i - 1]['weight'];
break;
}
if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
$siblingsCount++;
}
$i--;
}
$i = $key+1;
while($i < count($data['activities'])){
if ($data['activities'][$i]['level'] == $data['activities'][$key]['level']-1){
break;
}
// Log::info('level '.$data['activities'][$key]['level'].' i level '.$data['activities'][$i]['level']);
if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
$siblingsCount++;
}
$i++;
}
$data['activities'][$key]['weight'] = $parentWeight / $siblingsCount;
}
};
}
// $hasWeight = false;
//
// foreach ($data['activities'] as $key => $value) {
// if(isset($value['weight']) && $value['weight'] != null && $value['weight'] != 0){
// $hasWeight = true;
// break;
// }
// }
//
// if(!$hasWeight){
// foreach ($data['activities'] as $key => $value) {
// if($key == 0){
// $data['activities'][$key]['weight'] = 100;
// } else {
// $parentWeight = 0;
// $siblingsCount = 1;
//
// $i = $key;
// while($i > 0){
// if ($data['activities'][$i - 1]['level'] == $data['activities'][$key]['level']-1){
// $parentWeight = $data['activities'][$i - 1]['weight'];
// break;
// }
// if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
// $siblingsCount++;
// }
// $i--;
// }
//
// $i = $key+1;
// while($i < count($data['activities'])){
// if ($data['activities'][$i]['level'] == $data['activities'][$key]['level']-1){
// break;
// }
// // Log::info('level '.$data['activities'][$key]['level'].' i level '.$data['activities'][$i]['level']);
// if ($data['activities'][$key]['level'] == $data['activities'][$i]['level']){
// $siblingsCount++;
// }
// $i++;
// }
//
// $data['activities'][$key]['weight'] = $parentWeight / $siblingsCount;
// }
// };
// }
$projectStart = Project::select('mulai_proyek')->where('id', $projectId)->first();
foreach ($data['activities'] as $i => $activity_row) {
$startDate = \DateTime::createFromFormat('Y-m-d H:i:s.uP', $projectStart->mulai_proyek);

Write Preview
Loading…
Cancel
Save