Merge pull request #817 from derrabauke/feat-remaining-effort-projects

feat(remaining-effort): add re feature to project statistics

Author: derrabauke

app/components/statistic-list/bar/template.hbs

@@ -5,7 +5,7 @@
     class="statistic-list-bar"
     {{style --value=(concat @value)}}
   ></div>
-  {{#if (and @remaining (lt @remaining 1))}}
+  {{#if (and @remaining (lte @remaining 1))}}
     <div
       ...attributes
       class="statistic-list-bar remaining
@@ -17,7 +17,7 @@
     <div
       ...attributes
       class="statistic-list-bar-goal"
-      {{style --goal=(concat @goal)}}
+      {{style --goal=(concat (min "0.99" @goal))}}
     ></div>
   {{/if}}
 </div>

app/components/statistic-list/component.js

@@ -31,6 +31,11 @@ const COLUMN_MAP = {
       layout: DURATION_LAYOUT,
     },
     { title: "Duration", path: "duration", layout: DURATION_LAYOUT },
+    {
+      title: "Remaining Effort",
+      path: "totalRemainingEffort",
+      layout: DURATION_LAYOUT,
+    },
   ],
   task: [
     {

app/components/statistic-list/template.hbs

@@ -69,14 +69,19 @@
           {{/each}}
           <td>
             {{#let
-              (add row.duration row.mostRecentRemainingEffort)
-              as |allotted|
+              (or row.totalRemainingEffort row.mostRecentRemainingEffort)
+              as |remainingEffort|
             }}
-              <StatisticList::Bar
-                @value={{div row.duration this.maxDuration}}
-                @remaining={{div allotted this.maxDuration}}
-                @goal={{min "0.99" (div row.estimatedTime this.maxDuration)}}
-              />
+              {{#let
+                (if remainingEffort (add row.duration remainingEffort) 0)
+                as |allotted|
+              }}
+                <StatisticList::Bar
+                  @value={{div row.duration this.maxDuration}}
+                  @remaining={{div allotted this.maxDuration}}
+                  @goal={{div row.estimatedTime this.maxDuration}}
+                />
+              {{/let}}
             {{/let}}
           </td>
         </tr>

tests/acceptance/statistics-test.js

@@ -50,7 +50,7 @@ module("Acceptance | statistics", function (hooks) {
   test("can view statistics by project", async function (assert) {
     await visit("/statistics?type=project&customer=1");
 
-    assert.dom("thead > tr > th").exists({ count: 5 });
+    assert.dom("thead > tr > th").exists({ count: 6 });
     assert.dom("tbody > tr").exists({ count: 5 });
     assert.dom("tfoot").includesText("Total");
   });