From 3c61041a519f48bd0c1a8ab69f9df1c4a4b12331 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 21 Nov 2019 21:23:25 +0300
Subject: [PATCH] upgrade to latest

---
 appdaemon/settings/appdaemon.yaml                  |  4 ++++
 appdaemon/settings/apps/groups/groups.py           |  2 +-
 appdaemon/settings/apps/notifiers/balance.yaml     |  2 +-
 .../settings/apps/presence/homekit/worktime.py     | 14 +++++++++++---
 appdaemon/settings/apps/test.py                    |  1 +
 docker-compose.yml                                 | 10 +++++-----
 hass/settings/configuration.yaml                   |  2 +-
 .../input/input_boolean/automation_control.yaml    |  5 +++++
 hass/settings/ui-lovelace.yaml                     |  1 +
 9 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/appdaemon/settings/appdaemon.yaml b/appdaemon/settings/appdaemon.yaml
index d9dbb2a..098edc1 100644
--- a/appdaemon/settings/appdaemon.yaml
+++ b/appdaemon/settings/appdaemon.yaml
@@ -2,6 +2,10 @@ logs:
   main_log:
     filename: STDOUT
 
+namespaces:
+  - worktime_namespace:
+      writeback: safe
+
 appdaemon:
   threads: 10
   latitude: !secret home_latitude
diff --git a/appdaemon/settings/apps/groups/groups.py b/appdaemon/settings/apps/groups/groups.py
index adca933..9d9b194 100644
--- a/appdaemon/settings/apps/groups/groups.py
+++ b/appdaemon/settings/apps/groups/groups.py
@@ -58,7 +58,7 @@ class Groups(hass.Hass):
     self.set_state(name,state="on",attributes={"view": view,"hidden": hidden,"assumed_state": assumed_state,"friendly_name": friendly_name,"entity_id": entitylist, 'description': 'Created and updated from appdaemon ({})'.format(__name__)})
   
   def sortByFriendlyName(self, entity):
-    return self.get_state(entity, 'friendly_name')
+    return self.get_state(entity, attribute='friendly_name')
 
   def append_entity(self, entitylist, entity, expand_group):
     entity = entity.lower()
diff --git a/appdaemon/settings/apps/notifiers/balance.yaml b/appdaemon/settings/apps/notifiers/balance.yaml
index b489ade..7a3e87c 100644
--- a/appdaemon/settings/apps/notifiers/balance.yaml
+++ b/appdaemon/settings/apps/notifiers/balance.yaml
@@ -4,10 +4,10 @@
 balance_low_report:
   class: Balance
   module: balance
+  constraint: input_boolean.balance_report
   entity_ids:
     mosenergosbyt_balance: sensor.power_mosenergosbyt_balance
     epd_balance: sensor.epd_balance
-
   always_send: 0
   threshold: -100
   notify: telegram_monster
diff --git a/appdaemon/settings/apps/presence/homekit/worktime.py b/appdaemon/settings/apps/presence/homekit/worktime.py
index 02f343d..2e83b24 100644
--- a/appdaemon/settings/apps/presence/homekit/worktime.py
+++ b/appdaemon/settings/apps/presence/homekit/worktime.py
@@ -23,20 +23,25 @@ class WorkTime(hass.Hass):
   notify_before_leave_in_minutes = 15
   notify_every_seconds = 300
   timers = []
-
+  listen_event_handle_list = []
+  
   def initialize(self):
     if 'notify' not in self.args or "arrive_event" not in self.args or "leave_event" not in self.args:
       self.error("Please provide arrive_event, leave_event in config!")
       return
-    self.listen_event(self.arrive_event, self.args['arrive_event'])
-    self.listen_event(self.leave_event, self.args['leave_event'])
+    self.listen_event_handle_list.append(self.listen_event(self.arrive_event, self.args['arrive_event']))
+    self.listen_event_handle_list.append(self.listen_event(self.leave_event, self.args['leave_event']))
     self.run_daily(self.reset_timer_tick, self.parse_time("23:59:59"))
     self.load_state()
     self.run_timer()
 
+  def terminate(self):
+    self.cancel_timers()
+
   def arrive_event(self, event_id, event_args, kwargs):
     if self.arrive_time != None:
       self.log('You have already arrived to the work today at {}'.format(self.arrive_time))
+      self.notify("Добро пожаловать в офис еще раз. Сегодня работаешь до {}.".format(self.format_time(self.leave_time)), name = self.args['notify'])
       self.run_timer()
       return
 
@@ -58,6 +63,9 @@ class WorkTime(hass.Hass):
     timer_start = self.notify_time
     if timer_start<self.datetime():
       timer_start=self.datetime()+datetime.timedelta(seconds=self.notify_every_seconds)
+    timers_count = len(self.timers)
+    self.cancel_timers()
+    self.log("Canceling previous timers({}), start notify timer at: {}".format(timers_count, timer_start))
     self.timers.append(self.run_every(self.timer_tick, timer_start, self.notify_every_seconds))
 
   def leave_event(self, event_id, event_args, kwargs):
diff --git a/appdaemon/settings/apps/test.py b/appdaemon/settings/apps/test.py
index c37ebd3..265b94b 100644
--- a/appdaemon/settings/apps/test.py
+++ b/appdaemon/settings/apps/test.py
@@ -4,6 +4,7 @@ from notification import send_notification
 import datetime
 import sys, locale
 import logging, codecs
+import os
 #import unicode
 # from automation import Automation  # type: ignore
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 68d0c57..3c9556a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -44,7 +44,7 @@ services:
         max-size: 50m 
 
   hass:
-    image: homeassistant/home-assistant:0.100.3
+    image: homeassistant/home-assistant:latest #0.100.3
     container_name: hass
     volumes:
       - ./hass/settings:/config
@@ -187,7 +187,7 @@ services:
       options:
         max-size: 50m
 
-networks:
-  traefik:
-    external:
-      name: my-pre-existing-network
+# networks:
+#   traefik:
+#     external:
+#       name: my-pre-existing-network
diff --git a/hass/settings/configuration.yaml b/hass/settings/configuration.yaml
index 6ab1c1b..e8f7d39 100644
--- a/hass/settings/configuration.yaml
+++ b/hass/settings/configuration.yaml
@@ -17,7 +17,7 @@ logger:
 api:
 
 http:
-  api_password: !secret ha_password
+  # api_password: !secret ha_password
   base_url: !secret base_url
   use_x_forwarded_for: true
   trusted_proxies:
diff --git a/hass/settings/configuration/input/input_boolean/automation_control.yaml b/hass/settings/configuration/input/input_boolean/automation_control.yaml
index 3776966..dde40ae 100644
--- a/hass/settings/configuration/input/input_boolean/automation_control.yaml
+++ b/hass/settings/configuration/input/input_boolean/automation_control.yaml
@@ -28,6 +28,11 @@ water_counters_report:
   icon: mdi:alert-octagon
   initial: on
 
+balance_report:
+  name: Отчет о балансе
+  icon: mdi:alert-octagon
+  initial: on
+
 work_presence_report:
   name: Отчет 'пора домой'
   icon: mdi:account-alert
diff --git a/hass/settings/ui-lovelace.yaml b/hass/settings/ui-lovelace.yaml
index 855003d..89b8128 100644
--- a/hass/settings/ui-lovelace.yaml
+++ b/hass/settings/ui-lovelace.yaml
@@ -353,6 +353,7 @@ views:
           - input_boolean.water_counters_report
           - input_boolean.work_presence_report
           - input_boolean.lock_report
+          - input_boolean.balance_report
       - type: entities
         title: "Метки"
         show_header_toggle: true