From 156e98a8db98ad6b9ba2c25d3e49fa14adb07849 Mon Sep 17 00:00:00 2001 From: Brian Mirletz Date: Fri, 12 Dec 2025 10:17:40 -0700 Subject: [PATCH 1/2] New curtailment callback for marine doesn't apply to merchant plant. Add logic to the callback to cover this case --- deploy/runtime/ui/Financial Analysis Parameters.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/deploy/runtime/ui/Financial Analysis Parameters.json b/deploy/runtime/ui/Financial Analysis Parameters.json index 42aea7edd..d457baec8 100644 --- a/deploy/runtime/ui/Financial Analysis Parameters.json +++ b/deploy/runtime/ui/Financial Analysis Parameters.json @@ -632,7 +632,9 @@ " txt = analysis_period_message();", " property('analysis_period_warning','caption',txt);\r", " change_tax_array_length();\r", - " change_curtailment_price_length();\r", + " if ( financing() != 'Merchant Plant') {\r", + "\tchange_curtailment_price_length();\r", + " }\r", " change_depreciation_length();", "};", "" From 8121655974bcf407cc9005798492957617d9f46f Mon Sep 17 00:00:00 2001 From: Brian Mirletz Date: Fri, 12 Dec 2025 11:03:35 -0700 Subject: [PATCH 2/2] Update to catch a few more callback errors --- .../ui/Financial Analysis Host Developer Parameters.json | 3 +-- deploy/runtime/ui/Financial Analysis Parameters.json | 6 ++++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json b/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json index f7bd976a1..429a2b308 100644 --- a/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json +++ b/deploy/runtime/ui/Financial Analysis Host Developer Parameters.json @@ -864,8 +864,7 @@ " property('analysis_period_warning','caption',txt);", " refresh();\r", " change_tax_array_length();\r", - " change_depreciation_length();\r", - " change_curtailment_price_length();", + " change_depreciation_length();", "};", "" ] diff --git a/deploy/runtime/ui/Financial Analysis Parameters.json b/deploy/runtime/ui/Financial Analysis Parameters.json index d457baec8..518521503 100644 --- a/deploy/runtime/ui/Financial Analysis Parameters.json +++ b/deploy/runtime/ui/Financial Analysis Parameters.json @@ -632,10 +632,12 @@ " txt = analysis_period_message();", " property('analysis_period_warning','caption',txt);\r", " change_tax_array_length();\r", - " if ( financing() != 'Merchant Plant') {\r", + " if ( financing() == 'Single Owner') {\r", "\tchange_curtailment_price_length();\r", " }\r", - " change_depreciation_length();", + " if (financing() != 'Residential' && financing() != 'LCOE Calculator' && financing() != 'None') {\r", + "\tchange_depreciation_length();\r", + " }", "};", "" ]