From 15433961754f869c2fc4e9584674984f452a780a Mon Sep 17 00:00:00 2001 From: MWicenec Date: Mon, 4 Nov 2024 15:11:56 +0800 Subject: [PATCH 1/7] fixed selection inspector in the graph config attributes table showing unknown --- src/GraphConfig.ts | 6 ++++++ src/ParameterTable.ts | 4 ++-- templates/parameter_table.html | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/GraphConfig.ts b/src/GraphConfig.ts index 35ecbf0b..b95767dc 100644 --- a/src/GraphConfig.ts +++ b/src/GraphConfig.ts @@ -6,6 +6,7 @@ import { EagleConfig } from "./EagleConfig"; import { Errors } from "./Errors"; import { Field } from "./Field"; import { LogicalGraph } from "./LogicalGraph"; +import { Utils } from "./Utils"; export class GraphConfig { private id: ko.Observable; @@ -377,6 +378,11 @@ export class GraphConfigField { return this.value(); } + toggle = () : GraphConfigField => { + this.value((!Utils.asBool(this.value())).toString()); + return this; + } + setComment = (comment: string): GraphConfigField => { this.comment(comment); return this; diff --git a/src/ParameterTable.ts b/src/ParameterTable.ts index e09606ff..03197db6 100644 --- a/src/ParameterTable.ts +++ b/src/ParameterTable.ts @@ -61,7 +61,7 @@ export class ParameterTable { return ""; } - if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable){ + if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable || Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.GraphConfigAttributesTable){ return ParameterTable.selectionParent().getDisplayText() + " - " + ParameterTable.selectionName(); } else { return "Unknown"; @@ -73,7 +73,7 @@ export class ParameterTable { return ""; } - if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable){ + if (Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.ParameterTable || Setting.findValue(Setting.BOTTOM_WINDOW_MODE) === Eagle.BottomWindowMode.GraphConfigAttributesTable){ return ParameterTable.selection(); } else { return "Unknown"; diff --git a/templates/parameter_table.html b/templates/parameter_table.html index ca43d923..d6bbdabc 100644 --- a/templates/parameter_table.html +++ b/templates/parameter_table.html @@ -224,7 +224,7 @@
Fields Table:
- + From 4a249801d9f09b91aa69a71a97eed46f7ea81bcc Mon Sep 17 00:00:00 2001 From: MWicenec Date: Mon, 4 Nov 2024 15:22:30 +0800 Subject: [PATCH 2/7] fixed several issues with the selector in the graph config attributes display and the boolean configured values --- templates/parameter_table.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/templates/parameter_table.html b/templates/parameter_table.html index d6bbdabc..70a906c1 100644 --- a/templates/parameter_table.html +++ b/templates/parameter_table.html @@ -214,7 +214,7 @@
Fields Table:
- + @@ -235,7 +235,7 @@
Fields Table:
- + @@ -316,7 +316,7 @@
Fields Table:
- + From f8aa1e7a9c25c9f1465df383d372f9d9fcf4961c Mon Sep 17 00:00:00 2001 From: MWicenec Date: Mon, 4 Nov 2024 15:27:10 +0800 Subject: [PATCH 3/7] fixed another bug --- templates/parameter_table.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/parameter_table.html b/templates/parameter_table.html index 70a906c1..5c648dbc 100644 --- a/templates/parameter_table.html +++ b/templates/parameter_table.html @@ -214,7 +214,7 @@
Fields Table:
- + @@ -224,7 +224,7 @@
Fields Table:
- + From 15ce6db3afc7f738e65a1056de4bebac00c2880f Mon Sep 17 00:00:00 2001 From: james-strauss-uwa Date: Mon, 4 Nov 2024 16:30:16 +0800 Subject: [PATCH 4/7] Fixed bug where code would try to set last graph config as active, even when no graph configs exist --- src/LogicalGraph.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/LogicalGraph.ts b/src/LogicalGraph.ts index 46afeca4..133d3a0d 100644 --- a/src/LogicalGraph.ts +++ b/src/LogicalGraph.ts @@ -221,7 +221,12 @@ export class LogicalGraph { //if the saved 'activeGraphConfigId' is empty or missing, we use the last one in the array, else we set the saved one as active if(dataObject["activeGraphConfigId"] === '' || dataObject["activeGraphConfigId"] === undefined){ - result.activeGraphConfigId(result.graphConfigs()[result.graphConfigs().length - 1].getId() as GraphConfig.Id) + // if graph has no configs, we can't use the last one in the array, so we'll set the active id to 'undefined' + if (result.graphConfigs().length === 0){ + result.activeGraphConfigId(undefined); + } else { + result.activeGraphConfigId(result.graphConfigs()[result.graphConfigs().length - 1].getId() as GraphConfig.Id) + } }else{ result.activeGraphConfigId(dataObject["activeGraphConfigId"] as GraphConfig.Id) } From 9876dce8b8f1fc46c7201a44f4f2e1214aeae638 Mon Sep 17 00:00:00 2001 From: MWicenec Date: Wed, 6 Nov 2024 10:05:41 +0800 Subject: [PATCH 5/7] fixed visual glitch with browse dockerhub button in parameter table --- static/base.css | 2 ++ static/tables.css | 9 --------- templates/parameter_table.html | 2 +- 3 files changed, 3 insertions(+), 10 deletions(-) diff --git a/static/base.css b/static/base.css index 5441babd..fc0abb8a 100644 --- a/static/base.css +++ b/static/base.css @@ -221,6 +221,7 @@ color: #00bb00;} } #bottomWindow{ + border-top: solid 2px black; background-color: #002349; width: 100%; height: 150px; @@ -1804,6 +1805,7 @@ ul.nav.navbat-nav .btn-outline-secondary:hover{ color: white; visibility: hidden; padding-left: 3px; + margin-bottom: -0.5px; pointer-events: none; } diff --git a/static/tables.css b/static/tables.css index 4743aebd..16ec1379 100644 --- a/static/tables.css +++ b/static/tables.css @@ -206,7 +206,6 @@ td:first-child input { #parameterTable .bottomWindowHeaderWrap{ border: none; justify-content: unset; - border-top: solid 2px black; height: 46px; } @@ -488,14 +487,6 @@ td:first-child input { cursor: col-resize; } - - - -#tableOpenDocker{ - position: absolute; - left: 160px; -} - #graphConfigurationsTableWrapper { } diff --git a/templates/parameter_table.html b/templates/parameter_table.html index 5c648dbc..e0a5903f 100644 --- a/templates/parameter_table.html +++ b/templates/parameter_table.html @@ -32,7 +32,7 @@
Fields Table:
- From ae9f0f22ed1cd007368814bbf324c767165d1caf Mon Sep 17 00:00:00 2001 From: MWicenec Date: Wed, 6 Nov 2024 11:26:54 +0800 Subject: [PATCH 6/7] fixed several css issues in the parameter table --- static/base.css | 5 - static/tables.css | 14 +- templates/parameter_table.html | 650 +++++++++++++++++---------------- 3 files changed, 333 insertions(+), 336 deletions(-) diff --git a/static/base.css b/static/base.css index fc0abb8a..e3e27365 100644 --- a/static/base.css +++ b/static/base.css @@ -843,11 +843,6 @@ color: #00bb00;} z-index:10; } -#tableOpenDocker{ - position: absolute; - left: 160px; -} - .settingCategoryActive{ display: inline-block; } diff --git a/static/tables.css b/static/tables.css index 16ec1379..bc7ae788 100644 --- a/static/tables.css +++ b/static/tables.css @@ -1,7 +1,3 @@ -#paramsTableWrapper { - top: 24px; -} - #parameterTable #tableInspector{ position: sticky; top: 0px; @@ -34,7 +30,6 @@ #parameterTableAddParameterButton{ left: 15px; - /* position: absolute; */ } #tableInspectorSelection{ @@ -226,7 +221,7 @@ td:first-child input { .eagleTableWrapper thead{ position: sticky; z-index: 111; - top: 24px; + top: 0px; } #graphConfigurationsTableWrapper thead{ @@ -270,13 +265,18 @@ td:first-child input { .eagleTableDisplay .tableBody, .issuesDisplay .issuesBody{ padding:10px; background-color: aliceblue; - overflow: auto; width: 100%; position: absolute; top: 53px; height: calc(100% - 46px); } +.eagleTableDisplay .scrollWrapper { + height: 100%; + overflow: auto; + position: relative; +} + .eagleTableWrapper tr:nth-child(even) { background-color: rgba(214, 219, 239, 0.95); } diff --git a/templates/parameter_table.html b/templates/parameter_table.html index e0a5903f..93482ac1 100644 --- a/templates/parameter_table.html +++ b/templates/parameter_table.html @@ -79,394 +79,396 @@
Fields Table:
- -
- - -
- - - - - - - - - - - - - - +
+ + +
+
+
- Node Name -
-
- Attribute Name -
-
- Field ID -
-
+ + + + - - - - - - - - - - - - - - - - - - - - + + + - - - - - - - + + - - + + + + + + + - - - - - - - - - + + + + + + + - - + + + + + + + + - - + + - - - + + + + + + + + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + - + - - - - - - - - - - - - - + + + + + + + - - - - + + + + - - - + + + + + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + - - + + - - -
- - Value - - - Configured Value - -
-
- Default Value -
+ +
+ Node Name +
- Description -
+ +
+ Attribute Name +
- Comment -
-
- Remove -
-
TypeFlags + Field ID +
+
Parameter TypeUse As Encoding + + Value + + + Configured Value + +
+
Actions + Default Value +
+
+ Description +
+
- - + Comment +
+
+ Remove +
+
Type - - FlagsParameter TypeUse As - - - - - - - - - - - Encoding - + + Actions
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - - - - - - - - - - - - - - - + + + + + + + + + + + - + + + + + + + + + + - - + + + + + + + + + + + + - - - + + - - - - - - - - - - - - - - - -
- - - -
- -
- - - - - - - - - - - - - - - - - - + + + - - - - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + - - - + + + - - - - N/A - - - - - - - - - - - - + + + + + N/A - - - + + + + + + + + + + + + + + + +
+ + + From 52b680386ed48dcc6f58f9270a57376318add55f Mon Sep 17 00:00:00 2001 From: MWicenec Date: Wed, 6 Nov 2024 11:45:32 +0800 Subject: [PATCH 7/7] fixed another css issue with scrolling in the parameter table --- static/tables.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/tables.css b/static/tables.css index bc7ae788..1f6116af 100644 --- a/static/tables.css +++ b/static/tables.css @@ -272,7 +272,7 @@ td:first-child input { } .eagleTableDisplay .scrollWrapper { - height: 100%; + height: calc(100% - 24px); overflow: auto; position: relative; }