diff --git a/panels/werbung/img/Ankndigung_FVV.png b/panels/werbung/img/Ankndigung_FVV.png deleted file mode 100644 index 281842f14252aaa4df4a299849d915fff530ae45..0000000000000000000000000000000000000000 Binary files a/panels/werbung/img/Ankndigung_FVV.png and /dev/null differ diff --git a/panels/werbung/img/DAT_2016_Flyer_DINA6.png b/panels/werbung/img/DAT_2016_Flyer_DINA6.png deleted file mode 100644 index 163e7c8d5a6238d32d11d401294b1e532ee1a558..0000000000000000000000000000000000000000 Binary files a/panels/werbung/img/DAT_2016_Flyer_DINA6.png and /dev/null differ diff --git a/panels/werbung/img/itour2016_0.png b/panels/werbung/img/itour2016_0.png deleted file mode 100755 index f65a36ac418863ba216c9fc3adeb262cf1110142..0000000000000000000000000000000000000000 Binary files a/panels/werbung/img/itour2016_0.png and /dev/null differ diff --git a/panels/werbung/script.js b/panels/werbung/script.js index 5082198a3240245f7aac69ac6bf2eb4ded176cba..2e779a44d20451857c72127bd3c551b13663488b 100755 --- a/panels/werbung/script.js +++ b/panels/werbung/script.js @@ -29,15 +29,20 @@ this.resize=function() { this.hide = function() { } -function getUTC() { - return Date.UTC(new Date().getFullYear(), new Date().getMonth(), new Date().getDate()); +function isOver(day, month, year){ + var d = new Date(); + if((d.getFullYear() > year) || (d.getFullYear() == year && d.getMonth() > month) || (d.getFullYear() == year && d.getMonth() == month && d.getDate() > day)){ + return true; + } else { + return false; + } } - + this.checkShowCondition = function() { var werbungOriginalNext = nextWerbung; var enddateEl = werbung_config.files[nextWerbung].enddate.split("."); - if( getUTC() <= Date.UTC(enddateEl[2], enddateEl[1], enddateEl[0])) { - console.log("Werbung: CurrentWerbung = " + nextWerbung + " D:" + getUTC() + "D2:" + Date.UTC(enddateEl[2], enddateEl[1], enddateEl[0])); + if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) { + console.log("Werbung: CurrentWerbung = " + nextWerbung); return 20; } else { console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")"); @@ -45,8 +50,8 @@ this.checkShowCondition = function() { } while(nextWerbung != werbungOriginalNext){ enddateEl = werbung_config.files[nextWerbung].enddate.split("."); - if( getUTC() <= Date.UTC(enddateEl[2], enddateEl[1], enddateEl[0])) { - console.log("Werbung: CurrentWerbung = " + nextWerbung + " D:" + getUTC() + "D2:" + Date.UTC(enddateEl[2], enddateEl[1], enddateEl[0])); + if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) { + console.log("Werbung: CurrentWerbung = " + nextWerbung); return 20; } else { console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");