cms/app-client/app/components/notice-component.js
changeset 519 ef3e4841d506
parent 513 dad9471f0d63
child 529 5d9eacbd5794
--- a/cms/app-client/app/components/notice-component.js	Mon Feb 20 11:43:46 2017 +0100
+++ b/cms/app-client/app/components/notice-component.js	Wed Feb 22 07:57:05 2017 +0100
@@ -1,4 +1,6 @@
 import Ember from 'ember';
+import * as commonUtils from 'corpus-common-addon/utils/utils';
+import _ from 'lodash/lodash';
 
 export default Ember.Component.extend({
 
@@ -59,8 +61,26 @@
         },
 
         addCreatedFilter: function(dateStr) {
-          const date = new Date(dateStr);
-          this.get('filter').setFilter('date', date.getFullYear().toString());
+          const filter = this.get('filter');
+          console.log("DATE LIST", this.get('filter').get('date'));
+          console.log("DATE STR", dateStr);
+          if(!dateStr) {
+            return;
+          }
+          const oldDateList = filter.get('dateList');
+          let newDateList = [];
+          const periodMatches = commonUtils.getPeriodMatches(dateStr);
+          if(periodMatches) {
+            newDateList = _.range(periodMatches.start.date.getFullYear(), periodMatches.end.date.getFullYear()+1);
+          } else {
+            const date = new Date(dateStr);
+            if (!isNaN(date.getTime())) {
+              newDateList = [ date.getFullYear() ];
+            }
+          }
+          if(newDateList.length > 0) {
+            filter.set('dateList', _.union(oldDateList, newDateList));
+          }
         }
     }