From b17fd3b7a9b4cfd81efeeec9aefd3f80a7a39617 Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:41:59 +1000 Subject: [PATCH 1/7] Update pialert.py --- back/pialert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/pialert.py b/back/pialert.py index 98459dad..72d20ba8 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -711,7 +711,7 @@ def print_scan_stats (): sql.execute("SELECT * FROM Devices") History_All = sql.fetchall() History_All_Devices = len(History_All) - sql.execute("SELECT * FROM CurrentScan") + sql.execute("SELECT * FROM Devices WHERE dev_PresentLastScan is True") History_Online = sql.fetchall() History_Online_Devices = len(History_Online) History_Offline_Devices = History_All_Devices - History_Online_Devices From 24495bc67590b62eadd832fa144e9b0fdad5865b Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:48:37 +1000 Subject: [PATCH 2/7] Update dark-patch.css Remove white borders around table on mobile. Fix border radius for the status boxs. --- front/css/dark-patch.css | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css index acba4e05..66c61c94 100644 --- a/front/css/dark-patch.css +++ b/front/css/dark-patch.css @@ -677,3 +677,15 @@ input[type="password"]::-webkit-caps-lock-indicator { width: 100%; margin: auto; } + + +.box-body { + border: 0px; +} +.table-responsive { + border: 0px; +} +.pa-small-box-footer { + border-bottom-left-radius: 10px; + border-bottom-right-radius: 10px; +} From e7aa1cdb3571891eb1ccd716f0409ed2dc314580 Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 15:50:20 +1000 Subject: [PATCH 3/7] Update dark-patch.css --- front/css/dark-patch.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css index 66c61c94..f8682978 100644 --- a/front/css/dark-patch.css +++ b/front/css/dark-patch.css @@ -678,13 +678,15 @@ input[type="password"]::-webkit-caps-lock-indicator { margin: auto; } - +/* remove white border that appears on mobile screen sizes */ .box-body { border: 0px; } +/* remove white border that appears on mobile screen sizes */ .table-responsive { border: 0px; } +/* Add border radius to bottom of the status boxes*/ .pa-small-box-footer { border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; From c3404e48f2cf2af465b561382c555540ac2ef22b Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:26:55 +1000 Subject: [PATCH 4/7] New look --- front/css/dark-patch.css | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css index f8682978..0f5b49c0 100644 --- a/front/css/dark-patch.css +++ b/front/css/dark-patch.css @@ -611,6 +611,7 @@ input[type="password"]::-webkit-caps-lock-indicator { /*** Additional fixes For Pi.Alert UI ***/ .small-box { border-radius: 10px; + border-top: 0px; } .pa-small-box-aqua .inner { background-color: rgb(45,108,133); @@ -691,3 +692,15 @@ input[type="password"]::-webkit-caps-lock-indicator { border-bottom-left-radius: 10px; border-bottom-right-radius: 10px; } + +.small-box > .inner h3 { + margin-bottom: 0px; + margin-left: 0px; +} +.small-box:hover .icon { + font-size: 3.9em; +} +.small-box .icon { + top: 0.01em; + font-size: 3.25em; +} From dac75f01261bac5b0a9f84982f91e60359303e2c Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:30:46 +1000 Subject: [PATCH 5/7] Update dark-patch.css --- front/css/dark-patch.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css index 0f5b49c0..61ba47bc 100644 --- a/front/css/dark-patch.css +++ b/front/css/dark-patch.css @@ -698,7 +698,7 @@ input[type="password"]::-webkit-caps-lock-indicator { margin-left: 0px; } .small-box:hover .icon { - font-size: 3.9em; + font-size: 3.7em; } .small-box .icon { top: 0.01em; From 43c4d153f41901edf7ebd1a21b8143089d28b7f6 Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 18:31:08 +1000 Subject: [PATCH 6/7] Update dark-patch.css --- front/css/dark-patch.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/front/css/dark-patch.css b/front/css/dark-patch.css index 61ba47bc..2ea92e6c 100644 --- a/front/css/dark-patch.css +++ b/front/css/dark-patch.css @@ -698,7 +698,7 @@ input[type="password"]::-webkit-caps-lock-indicator { margin-left: 0px; } .small-box:hover .icon { - font-size: 3.7em; + font-size: 3.74em; } .small-box .icon { top: 0.01em; From 51027f6b305057c40595cf39af72d7286c10e856 Mon Sep 17 00:00:00 2001 From: Joshua <63589370+Final-Hawk@users.noreply.github.com> Date: Sun, 17 Jul 2022 19:16:33 +1000 Subject: [PATCH 7/7] Update SQL statement to correct one --- back/pialert.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/back/pialert.py b/back/pialert.py index 72d20ba8..b322a6f1 100644 --- a/back/pialert.py +++ b/back/pialert.py @@ -711,7 +711,7 @@ def print_scan_stats (): sql.execute("SELECT * FROM Devices") History_All = sql.fetchall() History_All_Devices = len(History_All) - sql.execute("SELECT * FROM Devices WHERE dev_PresentLastScan is True") + sql.execute("""SELECT * FROM CurrentScan WHERE cur_ScanCycle = ? """, (cycle,)) History_Online = sql.fetchall() History_Online_Devices = len(History_Online) History_Offline_Devices = History_All_Devices - History_Online_Devices