render template scheduler settings
This commit is contained in:
parent
5155b7d790
commit
e7cb18346b
12
server.py
12
server.py
@ -168,7 +168,7 @@ def index():
|
|||||||
timeString = now.strftime("%Y-%m-%d %H:%M")
|
timeString = now.strftime("%Y-%m-%d %H:%M")
|
||||||
logos_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos')
|
logos_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'logos')
|
||||||
LogoList = os.listdir(logos_path)
|
LogoList = os.listdir(logos_path)
|
||||||
|
|
||||||
f = open('csv/stocks_settings.json', 'r')
|
f = open('csv/stocks_settings.json', 'r')
|
||||||
stocks_settings = json.load(f)
|
stocks_settings = json.load(f)
|
||||||
f.close()
|
f.close()
|
||||||
@ -241,7 +241,12 @@ def index():
|
|||||||
general_settings = json.load(f)
|
general_settings = json.load(f)
|
||||||
f.close()
|
f.close()
|
||||||
|
|
||||||
|
try:
|
||||||
|
f = open('csv/scheduler.json','r')
|
||||||
|
scheduler_settings = json.load(f)
|
||||||
|
f.close()
|
||||||
|
except:
|
||||||
|
scheduler_settings = ''
|
||||||
|
|
||||||
try: # incase this doesnt exist
|
try: # incase this doesnt exist
|
||||||
api_keys = api_key2[1]
|
api_keys = api_key2[1]
|
||||||
@ -298,7 +303,8 @@ def index():
|
|||||||
'movie_api_key':movie_api_key,
|
'movie_api_key':movie_api_key,
|
||||||
'ipo_api_key':ipo_api_key,
|
'ipo_api_key':ipo_api_key,
|
||||||
'wifi_SSID':wifi_SSID,
|
'wifi_SSID':wifi_SSID,
|
||||||
'wifi_PSK':wifi_PSK
|
'wifi_PSK':wifi_PSK,
|
||||||
|
'scheduler_settings':scheduler_settings
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user