@@ 73-84 (lines=12) @@ | ||
70 | ||
71 | // final calculation |
|
72 | $data = []; |
|
73 | foreach ($steps as $step) { |
|
74 | $stepName = $step->getName(); |
|
75 | if (!in_array($stepName, $this->excludedSteps)) { |
|
76 | if ($step->isFinal()) { |
|
77 | $stepValue = isset($finalStepsData[$stepName]) ? $finalStepsData[$stepName] : 0; |
|
78 | $data[] = ['label' => $step->getLabel(), 'value' => $stepValue, 'isNozzle' => true]; |
|
79 | } else { |
|
80 | $stepValue = isset($regularStepsData[$stepName]) ? $regularStepsData[$stepName] : 0; |
|
81 | $data[] = ['label' => $step->getLabel(), 'value' => $stepValue, 'isNozzle' => false]; |
|
82 | } |
|
83 | } |
|
84 | } |
|
85 | ||
86 | return $data; |
|
87 | } |
@@ 64-76 (lines=13) @@ | ||
61 | $regularStepsData = $this->getStepData($regularSteps, null, null, $customStepCalculations, $aclHelper); |
|
62 | $finalStepsData = $this->getStepData($finalSteps, $dateFrom, $dateTo, $customStepCalculations, $aclHelper); |
|
63 | ||
64 | foreach ($steps as $step) { |
|
65 | $stepName = $step->getName(); |
|
66 | if (!in_array($stepName, $this->excludedSteps)) { |
|
67 | $stepLabel = $step->getLabel(); |
|
68 | if ($step->isFinal()) { |
|
69 | $dataValue = isset($finalStepsData[$stepName]) ? $finalStepsData[$stepName] : 0; |
|
70 | $data[] = ['value' => $dataValue, 'label' => $stepLabel, 'isNozzle' => true]; |
|
71 | } else { |
|
72 | $dataValue = isset($regularStepsData[$stepName]) ? $regularStepsData[$stepName] : 0; |
|
73 | $data[] = ['value' => $dataValue, 'label' => $stepLabel, 'isNozzle' => false]; |
|
74 | } |
|
75 | } |
|
76 | } |
|
77 | ||
78 | return $data; |
|
79 | } |