raphael/calenderwatch_client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes incorrect event name appearnece

Browse Source
This commit is contained in:
Raphael Maenle
2020-10-24 15:31:41 +02:00
parent a462151406
commit 1152e61384
3 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
js/app.js
View File

@ -584,6 +584,7 @@ var flagDigital = true;
wait_time = LONG_WAIT;
var wroteEvent = false;
for(var event in events.events){
var startedBeforeToday = false;
@ -647,10 +648,17 @@ var flagDigital = true;
}
if(eventNow(e, hour, minute)) {
drawEventName(e);
console.log("!!!writing name");
wroteEvent = true;
drawEventName(e.name);
}
}
if(!wroteEvent) {
drawEventName("");
}
if(DESIGN === 0) {
} else if(DESIGN === 1) {
var inner = document.body.clientWidth / 2 - thickness;
@ -668,18 +676,32 @@ var flagDigital = true;
}
function eventNow(event, hour, minute) {
if( event.startDateTime.time.hour <= hour &&
event.startDateTime.time.minute <= minute &&
event.stopDateTime.time.hour >= hour &&
event.stopDateTime.time.minute >= minute) {
if( ((event.startDateTime.time.hour < hour) ||
(event.startDateTime.time.hour <= hour &&
event.startDateTime.time.minute <= minute)) ) {
console.log("start before");
}
if( ((event.stopDateTime.time.hour > hour) ||
(event.stopDateTime.time.hour >= hour &&
event.stopDateTime.time.minute >= minute)) ) {
console.log("stop after");
}
if( ((event.startDateTime.time.hour < hour) ||
(event.startDateTime.time.hour <= hour &&
event.startDateTime.time.minute <= minute)) &&
((event.stopDateTime.time.hour > hour) ||
(event.stopDateTime.time.hour >= hour &&
event.stopDateTime.time.minute >= minute)) ){
return true;
}
return false;
}
function drawEventName(event) {
function drawEventName(name) {
var strEvent = document.getElementById("str-event");
strEvent.innerHTML = event.name;
strEvent.innerHTML = name;
}
function drawDigitalWatch(datetime) {