jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Fixed switch bug, now loading events from permanent storage correctly

Browse source
This commit is contained in:
Stefan Persson 2010-12-22 13:28:29 +00:00
parent 82c1ce4177
commit 39cdfe8cae
2 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
telldus-gui/Plugins/Scheduler/__init__.js
View file

@ -105,6 +105,7 @@ com.telldus.scheduler = function() {
} }
var job = joblist.shift(); //get first job in list (and remove it from the list) var job = joblist.shift(); //get first job in list (and remove it from the list)
var nextRunTime = job.nextRunTime; var nextRunTime = job.nextRunTime;
print("Will run " + storedJobs[job.id].v.name + " when the time is right");
if(nextRunTime == 0){ if(nextRunTime == 0){
//something is wrong //something is wrong
@ -126,7 +127,8 @@ com.telldus.scheduler = function() {
var success = 0; var success = 0;
print("Job id: " + runJob.id); print("Job id: " + runJob.id);
if(runJob){ if(runJob){
switch(runJob.method){ var method = parseInt(runJob.method);
switch(method){
case com.telldus.core.TELLSTICK_TURNON: case com.telldus.core.TELLSTICK_TURNON:
success = com.telldus.core.turnOn(runJob.id); success = com.telldus.core.turnOn(runJob.id);
break; break;
@ -195,10 +197,12 @@ com.telldus.scheduler = function() {
print("Loading jobs"); print("Loading jobs");
//TODO temp - creating events //TODO temp - creating events
/*
var newRecurringMonthJob = getJob({id: 3, name: "testnamn10", type: JOBTYPE_RECURRING_MONTH, startdate: "2010-01-01", lastrun: 0, device: 1, method: 1, value: ""}); var newRecurringMonthJob = getJob({id: 3, name: "testnamn10", type: JOBTYPE_RECURRING_MONTH, startdate: "2010-01-01", lastrun: 0, device: 1, method: 1, value: ""});
newRecurringMonthJob.addEvent(new Event(2)); newRecurringMonthJob.addEvent(new Event(2));
newRecurringMonthJob.save(); newRecurringMonthJob.save();
*/
storedJobs = {}; storedJobs = {};
//get all jobs from permanent storage //get all jobs from permanent storage
var settings = new com.telldus.settings(); var settings = new com.telldus.settings();
@ -215,7 +219,9 @@ com.telldus.scheduler = function() {
function getJob(jobdata){ function getJob(jobdata){
//factory function... typ //factory function... typ
var job = new Job(); var job = new Job();
switch(jobdata.type){ var type = parseInt(jobdata.type);
switch(type){
case JOBTYPE_ABSOLUTE: case JOBTYPE_ABSOLUTE:
job = new JobAbsolute(jobdata); job = new JobAbsolute(jobdata);
break; break;
@ -337,6 +343,7 @@ com.telldus.scheduler = function() {
} }
Job.prototype.getNextRunTime = function(){ Job.prototype.getNextRunTime = function(){
print("getNextRunTime default");
return 0; //default return 0; //default
} }
@ -402,7 +409,7 @@ com.telldus.scheduler = function() {
JobRecurringMonth.prototype = new Job(); //Job.prototype; JobRecurringMonth.prototype = new Job(); //Job.prototype;
JobAbsolute.prototype.getNextRunTime = function(){ JobAbsolute.prototype.getNextRunTime = function(){
//TODO like this, or more like this.getNextRunTime = function(name){ inside the class? print("getNextRunTime absolute");
//Get all events in this job (absolute = //Get all events in this job (absolute =
//kan vara flera absoluta datum och tidpunkter på ett jobb) //kan vara flera absoluta datum och tidpunkter på ett jobb)
//var events = job.events; //var events = job.events;
@ -417,6 +424,7 @@ com.telldus.scheduler = function() {
} }
JobRecurringDay.prototype.getNextRunTime = function(){ JobRecurringDay.prototype.getNextRunTime = function(){
print("getNextRunTime day");
//Recurring day (every day, every other day or every x day) //Recurring day (every day, every other day or every x day)
//only one event/job (at the moment at least) //only one event/job (at the moment at least)
//TODO test this //TODO test this
@ -444,6 +452,7 @@ com.telldus.scheduler = function() {
} }
JobRecurringWeek.prototype.getNextRunTime = function(){ JobRecurringWeek.prototype.getNextRunTime = function(){
print("getNextRunTime week");
var nextRunTime = 0; var nextRunTime = 0;
if(!this.v.events){ if(!this.v.events){
return 0; return 0;
@ -472,6 +481,7 @@ com.telldus.scheduler = function() {
} }
JobRecurringMonth.prototype.getNextRunTime = function(){ JobRecurringMonth.prototype.getNextRunTime = function(){
print("getNextRunTime month");
//TODO test this //TODO test this
var nextRunTime = 0; var nextRunTime = 0;
if(!this.v.events){ if(!this.v.events){

2
telldus-gui/Plugins/SunCalculator/__init__.js
View file

@ -34,8 +34,6 @@ com.telldus.suncalculator = function() {
lat = 55 + 68.93/60.0; lat = 55 + 68.93/60.0;
lon = 13 + 21.23/60.0; lon = 13 + 21.23/60.0;
print("FOR 1: " + lat + "_____" + lon);
var k; var k;
var zone = Math.round(date.getTimezoneOffset()/60); var zone = Math.round(date.getTimezoneOffset()/60);
var jd = julian_day(date) - 2451545; // Julian day relative to Jan 1.5, 2000 var jd = julian_day(date) - 2451545; // Julian day relative to Jan 1.5, 2000