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