Skip to content

Commit 1d68af2

Browse files
committed
Update schedule inputs to align with analysis_period, updates to me file
handling
1 parent 684a919 commit 1d68af2

15 files changed

+433
-41
lines changed

deploy/runtime/ui/Financial Analysis Host Developer Parameters.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -850,7 +850,9 @@
850850
" txt = analysis_period_message();",
851851
" property('analysis_period_warning','caption',txt);",
852852
" refresh();\r",
853-
" change_tax_array_length();",
853+
" change_tax_array_length();\r",
854+
" change_depreciation_length();\r",
855+
" change_curtailment_price_length();",
854856
"};",
855857
""
856858
]

deploy/runtime/ui/Financial Analysis Parameters.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,9 @@
618618
" }",
619619
" txt = analysis_period_message();",
620620
" property('analysis_period_warning','caption',txt);\r",
621-
" change_tax_array_length();",
621+
" change_tax_array_length();\r",
622+
" change_curtailment_price_length();\r",
623+
" change_depreciation_length();",
622624
"};",
623625
""
624626
]

deploy/runtime/ui/Financial Curtailment Price.json

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,20 @@
349349
"",
350350
"on_load{\"Financial Curtailment Price\"}=define()",
351351
"{",
352-
"\tcurtailment_price_ctrl_refresh();",
352+
"\tcurtailment_price_ctrl_refresh();\r",
353+
"\tchange_curtailment_price_length();",
353354
"};\t",
354355
"",
355356
"on_change{\"grid_curtailment_price\"}=define()",
356357
"{",
357358
"\tcurtailment_price_ctrl_refresh();",
358-
"};\t",
359+
"};\t\r",
360+
"\r",
361+
"function change_curtailment_price_length()\r",
362+
"{\r",
363+
"\tyears = value('analysis_period');\r",
364+
"\tproperty('grid_curtailment_price', 'FixedLength', years);\r",
365+
"}",
359366
""
360367
]
361368
}

deploy/runtime/ui/Financial Depreciation Detailed.json

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3939,5 +3939,16 @@
39393939
"",
39403940
""
39413941
],
3942-
"Callbacks": []
3942+
"Callbacks": [
3943+
"function change_depreciation_length()\r",
3944+
"{\r",
3945+
"\tyears = value('analysis_period');\r",
3946+
"\tproperty('depr_custom_schedule', 'FixedLength', years);\r",
3947+
"}\r",
3948+
"\r",
3949+
"on_load{'Financial Depreciation Detailed'} = define()\r",
3950+
"{\r",
3951+
"\tchange_depreciation_length();\r",
3952+
"};"
3953+
]
39433954
}

deploy/runtime/ui/Financial Depreciation Simple.json

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -930,5 +930,19 @@
930930
}
931931
},
932932
"Equations": [],
933-
"Callbacks": []
933+
"Callbacks": [
934+
"function change_depreciation_length()\r",
935+
"{\r",
936+
"\tyears = value('analysis_period');\r",
937+
"\tproperty('depr_fed_custom', 'FixedLength', years);\r",
938+
"\tproperty('depr_sta_custom', 'FixedLength', years);\r",
939+
"}\r",
940+
"\r",
941+
"on_load{'Financial Depreciation Simple'} = define() \r",
942+
"{\r",
943+
"\tchange_depreciation_length();\r",
944+
"};\r",
945+
"\r",
946+
""
947+
]
934948
}

deploy/runtime/ui/Financial LCOE Calc with Capex Page.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2675,6 +2675,7 @@
26752675
"{\r",
26762676
"\tenable_disable();\r",
26772677
"\tcfin_is_zero_check();\r",
2678+
"\tchange_schedule_length();\r",
26782679
"};\r",
26792680
"\r",
26802681
"\r",
@@ -2686,6 +2687,11 @@
26862687
"\r",
26872688
"on_change{'c_construction_cost'} = define() { cfin_is_zero_check(); };\r",
26882689
"\r",
2689-
""
2690+
"function change_schedule_length() \r",
2691+
"{\r",
2692+
"\tyears = value('c_lifetime');\r",
2693+
"\tproperty('c_depreciation_schedule', 'FixedLength', years);\r",
2694+
"\tproperty('c_construction_cost', 'FixedLength', years);\r",
2695+
"}"
26902696
]
26912697
}

