Merge pull request #4 from dhis2/year-bugfix

[DHIS2-6489] Dynamic generation of years in period dropdown
dhis2 · Mar 29, 2019 · f0b9934 · f0b9934
2 parents 49f1091 + c716d26
commit f0b9934
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "immunization-analysis",
   "description": "Immunization data analysis app for DHIS2",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "dependencies": {
     "angular": "^1.5.5",
     "angular-animate": "^1.5.5",

diff --git a/src/report/report.js b/src/report/report.js
@@ -1597,8 +1597,18 @@ report.controller("ReportController",
 
 
 				//Period options
-				self.periods = [{"displayName": "2018", "id": "2018"}, {"displayName": "2017", "id": "2017"}, {"displayName": "2016", "id": "2016"},{"displayName": "2015", "id": "2015"},
-					{"displayName": "2014", "id": "2014"},{"displayName": "2013", "id": "2013"}];
+				self.periods = [];
+
+				let currentYear = new Date().getFullYear();
+				//Show years from now, back to 2013
+				while ( currentYear >= 2013 ) {
+					self.periods.push({
+						displayName: currentYear.toString(),
+						id: currentYear.toString()
+					});
+					--currentYear;
+				}
+
 				self.selectedPeriod = self.periods[0];