added total estimation

Author: kriskbx

readme.md

@@ -51,7 +51,7 @@ gtt report:month ["2017-03"] ["namespace/project"]
 gtt report:day ["2017-03-01"] ["namespace/project"]
 
 # timeframe
-git report --from="2017-03-01" --to="2017-04-01"
+gtt report --from="2017-03-01" --to="2017-04-01"
 
 # include closed issues
 gtt report --closed=true

src/Output/AbstractOutput.php

@@ -23,6 +23,11 @@ abstract class AbstractOutput implements \kriskbx\gtt\Output\OutputInterface
      */
     protected $totalTime = 0;
 
+    /**
+     * @var int
+     */
+    protected $totalEstimate = 0;
+
     /**
      * @var InputInterface
      */
@@ -78,7 +83,9 @@ public function __construct(
      */
     protected function addToTotal(Issue $issue)
     {
-        $issue->getTimes()->each(function ($times, $user) {
+        $this->totalEstimate += @$issue->getEstimation()->getTimeEstimate() ?: 0;
+
+        collect($issue->getTimes())->each(function ($times, $user) {
             if ( ! @$this->totalTimeByUser[$user]) {
                 $this->totalTimeByUser[$user] = 0;
             }

src/Output/CsvOutput.php

@@ -3,15 +3,10 @@
 
 namespace kriskbx\gtt\Output;
 
-
 use Illuminate\Support\Collection;
 use kriskbx\gtt\Issue;
-use kriskbx\gtt\Time;
 use League\Csv\Writer;
 use SplTempFileObject;
-use Symfony\Component\Console\Helper\QuestionHelper;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
 
 class CsvOutput extends AbstractOutput
 {

src/Output/MarkdownOutput.php

@@ -66,7 +66,8 @@ protected function cleanUp()
      */
     protected function total()
     {
-        $subString = "* **Total:** " . Time::humanReadable($this->totalTime) . "\n";
+        $subString = "* **Total spent:** " . Time::humanReadable($this->totalTime) . "\n";
+        $subString .= "* **Total estimated:** " . Time::humanReadable($this->totalEstimate) . "\n";
 
         collect($this->totalTimeByUser)->each(function ($time, $user) use (&$subString) {
             $subString .= "* **{$user}:** " . Time::humanReadable($time) . "\n";

src/Output/TableOutput.php

@@ -62,7 +62,7 @@ public function render(Collection $issues, $title, array $params)
         // WE NEED SPACES
         $this->output->writeln('');
         $this->output->writeln('');
-        $this->output->writeln($title);
+        $this->output->writeln("<fg=black;bg=blue>  {$title}  </>");
         $this->output->writeln('');
 
         $this->total();
@@ -126,7 +126,8 @@ protected function estimationBar(Estimation $estimation, $params = [])
      */
     protected function total()
     {
-        $string = "* <fg=blue>Total:</> " . Time::humanReadable($this->totalTime) . "\n";
+        $string = "* <fg=blue>Total spent:</> " . Time::humanReadable($this->totalTime) . "\n";
+        $string .= "* <fg=blue>Total estimate:</> " . Time::humanReadable($this->totalEstimate) . "\n\n";
 
         collect($this->totalTimeByUser)->each(function ($time, $user) use (&$string) {
             $string .= "* <fg=blue>{$user}:</> " . Time::humanReadable($time) . "\n";

src/Time/HasTimes.php

@@ -3,7 +3,9 @@
 namespace kriskbx\gtt\Time;
 
 use Carbon\Carbon;
+use Illuminate\Support\Collection;
 use kriskbx\gtt\Collection\TimesCollection;
+use kriskbx\gtt\Estimation;
 use kriskbx\gtt\Time;
 
 trait HasTimes