Skip to content

Commit 507bfbe

Browse files
committed
changed icons
1 parent a507578 commit 507bfbe

File tree

172 files changed

+15
-6
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+15
-6
lines changed

conf/icons/classic/msg.png

0 Bytes

conf/icons/classic/selfalarm.png

0 Bytes
0 Bytes

conf/icons/classic/selfbattery-0.png

0 Bytes

conf/icons/classic/selfbattery-10.png

0 Bytes
0 Bytes

conf/icons/classic/selfbattery-20.png

0 Bytes

conf/icons/classic/selfbattery-30.png

0 Bytes

conf/icons/classic/selfbattery-40.png

0 Bytes

conf/icons/classic/selfbattery-50.png

0 Bytes

conf/icons/classic/selfbattery-60.png

0 Bytes

conf/icons/classic/selfbattery-70.png

0 Bytes

conf/icons/classic/selfbattery-80.png

0 Bytes

conf/icons/classic/selfbattery-90.png

0 Bytes

conf/icons/classic/selfbattery.png

0 Bytes

conf/icons/classic/selfbed.png

0 Bytes

conf/icons/classic/selfbell.png

0 Bytes

conf/icons/classic/selfbypass-0.png

0 Bytes

conf/icons/classic/selfbypass-1.png

0 Bytes

conf/icons/classic/selfbypass.png

0 Bytes

conf/icons/classic/selfcalendar.png

0 Bytes

conf/icons/classic/selfcouch.png

0 Bytes
0 Bytes

conf/icons/classic/selfdoor-open.png

0 Bytes

conf/icons/classic/selfdoor.png

0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes

conf/icons/classic/selfheating.png

0 Bytes

conf/icons/classic/selfhouse1.png

0 Bytes

conf/icons/classic/selflight-0.png

0 Bytes

conf/icons/classic/selflight-10.png

0 Bytes

conf/icons/classic/selflight-100.png

0 Bytes

conf/icons/classic/selflight-20.png

0 Bytes

conf/icons/classic/selflight-30.png

0 Bytes

conf/icons/classic/selflight-40.png

0 Bytes

conf/icons/classic/selflight-50.png

0 Bytes

conf/icons/classic/selflight-60.png

0 Bytes

conf/icons/classic/selflight-70.png

0 Bytes

conf/icons/classic/selflight-80.png

0 Bytes

conf/icons/classic/selflight-90.png

0 Bytes

conf/icons/classic/selflight-off.png

0 Bytes

conf/icons/classic/selflight-on.png

0 Bytes

conf/icons/classic/selflight.png

0 Bytes
0 Bytes
0 Bytes
233 Bytes
1.9 KB
233 Bytes
233 Bytes
4.28 KB
4.06 KB
4.1 KB
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes

conf/icons/classic/selfshield-off.png

0 Bytes

conf/icons/classic/selfshield.png

0 Bytes

conf/icons/classic/selfsun.png

0 Bytes

conf/icons/classic/selfwater-off.png

0 Bytes
0 Bytes
0 Bytes

conf/icons/classic/selfwindow.png

0 Bytes

conf/icons/classic/trashpresent.png

0 Bytes
0 Bytes
0 Bytes

python/shared/helper.py

+8-2
Original file line numberDiff line numberDiff line change
@@ -501,8 +501,12 @@ def getUserByStateItem(stateItem):
501501

502502
@staticmethod
503503
def getPresentUser(timeout = None):
504+
return list(UserHelper.getPresentUserData(timeout).keys())
505+
506+
@staticmethod
507+
def getPresentUserData(timeout = None):
504508
ref = ZonedDateTime.now().minusSeconds(timeout) if timeout is not None else None
505-
usernames = []
509+
usernames = {}
506510
for userName in userConfigs:
507511
if not userConfigs[userName]["state_item"]:
508512
continue
@@ -515,8 +519,10 @@ def getPresentUser(timeout = None):
515519
_update = getItemLastUpdate(stateItem)
516520
if _update.isBefore(ref):
517521
continue
522+
else:
523+
_update = None
518524

