From de549043d5721fd9f332fd69d83269fe19a479c7 Mon Sep 17 00:00:00 2001 From: Udo Walter Date: Tue, 16 Apr 2019 11:20:22 +0000 Subject: eslint fixes --- server/lib/eventhelper.js | 8 +++++--- server/lib/grouphelper.js | 8 ++------ 2 files changed, 7 insertions(+), 9 deletions(-) (limited to 'server') diff --git a/server/lib/eventhelper.js b/server/lib/eventhelper.js index 0986b25..557d89f 100644 --- a/server/lib/eventhelper.js +++ b/server/lib/eventhelper.js @@ -1,6 +1,6 @@ -/* global __appdir */ -var path = require('path') -var db = require(path.join(__appdir, 'lib', 'sequelize')) +// /* global __appdir */ +// var path = require('path') +// var db = require(path.join(__appdir, 'lib', 'sequelize')) const later = require('later') function isActive (eventData) { @@ -51,3 +51,5 @@ function _setUpSchedule (eventData, schedule) { else if (type === 'week') schedule.weekOfYear() else schedule.dayOfYear() } + +module.exports = { isActive, getTimeSpans, getStartTimes } diff --git a/server/lib/grouphelper.js b/server/lib/grouphelper.js index 417c1d1..94ee09e 100644 --- a/server/lib/grouphelper.js +++ b/server/lib/grouphelper.js @@ -5,12 +5,8 @@ var db = require(path.join(__appdir, 'lib', 'sequelize')) async function getAllChildren (groups, groupBlacklist, clientBlacklist) { const knownGroupMap = {} const knownClientMap = {} - if (groupBlacklist) groupBlacklist.forEach(group => { - knownGroupMap[group.id] = true - }) - if (clientBlacklist) clientBlacklist.forEach(client => { - knownGroupMap[client.id] = true - }) + if (groupBlacklist) groupBlacklist.forEach(group => { knownGroupMap[group.id] = true }) + if (clientBlacklist) clientBlacklist.forEach(client => { knownClientMap[client.id] = true }) return getAllChildrenByIds(groups.map(x => x.id), {}, {}) } -- cgit v1.2.3-55-g7522