feat(format): 2396 '365 days' rounds up to a year

Closes #2396
NCI-GDC · May 12, 2016 · 37992e9 · 37992e9
1 parent 0e441d0
commit 37992e9
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 18 deletions.
diff --git a/app/scripts/components/ui/string/string.filters.ts b/app/scripts/components/ui/string/string.filters.ts
@@ -117,21 +117,19 @@ module ngApp.components.ui.string {
 
   class AgeDisplay {
     constructor(gettextCatalog: any) {
-      return function(ageInDays: number) {
-        if (!ageInDays) {
-          return '--';
-        }
-        if (ageInDays < 365.25) {
-          var daysText = gettextCatalog.getPlural(ageInDays, "day", "days");
-          return ageInDays + " " + daysText;
-        } else {
-          var ageInYears = Math.floor(ageInDays / 365.25);
-          var remainderDays = Math.ceil(ageInDays % 365.25);
-          var yearsText = gettextCatalog.getPlural(ageInYears, "year", "years");
-          var daysText = gettextCatalog.getPlural(remainderDays, "day", "days");
-          return ageInYears + " " + yearsText + (remainderDays ? " " + remainderDays + " " + daysText : "");
-        }
-      };
+      const oneYear = 365.25;
+      const leapThenPair = (years: number, days: number): number[] => (days === 365) ? [years + 1, 0] : [years, days];
+      const timeString = (number: number, singular: string, plural: string): string =>
+        number ? ('' + number + ' ' + gettextCatalog.getPlural(number, singular, plural || singular + 's')) : '';
+      // if ES6 is ever used, use `...` instead.
+      const _timeString = _.spread(timeString);
+
+      return (ageInDays: number): string => ageInDays ?
+        _.zip(leapThenPair(Math.floor(ageInDays / oneYear), Math.ceil(ageInDays % oneYear)), ['year', 'day'])
+          .filter(p => p[0] > 0)
+          .map(p => _timeString(p))
+          .join(' ') :
+        '--';
     }
   }
 

diff --git a/app/scripts/components/ui/string/tests/ageDisplay.filter.tests.js b/app/scripts/components/ui/string/tests/ageDisplay.filter.tests.js
@@ -27,13 +27,14 @@ describe("AgeDisplay Filter:", function() {
     expect($filter("ageDisplay")(age)).to.equal(age + " days");
     age = 366;
     expect($filter("ageDisplay")(age)).to.equal("1 year 1 day");
+    age = 729;
+    expect($filter("ageDisplay")(age)).to.equal("1 year 364 days");
     age = 730;
-    expect($filter("ageDisplay")(age)).to.equal("1 year 365 days");
+    expect($filter("ageDisplay")(age)).to.equal("2 years");
     age = 730.5;
     expect($filter("ageDisplay")(age)).to.equal("2 years");
-    age = 731
+    age = 731;
     expect($filter("ageDisplay")(age)).to.equal("2 years 1 day");
-
   }));
 
 });