Skip to content

Issue 17 filter date timezone comparison #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexschwantes wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Issue 17 filter date timezone comparison #18

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f661f59
Changed date and time comparison to be in the local time as opposed t…
alexschwantes Dec 27, 2016
683bc63
Fixed another issue where if the event ended at midnight, its calcula…
alexschwantes Dec 27, 2016
5472468
removed some unnecessary code as it is not used any more.
alexschwantes Dec 27, 2016
3876690
Merge branch 'master' into issue-17-filter-date-timezone-comparison
alexschwantes Jan 7, 2017
3a2c1e0
Update time-filter.js
alexschwantes Jan 7, 2017
0510262
Update time-filter.js
alexschwantes Jan 7, 2017
646594c
minor update on debug messages to output as date.toLocalString() to d…
alexschwantes Jan 22, 2017
19c40fe
Merge branch 'issue-17-filter-date-timezone-comparison' of https://gi…
alexschwantes Jan 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions time-filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,7 @@ module.exports = function(RED) {

node.on('input', function(msg){
var now = new Date();
var day = now.getUTCDay();
var hour = now.getUTCHours();
var mins = now.getUTCMinutes();
var day = now.getDay();
var allowed = false;
for (var i=0; i< node.events.length; i++) {
var evtStart = new Date();
Expand All @@ -60,22 +58,26 @@ module.exports = function(RED) {
evtEnd.setTime(Date.parse(node.events[i].end));

// console.log("Now: ", now);
// console.log("Now hour: ", hour);
// console.log("Now mins: ", mins);
// console.log("Start: ",evtStart);
// console.log("Start hour: ",evtStart.getUTCHours());
// console.log("Start mins: ",evtStart.getUTCMinutes());
// console.log("End: ",evtEnd);
// console.log("evtStart.getDay(): ",evtStart.getDay());
// console.log("day: ",day);

if (evtStart.getUTCDay() === day) { //same day of week
evtStart.setFullYear(now.getFullYear(),now.getUTCMonth(), now.getUTCDate());
evtEnd.setFullYear(now.getFullYear(),now.getUTCMonth(), now.getUTCDate());

var start = ((evtStart.getUTCHours() * 60) + evtStart.getUTCMinutes());
var end = ((evtEnd.getUTCHours() * 60) + evtEnd.getUTCMinutes());
var test = ((hour * 60) + mins);
if (evtStart.getDay() === day) { //same day of week
evtStart.setFullYear(now.getFullYear(),now.getMonth(), now.getDate());
// if event ends at midnight, need to add an extra day to the end date
var midnight = 0;
if(evtEnd.getHours() + evtEnd.getMinutes() == 0) {
midnight = 1;
}
evtEnd.setFullYear(now.getFullYear(),now.getMonth(), now.getDate() + midnight);

// console.log("---------");
// console.log("evtStart: ", evtStart.toLocaleString());
// console.log("evtEnd: ", evtEnd.toLocaleString());
// console.log("now: ", now.toLocaleString());

if (test >= start && test <= end) {
if (now >= evtStart && now <= evtEnd) {
allowed = true;
node.send([[msg],[]]);
break;
Expand Down