summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorUdo Walter2019-04-16 13:20:22 +0200
committerUdo Walter2019-04-16 13:20:22 +0200
commitde549043d5721fd9f332fd69d83269fe19a479c7 (patch)
treedec3d7c37bcd17fd1d230f48e1143de774e6614c /server
parent[server/external-backends] Add dhcp update method & object mapping from exist... (diff)
downloadbas-de549043d5721fd9f332fd69d83269fe19a479c7.tar.gz
bas-de549043d5721fd9f332fd69d83269fe19a479c7.tar.xz
bas-de549043d5721fd9f332fd69d83269fe19a479c7.zip
eslint fixes
Diffstat (limited to 'server')
-rw-r--r--server/lib/eventhelper.js8
-rw-r--r--server/lib/grouphelper.js8
2 files changed, 7 insertions, 9 deletions
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), {}, {})
}