519-
usernames.append(userName)
525+
usernames[userName] = {"stateItem": stateItem, "lastUpdate": _update}
520526
return usernames
521527

522528
@staticmethod

svg/build/png/msg.png

0 Bytes

svg/build/png/selfalarm.png

0 Bytes

svg/build/png/selfautomode-off.png

0 Bytes

svg/build/png/selfbattery-0.png

0 Bytes

svg/build/png/selfbattery-10.png

0 Bytes

svg/build/png/selfbattery-100.png

0 Bytes

svg/build/png/selfbattery-20.png

0 Bytes

svg/build/png/selfbattery-30.png

0 Bytes

svg/build/png/selfbattery-40.png

0 Bytes

svg/build/png/selfbattery-50.png

0 Bytes

svg/build/png/selfbattery-60.png

0 Bytes

svg/build/png/selfbattery-70.png

0 Bytes

svg/build/png/selfbattery-80.png

0 Bytes

svg/build/png/selfbattery-90.png

0 Bytes

svg/build/png/selfbattery.png

0 Bytes

svg/build/png/selfbed.png

0 Bytes

svg/build/png/selfbell.png

0 Bytes

svg/build/png/selfbypass-0.png

0 Bytes

svg/build/png/selfbypass-1.png

0 Bytes

svg/build/png/selfbypass.png

0 Bytes

svg/build/png/selfcalendar.png

0 Bytes

svg/build/png/selfcouch.png

0 Bytes

svg/build/png/selfdoor-closed.png

0 Bytes

svg/build/png/selfdoor-open.png

0 Bytes

svg/build/png/selfdoor.png

0 Bytes

svg/build/png/selffilterextern-1.png

0 Bytes

svg/build/png/selffilterextern.png

0 Bytes

svg/build/png/selffilterintern-1.png

0 Bytes

svg/build/png/selffilterintern.png

0 Bytes

svg/build/png/selfheating.png

0 Bytes

svg/build/png/selfhouse1.png

0 Bytes

svg/build/png/selflight-0.png

0 Bytes

svg/build/png/selflight-10.png

0 Bytes

svg/build/png/selflight-100.png

0 Bytes

svg/build/png/selflight-20.png

0 Bytes

svg/build/png/selflight-30.png

0 Bytes

svg/build/png/selflight-40.png

0 Bytes

svg/build/png/selflight-50.png

0 Bytes

svg/build/png/selflight-60.png

0 Bytes

svg/build/png/selflight-70.png

0 Bytes

svg/build/png/selflight-80.png

0 Bytes

svg/build/png/selflight-90.png

0 Bytes

svg/build/png/selflight-off.png

0 Bytes

svg/build/png/selflight-on.png

0 Bytes

svg/build/png/selflight.png

0 Bytes

svg/build/png/selfnotification-1.png

0 Bytes

svg/build/png/selfnotification-2.png

0 Bytes

svg/build/png/selfnotification-3.png

233 Bytes
1.9 KB

svg/build/png/selfnotification-on.png

233 Bytes

svg/build/png/selfnotification.png

233 Bytes
4.28 KB

svg/build/png/selfnotification2.png

4.06 KB

svg/build/png/selfnotification3.png

4.1 KB
0 Bytes
0 Bytes

svg/build/png/selfrollershutter-0.png

0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes
0 Bytes

svg/build/png/selfrollershutter.png

0 Bytes

svg/build/png/selfshield-off.png

0 Bytes

svg/build/png/selfshield.png

0 Bytes

svg/build/png/selfsun.png

0 Bytes

svg/build/png/selfwater-off.png

0 Bytes

svg/build/png/selfwindow-closed.png

0 Bytes

svg/build/png/selfwindow-open.png

0 Bytes

svg/build/png/selfwindow.png

0 Bytes

svg/build/png/trashpresent.png

0 Bytes
0 Bytes

svg/build/png/whitegood_washer.png

0 Bytes

svg/final_svg/selfnotification-3.svg

+1-1
+1-1

svg/final_svg/selfnotification-on.svg

+1-1

0 commit comments

Comments
 (0)