deploy/runtime/ui/Financial LCOE Calc with Costs Page.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2724,7 +2724,8 @@
27242724
"on_load{\"Financial LCOE Calc with Costs Page\"} = define()",
27252725
"{",
27262726
"\tenable_disable();",
2727-
"\tcfin_is_zero_check();",
2727+
"\tcfin_is_zero_check();\r",
2728+
"\tchange_schedule_length();",
27282729
"};",
27292730
"",
27302731
"",
@@ -2736,6 +2737,11 @@
27362737
"",
27372738
"on_change{'c_construction_cost'} = define() { cfin_is_zero_check(); };",
27382739
"",
2739-
""
2740+
"function change_schedule_length() \r",
2741+
"{\r",
2742+
"\tyears = value('c_lifetime');\r",
2743+
"\tproperty('c_depreciation_schedule', 'FixedLength', years);\r",
2744+
"\tproperty('c_construction_cost', 'FixedLength', years);\r",
2745+
"}"
27402746
]
27412747
}

deploy/runtime/ui/Financial LCOE Calc with Costs.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2423,7 +2423,8 @@
24232423
"{",
24242424
"\tenable_disable();",
24252425
"\tcfin_is_zero_check();\r",
2426-
"\tset_groupbox_label();",
2426+
"\tset_groupbox_label();\r",
2427+
"\tchange_schedule_length();",
24272428
"};",
24282429
"",
24292430
"",
@@ -2448,6 +2449,13 @@
24482449
"\t\t}\r",
24492450
"\tproperty('lcoe_groupbox','Caption',groupbox_label);\r",
24502451
"\t\r",
2452+
"}\r",
2453+
"\r",
2454+
"function change_schedule_length() \r",
2455+
"{\r",
2456+
"\tyears = value('c_lifetime');\r",
2457+
"\tproperty('c_depreciation_schedule', 'FixedLength', years);\r",
2458+
"\tproperty('c_construction_cost', 'FixedLength', years);\r",
24512459
"}",
24522460
""
24532461
]

deploy/runtime/ui/Financial LCOE Calculator.json

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3082,7 +3082,8 @@
30823082
"{",
30833083
" cfin_is_zero_check();",
30843084
" enable_disable();\r",
3085-
" set_groupbox_label();",
3085+
" set_groupbox_label();\r",
3086+
" change_schedule_length();",
30863087
"};",
30873088
"",
30883089
"on_change{'ui_cost_input_option'} = define()",
@@ -3115,6 +3116,13 @@
31153116
"\tproperty('lcoe_groupbox','Caption',groupbox_label);\r",
31163117
"\t\r",
31173118
"}\r",
3119+
"\r",
3120+
"function change_schedule_length() \r",
3121+
"{\r",
3122+
"\tyears = value('c_lifetime');\r",
3123+
"\tproperty('c_depreciation_schedule', 'FixedLength', years);\r",
3124+
"\tproperty('c_construction_cost', 'FixedLength', years);\r",
3125+
"}\r",
31183126
"",
31193127
"",
31203128
""

deploy/runtime/ui/Marine Wave Resource Header.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"Name": "Marine Wave Resource Header",
3-
"Width": 1018.0,
4-
"Height": 144.0,
3+
"Width": 1118.0,
4+
"Height": 148.0,
55
"FormObjects": {
66
"GroupBox": {
77
"Visible": 1.0,
@@ -20,7 +20,7 @@
2020
},
2121
"Width": {
2222
"Type": 3.0,
23-
"Integer": 1000.0
23+
"Integer": 1075.0
2424
},
2525
"Height": {
2626
"Type": 3.0,

0 commit comments

Comments
 (0)