Remove existing jobs

Author: ianperrin

MMM-ModuleScheduler.js

@@ -21,10 +21,14 @@ Module.register("MMM-ModuleScheduler",{
 	notificationReceived: function(notification, payload, sender) {
 	    var self = this;
 		if (notification === 'DOM_OBJECTS_CREATED') {
+			// Reset
+			self.sendSocketNotification('REMOVE_ALL_SCHEDULES');
+			
+			// Create schedules
 			MM.getModules().exceptModule(this).withClass(this.config.schedulerClass).enumerate(function(module) {
 				Log.log(self.name + ' wants to schedule the display of ' + module.name );
 				if (typeof module.config.module_schedule === 'object') {
-            		self.sendSocketNotification('SET_SCHEDULE_MODULE', {name: module.name, id: module.identifier, schedule: module.config.module_schedule});
+            		self.sendSocketNotification('CREATE_MODULE_SCHEDULE', {name: module.name, id: module.identifier, schedule: module.config.module_schedule});
 				} else {
 				    Log.error( module.name + ' is configured to be scheduled, but the module_schedule option is undefined' );
 				}

node_helper.js

@@ -27,7 +27,12 @@ module.exports = NodeHelper.create({
             return true;
         }
 
-        if (notification === "SET_SCHEDULE_MODULE") {
+        if (notification === "REMOVE_ALL_SCHEDULES") {
+            console.log(this.name + ' is removing all schedules');
+            this.stopAllCronJobs();
+        }
+
+        if (notification === "CREATE_MODULE_SCHEDULE") {
             module = payload;
             if (!module.schedule.hasOwnProperty('from') || !module.schedule.hasOwnProperty('from')) {
                 console.log(this.name + ' cannot schedule the module ' + module.name + ' - check module_schedule');
@@ -46,8 +51,9 @@ module.exports = NodeHelper.create({
                 return false;
             }
 
+            this.cronJobs.push({module: module, showJob: showJob, hideJob: hideJob});
+            
             var now = new Date();
-            console.log('Current date: ' + now);
             if (showJob.nextDate().toDate() > now && hideJob.nextDate().toDate() > showJob.nextDate().toDate()) {
                 console.log(this.name + ' is hiding ' + module.name);
                 this.sendSocketNotification('HIDE_MODULE', module.id);
@@ -60,6 +66,27 @@ module.exports = NodeHelper.create({
 
         }
     },
+    
+    stopAllCronJobs: function() {
+        for (var i = 0; i < this.cronJobs.length; i++) {
+            var cronJob = this.cronJobs[i];
+            if( typeof cronJob.showJob === 'object') {
+                this.stopCronJob(cronJob.showJob);
+            }
+            if( typeof cronJob.hideJob === 'object') {
+                this.stopCronJob(cronJob.hideJob);
+            }
+        }
+        this.cronJobs.length = 0;
+    },
+    
+    stopCronJob: function(cronJob){
+        try {
+            cronJob.stop();
+        } catch(ex) {
+            console.log(this.name + ' could not stop cronJob');
+        }  
+    },
 
     createCronJobForModule: function(module, type) {
         var self = this;