Fix overlapping text, fix callbacks to correct enabling of default type

NREL · Oct 28, 2023 · 6fc0698 · 6fc0698
1 parent 6ef02f9
commit 6fc0698
Showing 1 changed file with 66 additions and 66 deletions.
diff --git a/deploy/runtime/ui/Geothermal Resource.json b/deploy/runtime/ui/Geothermal Resource.json
@@ -1395,68 +1395,6 @@
                 }
             }
         },
-        "Label": {
-            "Visible": 1.0,
-            "ObjectProperties": {
-                "Name": {
-                    "Type": 5.0,
-                    "String": "lbl_default_type"
-                },
-                "X": {
-                    "Type": 3.0,
-                    "Integer": 84.0
-                },
-                "Y": {
-                    "Type": 3.0,
-                    "Integer": 657.0
-                },
-                "Width": {
-                    "Type": 3.0,
-                    "Integer": 700.0
-                },
-                "Height": {
-                    "Type": 3.0,
-                    "Integer": 24.0
-                },
-                "Tool Tip": {
-                    "Type": 5.0,
-                    "String": ""
-                },
-                "Caption": {
-                    "Type": 5.0,
-                    "String": "Default Type is not available for the No Financial Model option."
-                },
-                "TextColour": {
-                    "Type": 4.0,
-                    "Color": {
-                        "Red": 0.0,
-                        "Green": 0.0,
-                        "Blue": 0.0,
-                        "Alpha": 255.0
-                    }
-                },
-                "Bold": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "FontSize": {
-                    "Type": 3.0,
-                    "Integer": 0.0
-                },
-                "WordWrap": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                },
-                "AlignRight": {
-                    "Type": 2.0,
-                    "Boolean": 0.0
-                },
-                "AlignTop": {
-                    "Type": 2.0,
-                    "Boolean": 1.0
-                }
-            }
-        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -1540,6 +1478,68 @@
                 }
             }
         },
+        "Label": {
+            "Visible": 1.0,
+            "ObjectProperties": {
+                "Name": {
+                    "Type": 5.0,
+                    "String": "lbl_default_type"
+                },
+                "X": {
+                    "Type": 3.0,
+                    "Integer": 39.0
+                },
+                "Y": {
+                    "Type": 3.0,
+                    "Integer": 723.0
+                },
+                "Width": {
+                    "Type": 3.0,
+                    "Integer": 700.0
+                },
+                "Height": {
+                    "Type": 3.0,
+                    "Integer": 24.0
+                },
+                "Tool Tip": {
+                    "Type": 5.0,
+                    "String": ""
+                },
+                "Caption": {
+                    "Type": 5.0,
+                    "String": "Default Type is not available for the No Financial Model option."
+                },
+                "TextColour": {
+                    "Type": 4.0,
+                    "Color": {
+                        "Red": 0.0,
+                        "Green": 0.0,
+                        "Blue": 0.0,
+                        "Alpha": 255.0
+                    }
+                },
+                "Bold": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "FontSize": {
+                    "Type": 3.0,
+                    "Integer": 0.0
+                },
+                "WordWrap": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                },
+                "AlignRight": {
+                    "Type": 2.0,
+                    "Boolean": 0.0
+                },
+                "AlignTop": {
+                    "Type": 2.0,
+                    "Boolean": 1.0
+                }
+            }
+        },
         "Numeric": {
             "Visible": 1.0,
             "ObjectProperties": {
@@ -2117,7 +2117,7 @@
                 },
                 "Width": {
                     "Type": 3.0,
-                    "Integer": 489.0
+                    "Integer": 462.0
                 },
                 "Height": {
                     "Type": 3.0,
@@ -3563,7 +3563,7 @@
         ""
     ],
     "Callbacks": [
-        "{",
+        "function handle_change_to_hydrothermal(){",
         "\t// if we just changed to 'hydrothermal'",
         "\tif (${resource_type} == 0) {",
         "\t\tif (${reservoir_pressure_change_type} == 1 || ${reservoir_pressure_change_type} == 3) {",
@@ -3675,8 +3675,8 @@
         "on_load{'Geothermal Resource'} = define() {",
         "\tsave_old_pressure_change_setting();",
         "\ton_change{'reservoir_pressure_change_type'}();",
-        "\tenable('geotherm.default_input', (financing()!='None'));\r",
-        "\tshow('lbl_default_type',(financing()=='None'));",
+        "\tenable('geotherm.default_input', (financing() != 'None'));\r",
+        "\tshow('lbl_default_type',(financing() == 'None'));",
         "\trefresh();\r",
         "};",
         "",