* tsp-info parts added
This commit is contained in:
@@ -45,7 +45,10 @@ class TrInfoCollectorService
|
||||
}
|
||||
|
||||
/**
|
||||
* < 700 daily progress
|
||||
* * weekly
|
||||
* @return array
|
||||
* @todo calculate progress late stuff
|
||||
*/
|
||||
public function getProgressInfo()
|
||||
{
|
||||
@@ -105,10 +108,10 @@ class TrInfoCollectorService
|
||||
|
||||
private function caltulatePraBaseDiff($goalCounter): array
|
||||
{
|
||||
$praBaseData = $this->config->get('pra.baseData');
|
||||
$praBaseData = $this->config->get('pra.baseData')->toArray();
|
||||
foreach ($goalCounter as $mho => &$counters) {
|
||||
foreach (['A', 'B', 'C'] as $prio) {
|
||||
$counters[$prio] = $counters[$prio] - $praBaseData[$mho][$prio];
|
||||
$counters[$prio] = $counters[$prio] - $praBaseData[$prio][$mho];
|
||||
}
|
||||
}
|
||||
return $goalCounter;
|
||||
@@ -116,25 +119,27 @@ class TrInfoCollectorService
|
||||
|
||||
private function parseProgressCsvRecords(Reader $csvReader)
|
||||
{
|
||||
$teamMembers = $this->config->get('team.members')->toArray();
|
||||
$statement = new Statement();
|
||||
$csvRecords = $statement
|
||||
->where(function($record) use ($teamMembers) {
|
||||
return in_array(strtolower($record['owner']), $teamMembers);
|
||||
})
|
||||
->process($csvReader);
|
||||
|
||||
$trProgressList = [];
|
||||
|
||||
foreach ($csvRecords as $csvRecord) {
|
||||
$trProgress = new TrProgress();
|
||||
$trProgress->setEriref($csvRecord["eriref"])
|
||||
->setHeading($csvRecord["heading"])
|
||||
->setPrio($csvRecord["prio"])
|
||||
->setLastProgress($this->getLastProgressInDay($csvRecord))
|
||||
->setLastProgressInDays($this->getLastProgressInDay($csvRecord))
|
||||
;
|
||||
|
||||
$trProgressList[] = $trProgress;
|
||||
}
|
||||
|
||||
usort($trProgressList, function(TrProgress $a, TrProgress $b){
|
||||
return $b->getLastProgress() <=> $a->getLastProgress();
|
||||
return $b->getLastProgressInDays() <=> $a->getLastProgressInDays();
|
||||
});
|
||||
|
||||
return $trProgressList;
|
||||
|
||||
Reference in New Issue
Block a user