From f53a9209eb3b009ba0ecc68971a9e18e16222468 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 08:43:30 +0100 Subject: [PATCH 1/9] add title option switches --- server.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server.py b/server.py index c3178c9..438ff1a 100755 --- a/server.py +++ b/server.py @@ -42,6 +42,7 @@ def generatePage(): if not match: blockValues[component] = retrieveValue(requestedRoute, component) else: + blockValues[match.group(1)] = retrieveValue(requestedRoute, component) blockArray.append(blockValues) blockValues = {} @@ -67,6 +68,7 @@ def retrieveValue(page, component): dict[k] = v else: for sk, sv in config[page][match.group(1)][match.group(2)].iteritems(): + sv.append(match.group(2)) sv = strToList(sv) dict[sk] = sv except: From fe7897bd8b4d94675257189228e753bfe360cc11 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 08:43:50 +0100 Subject: [PATCH 2/9] add title option switches --- templates/switches.html | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/switches.html b/templates/switches.html index a514ff1..8bed10c 100644 --- a/templates/switches.html +++ b/templates/switches.html @@ -2,7 +2,7 @@
-

Schakelaars

+

Schakelaars

    • @@ -79,7 +79,11 @@ $(document).ready(function() { var updateSwitches_block_{{count}}=[]; var updateDimmers_block_{{count}}=[]; var updateSetpoints_block_{{count}}=[]; + {% for k, v in blockArray[count]["switches"].iteritems() %} + {% if v[2] %} + $('#s_title_{{ count }}').html("{{ v[2] }}"); + {% endif %} {% if v[1] == "switch" %} $('input[id="switch_{{v[0]}}_block_{{count}}"]').on('switchChange.bootstrapSwitch', function(event, state) { changeSwitch(this, {{v[0]}}); From 8d3a915f0a1f022b7d6fc0bcd79fcabc20c0b56e Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 10:46:46 +0100 Subject: [PATCH 3/9] Added title feature from config --- templates/camera.html | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/templates/camera.html b/templates/camera.html index c98d7a6..7899888 100644 --- a/templates/camera.html +++ b/templates/camera.html @@ -1,7 +1,7 @@
    -

    Camera System

    +

    Camera System

      • @@ -10,14 +10,16 @@

    - + {% for k, v in blockArray[count]["camera"].iteritems() %} + {% if v[1] %} + + {% endif %}
    - +
    -
    {% endfor %} From 62b69e6ade7008c6b509a79a36fc110df4c489cf Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 10:46:59 +0100 Subject: [PATCH 4/9] Added title feature from config --- templates/map.html | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/templates/map.html b/templates/map.html index d87cd6d..35f74be 100644 --- a/templates/map.html +++ b/templates/map.html @@ -1,7 +1,7 @@
    -

    Locatie

    +

    Locatie

      • @@ -21,6 +21,9 @@ $(document).ready(function() { var location=[]; {% for k, v in blockArray[count]["map"].iteritems() %} + {% if v[1] %} + $('#s_title_{{ count }}').html("{{ v[1] }}"); + {% endif %} location.push("{{v[0]}}"); {% endfor %} refreshMapLocation(location, "locationIframe-{{count}}"); From 91ed81d498a46a054525880930f6af20929557dc Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 10:47:21 +0100 Subject: [PATCH 5/9] resolved small bug from title feature --- server.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/server.py b/server.py index 438ff1a..0118997 100755 --- a/server.py +++ b/server.py @@ -68,7 +68,10 @@ def retrieveValue(page, component): dict[k] = v else: for sk, sv in config[page][match.group(1)][match.group(2)].iteritems(): - sv.append(match.group(2)) + if type(sv) is list: + sv.append(match.group(2)) + else: + sv = [sv, match.group(2)] sv = strToList(sv) dict[sk] = sv except: From 6a34f11d6617ef89131aece7ba1c4c6f6f0f39a5 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 11:34:55 +0100 Subject: [PATCH 6/9] cleaned up code --- server.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/server.py b/server.py index 0118997..49a73d9 100755 --- a/server.py +++ b/server.py @@ -68,11 +68,8 @@ def retrieveValue(page, component): dict[k] = v else: for sk, sv in config[page][match.group(1)][match.group(2)].iteritems(): - if type(sv) is list: - sv.append(match.group(2)) - else: - sv = [sv, match.group(2)] sv = strToList(sv) + sv.append(match.group(2)) dict[sk] = sv except: dict = {} From bc1c791c9a4372f4186904ac7beb76eaf76e56d1 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 2 Jan 2017 13:02:42 +0100 Subject: [PATCH 7/9] Added error message if dependencies are not installed --- modules/api.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/api.py b/modules/api.py index e312f3c..41266e5 100644 --- a/modules/api.py +++ b/modules/api.py @@ -38,8 +38,9 @@ def loadPlugins(): try: plugin[name] = imp.load_source(name, plugin_dir + i) plugin[name].init() - except ImportError: + except ImportError as msg: print "Error occured during loading imports for the plugin " + name + ". Please check whether all dependecies are installed" + print msg sys.exit() return plugin From 8f9d84aeac233fd317988e7b6b34ca343b6ac838 Mon Sep 17 00:00:00 2001 From: wez3 Date: Mon, 2 Jan 2017 18:56:17 +0100 Subject: [PATCH 8/9] Code cleanup --- modules/api.py | 4 +--- server.py | 1 - templates/camera.html | 1 - 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/modules/api.py b/modules/api.py index 41266e5..4300d2a 100644 --- a/modules/api.py +++ b/modules/api.py @@ -39,9 +39,7 @@ def loadPlugins(): plugin[name] = imp.load_source(name, plugin_dir + i) plugin[name].init() except ImportError as msg: - print "Error occured during loading imports for the plugin " + name + ". Please check whether all dependecies are installed" - print msg - sys.exit() + sys.exit("Error occured during loading imports for the plugin {}: {}".format(name, msg)) return plugin @login_required() diff --git a/server.py b/server.py index 49a73d9..a24ee2e 100755 --- a/server.py +++ b/server.py @@ -42,7 +42,6 @@ def generatePage(): if not match: blockValues[component] = retrieveValue(requestedRoute, component) else: - blockValues[match.group(1)] = retrieveValue(requestedRoute, component) blockArray.append(blockValues) blockValues = {} diff --git a/templates/camera.html b/templates/camera.html index 7899888..2d367df 100644 --- a/templates/camera.html +++ b/templates/camera.html @@ -10,7 +10,6 @@

    - {% for k, v in blockArray[count]["camera"].iteritems() %} {% if v[1] %} From 3bbadc17914bbec5c4290ac17c84290375243fde Mon Sep 17 00:00:00 2001 From: wez3 Date: Mon, 2 Jan 2017 19:11:47 +0100 Subject: [PATCH 9/9] Remove camera label --- templates/camera.html | 2 -- 1 file changed, 2 deletions(-) diff --git a/templates/camera.html b/templates/camera.html index 2d367df..d0e63fb 100644 --- a/templates/camera.html +++ b/templates/camera.html @@ -16,8 +16,6 @@ {% endif %}
    - -