Merge branch 'dev' of bitbucket.org:FsInformatikDortmund/infoscreen into dev

Conflicts:
	config/layouts/default.json

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 + ")");