Add support for parent blocked times

This commit is contained in:
Jonas Lochmann
2019-08-25 09:36:31 +02:00
parent 32d278bdd5
commit 1969fe4042
15 changed files with 363 additions and 8 deletions
+6 -3
View File
@@ -123,7 +123,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
'currentDevice',
'categoryForNotAssignedApps',
'relaxPrimaryDeviceRule',
'mailNotificationFlags'
'mailNotificationFlags',
'blockedTimes'
],
transaction
})).map((item) => ({
@@ -138,7 +139,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
currentDevice: item.currentDevice,
categoryForNotAssignedApps: item.categoryForNotAssignedApps,
relaxPrimaryDeviceRule: item.relaxPrimaryDeviceRule,
mailNotificationFlags: item.mailNotificationFlags
mailNotificationFlags: item.mailNotificationFlags,
blockedTimes: item.blockedTimes
}))
result.users = {
@@ -155,7 +157,8 @@ export const generateServerDataStatus = async ({ database, clientStatus, familyI
currentDevice: item.currentDevice,
categoryForNotAssignedApps: item.categoryForNotAssignedApps,
relaxPrimaryDevice: item.relaxPrimaryDeviceRule,
mailNotificationFlags: item.mailNotificationFlags
mailNotificationFlags: item.mailNotificationFlags,
blockedTimes: item.blockedTimes
}))
}
}