Merge pull request #3 from emcniece/master

Fixing day-schedule config/storage
bitwit · Oct 18, 2016 · 6800f6a · 6800f6a
2 parents 70e87e6 + 0149287
commit 6800f6a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/config/config.js b/config/config.js
@@ -38,18 +38,22 @@ app.controller('SchedulerCtrl', ['$scope', function ($scope) {
     $scope.toggleDaySelection = function (day) {
         for (var i = 0; i < $scope.config.daySelection.length; i++) {
             var obj = $scope.config.daySelection[i];
-            if (day.value === obj.value) {
+            if (day.value === obj) {
                 $scope.config.daySelection.splice(i, 1);
                 return;
             }
         }
-        $scope.config.daySelection.push(day);
+        $scope.config.daySelection.push(day.value);
     };
 
     $scope.isDaySelected = function (day) {
+        if(!$scope.config.daySelection){
+            $scope.config.daySelection = [];
+        }
+
         for (var i = 0; i < $scope.config.daySelection.length; i++) {
             var obj = $scope.config.daySelection[i];
-            if (day.value === obj.value) {
+            if (day.value === obj) {
                 return true;
             }
         }

diff --git a/lib/utils.js b/lib/utils.js
@@ -48,7 +48,7 @@ var utils ={
     getNextScheduledTime: function getNextScheduledTime(branchConfig){
         var frequency = branchConfig.frequency
             , time = moment(branchConfig.time)
-            , days = _.flatten(branchConfig.daySelection, 'value')
+            , days = branchConfig.daySelection
             , now = utils.getNow()
             , timeMinutes = time.minutes()
             , timeHours = time.hours()

diff --git a/static/icon.png b/static/icon.png
diff --git a/test/utils_test.js b/test/utils_test.js
@@ -46,7 +46,7 @@ describe("utils", function() {
                 time: moment("1976-10-01 4:30 +0000", "YYYY-MM-DD HH:mm Z"),
                 daySelection:[
                     // Wednedays only
-                    {key: 'Wednesday', value:3}
+                    3
                 ]
             };
             var time = utils.getNextScheduledTime(config);
@@ -64,7 +64,7 @@ describe("utils", function() {
                 time: moment("1976-10-01 4:30 +0000", "YYYY-MM-DD HH:mm Z"),
                 daySelection:[
                     // Sundays only, but the time above has passed already
-                    {key: 'Sunday', value:0}
+                    0
                 ]
             };
             var time = utils.getNextScheduledTime(config);
@@ -81,8 +81,8 @@ describe("utils", function() {
                 frequency: 60 * 60 * 1000 * 24, //daily
                 time: moment("1976-10-01 4:30 +0000", "YYYY-MM-DD HH:mm Z"),
                 daySelection:[
-                    {key: 'Friday', value:5},
-                    {key: 'Tuesday', value:2}
+                    5,
+                    2
                 ]
             };
             var time = utils.getNextScheduledTime(config);
@@ -99,7 +99,7 @@ describe("utils", function() {
                 frequency: 60 * 60 * 1000 * 24, //daily
                 time: moment('2014-10-13T01:48:26.433Z'), //format as expected from JSON objects
                 daySelection:[
-                    {key: 'Wednesday', value:3}
+                    3
                 ]
             };
             var time = utils.getNextScheduledTime(config);