Christopher Johnson (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/189188
Change subject: simplified stats logic
......................................................................
simplified stats logic
Change-Id: I22931eaf4e9fd797c483c6e9fab0c29a7da861b5
---
M src/__phutil_library_map__.php
R src/storage/SprintStats.php
M src/util/SprintPoints.php
3 files changed, 18 insertions(+), 39 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/phabricator/extensions/Sprint
refs/changes/88/189188/1
diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
index 10b524d..9adbc58 100644
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -41,7 +41,6 @@
'SprintBoardTaskCard' => 'view/SprintBoardTaskCard.php',
'SprintBoardTaskEditController' =>
'controller/board/SprintBoardTaskEditController.php',
'SprintBoardViewController' =>
'controller/board/SprintBoardViewController.php',
- 'SprintBuildStats' => 'storage/SprintBuildStats.php',
'SprintBuildStatsTest' => 'tests/SprintBuildStatsTest.php',
'SprintColumnTransaction' => 'storage/SprintColumnTransaction.php',
'SprintConstants' => 'constants/SprintConstants.php',
@@ -53,6 +52,7 @@
'SprintDataViewController' => 'controller/SprintDataViewController.php',
'SprintDefaultViewCapability' =>
'capability/SprintDefaultViewCapability.php',
'SprintEndDateField' => 'customfield/SprintEndDateField.php',
+ 'SprintErrorView' => 'exception/SprintErrorView.php',
'SprintFactDaemon' => 'fact/SprintFactDaemon.php',
'SprintFactUpdateIterator' => 'fact/SprintFactUpdateIterator.php',
'SprintIsSprintField' => 'customfield/SprintIsSprintField.php',
@@ -66,6 +66,7 @@
'SprintReportBurndownView' => 'view/reports/SprintReportBurndownView.php',
'SprintReportController' => 'controller/SprintReportController.php',
'SprintReportOpenTasksView' =>
'view/reports/SprintReportOpenTasksView.php',
+ 'SprintStats' => 'storage/SprintStats.php',
'SprintTableView' => 'view/burndown/SprintTableView.php',
'SprintTaskStoryPointsField' =>
'customfield/SprintTaskStoryPointsField.php',
'SprintTestCase' => 'tests/SprintTestCase.php',
@@ -105,6 +106,7 @@
'SprintDataViewController' => 'SprintController',
'SprintDefaultViewCapability' => 'PhabricatorPolicyCapability',
'SprintEndDateField' => 'SprintProjectCustomField',
+ 'SprintErrorView' => 'AphrontView',
'SprintFactDaemon' => 'PhabricatorDaemon',
'SprintFactUpdateIterator' => 'PhutilBufferedIterator',
'SprintIsSprintField' => 'SprintProjectCustomField',
diff --git a/src/storage/SprintBuildStats.php b/src/storage/SprintStats.php
similarity index 76%
rename from src/storage/SprintBuildStats.php
rename to src/storage/SprintStats.php
index 212a8f1..1fe8daa 100644
--- a/src/storage/SprintBuildStats.php
+++ b/src/storage/SprintStats.php
@@ -1,6 +1,6 @@
<?php
-final class SprintBuildStats {
+final class SprintStats {
private $timezone;
private $taskpoints;
@@ -55,48 +55,28 @@
}
public function sumSprintStats($dates) {
- $this->sumPointsTotal($dates);
+ $this->sumTotalPoints($dates);
$this->calcTasksRemaining($dates);
- $this->calcPointsRemaining($dates);
+ $this->calcPointsRemaining($dates);
return $dates;
}
- public function sumTasksTotal($dates, $before) {
- $first = true;
- $previous = new BurndownDataDate($date=null);
- $tasks_added_today = null;
- $tasks_reopened_today = null;
- $tasks_closed_today = null;
-
- $tasks_added_before = $before->getTasksAddedBefore();
- $tasks_reopened_before = $before->getTasksReopenedBefore();
- $tasks_closed_before = $before->getTasksClosedBefore();
- $tasks_before = $tasks_added_before + $tasks_reopened_before -
$tasks_closed_before;
-
+ public function sumTotalPoints($dates) {
+ $sprintpoints = id(new SprintPoints())
+ ->setTaskPoints($this->taskpoints);
+ $points_total = $sprintpoints->sumTotalTaskPoints();
foreach ($dates as $date) {
- $tasks_added_today += $date->getTasksAddedToday();
- $tasks_reopened_today += $date->getTasksReopenedToday();
- $tasks_closed_today += $date->getTasksClosedToday();
- $tasks_today = $tasks_added_today + $tasks_reopened_today -
$tasks_closed_today;
- if ($first) {
- $start_tasks = $tasks_before + $tasks_today;
- $date->setTasksTotal($start_tasks);
- } else {
- $tasks_total = $previous->getTasksRemaining();
- $date->setTasksTotal($tasks_total);
- }
- $previous = $date;
- $first = false;
+ $date->setPointsTotal($points_total);
}
return $dates;
}
- public function sumPointsTotal($dates) {
+ public function sumTotalTasks($dates) {
$sprintpoints = id(new SprintPoints())
->setTaskPoints($this->taskpoints);
- $points_total = $sprintpoints->sumAllTaskPoints();
+ $points_total = $sprintpoints->sumTotalTasks();
foreach ($dates as $date) {
- $date->setPointsTotal($points_total);
+ $date->setTasksTotal($points_total);
}
return $dates;
}
@@ -106,14 +86,12 @@
$previous = new BurndownDataDate($date = null);
$sprintpoints = id(new SprintPoints())
->setTaskPoints($this->taskpoints);
- $points_total = $sprintpoints->sumAllTaskPoints();
+ $points_total = $sprintpoints->sumTotalTaskPoints();
foreach ($dates as $date) {
- $points_added_today = $date->getPointsAddedToday();
$points_closed_today = $date->getPointsClosedToday();
$points_reopened_today = $date->getPointsReopenedToday();
- $points_today = $points_added_today + $points_reopened_today -
- $points_closed_today;
+ $points_today = $points_reopened_today - $points_closed_today;
if ($first) {
$points_remaining = $points_today + $points_total;
} else {
@@ -138,10 +116,9 @@
->setTaskPoints($this->taskpoints);
$tasks_total = $sprintpoints->sumTotalTasks();
foreach ($dates as $date) {
- $tasks_added_today = $date->getTasksAddedToday();
$tasks_closed_today = $date->getTasksClosedToday();
$tasks_reopened_today = $date->getTasksReopenedToday();
- $tasks_today = $tasks_added_today + $tasks_reopened_today -
$tasks_closed_today;
+ $tasks_today = $tasks_reopened_today - $tasks_closed_today;
if ($first) {
$tasks_remaining = $tasks_today + $tasks_total;
} else {
diff --git a/src/util/SprintPoints.php b/src/util/SprintPoints.php
index 7aaa11a..13be16d 100644
--- a/src/util/SprintPoints.php
+++ b/src/util/SprintPoints.php
@@ -33,7 +33,7 @@
return $points;
}
- public function sumAllTaskPoints() {
+ public function sumTotalTaskPoints() {
$points = null;
if (!empty($this->taskpoints)) {
$taskpoints = mpull($this->taskpoints, null, 'getObjectPHID');
--
To view, visit https://gerrit.wikimedia.org/r/189188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22931eaf4e9fd797c483c6e9fab0c29a7da861b5
Gerrit-PatchSet: 1
Gerrit-Project: phabricator/extensions/Sprint
Gerrit-Branch: master
Gerrit-Owner: Christopher Johnson (WMDE) <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
