From 9bd5f0c5734d4e058ca5c7fe96972b51281da101 Mon Sep 17 00:00:00 2001
From: Hotte <root@ovanier.de>
Date: Fri, 16 Dec 2016 10:57:00 +0100
Subject: [PATCH] WoopWerbung
---
config/layouts/default.json | 12 ++++++++++--
panels/werbung/script.js | 21 +++++++++++++--------
2 files changed, 23 insertions(+), 10 deletions(-)
diff --git a/config/layouts/default.json b/config/layouts/default.json
index f161fde..a11b901 100755
--- a/config/layouts/default.json
+++ b/config/layouts/default.json
@@ -32,11 +32,11 @@
},
{
"filename": "Ankndigung_FVV.png",
- "enddate": "30.11.2016"
+ "enddate": "30.11.2019"
},
{
"filename": "OpenSourceInfoscreen.jpg",
- "enddate": "18.11.2017"
+ "enddate": "NEVER"
}
]
}
@@ -44,6 +44,14 @@
{
"type": "panel",
"name": "ufc"
+ },
+ {
+ "type": "panel",
+ "name": "mensaPlan"
+ },
+ {
+ "type": "panel",
+ "name": "lsfView"
}
]
}
diff --git a/panels/werbung/script.js b/panels/werbung/script.js
index 2e779a4..f8195e8 100755
--- a/panels/werbung/script.js
+++ b/panels/werbung/script.js
@@ -40,16 +40,11 @@ function isOver(day, month, year){
this.checkShowCondition = function() {
var werbungOriginalNext = nextWerbung;
- var enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
- if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
- console.log("Werbung: CurrentWerbung = " + nextWerbung);
+ if(werbung_config.files[nextWerbung].enddate == "NEVER"){
+ console.log("Werbung: CurrentWerbung = " + nextWerbung + " Infinit");
return 20;
} else {
- console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
- setNextWerbung();
- }
- while(nextWerbung != werbungOriginalNext){
- enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
+ var enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
console.log("Werbung: CurrentWerbung = " + nextWerbung);
return 20;
@@ -57,6 +52,16 @@ this.checkShowCondition = function() {
console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
setNextWerbung();
}
+ while(nextWerbung != werbungOriginalNext){
+ enddateEl = werbung_config.files[nextWerbung].enddate.split(".");
+ if(!isOver(enddateEl[2], enddateEl[1], enddateEl[0])) {
+ console.log("Werbung: CurrentWerbung = " + nextWerbung);
+ return 20;
+ } else {
+ console.log("Werbung: Skipped - Out Of Date - (" + nextWerbung + ")");
+ setNextWerbung();
+ }
+ }
}
return 0;
}
--
GitLab