Skip to content

Commit

Permalink
updates to self-consumption ui
Browse files Browse the repository at this point in the history
  • Loading branch information
janinefreeman committed Aug 26, 2023
1 parent 3aadb2e commit 5cd1075
Show file tree
Hide file tree
Showing 5 changed files with 116 additions and 17 deletions.
7 changes: 3 additions & 4 deletions deploy/runtime/startup.lk
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ function setup_pages_battery_dispatch_btm()
[ {'name'='Battery Dispatch Battery Power Targets', 'caption'='Battery Power Targets'}],
[ {'name'='Battery Dispatch Manual', 'caption'='Manual'}],
[ {'name'='Battery Dispatch Price Signal', 'caption'='Price Signal'} ],
[ {'name'='Battery Dispatch Carbon Free', 'caption'='Carbon Free'} ]],
[ {'name'='Battery Dispatch Self Consumption', 'caption'='Self Consumption'} ]],
{ 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_btm',
'exclusive_var' = 'batt_dispatch_excl',
'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery' } );
Expand All @@ -196,8 +196,7 @@ function setup_pages_standalone_battery_dispatch_btm()
[ {'name'='Battery Dispatch Grid Power Targets', 'caption'='Grid Power Targets'} ],
[ {'name'='Battery Dispatch Battery Power Targets', 'caption'='Battery Power Targets'}],
[ {'name'='Battery Dispatch Manual', 'caption'='Manual'}],
[ {'name'='Battery Dispatch Price Signal', 'caption'='Price Signal'} ],
[ {'name'='Battery Dispatch Carbon Free', 'caption'='Carbon Free'} ]],
[ {'name'='Battery Dispatch Price Signal', 'caption'='Price Signal'} ]],
{ 'sidebar'='Battery Dispatch', 'help'='battery_dispatch_btm',
'exclusive_var' = 'batt_dispatch_excl',
'exclusive_header_pages' = ['Battery Dispatch Common', 'Battery Dispatch Standalone Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true, 'bin_name'='Battery' } );
Expand Down Expand Up @@ -661,7 +660,7 @@ function setup_fuel_cell_pages_btm()
[ {'name'='Battery Dispatch Battery Power Targets', 'caption'='Battery Power Targets'}],
[ 'Fuel Cell Dispatch Manual' ],
[ {'name'='Battery Dispatch Price Signal', 'caption'='Price Signal'}],
[ {'name'='Battery Dispatch Carbon Free', 'caption'='Carbon Free'} ]],
[ {'name'='Battery Dispatch Self Consumption', 'caption'='Self Consumption'} ]],
{ 'sidebar'='Dispatch', 'help'='fuelcell_dispatch', 'exclusive_var' = 'batt_dispatch_excl',
'exclusive_header_pages' = ['Fuel Cell Dispatch', 'Battery Dispatch Options BTM'], 'exclusive_tabs'=true, 'exclusive_hide'=true} );
setup_grid_limits_page();
Expand Down
9 changes: 0 additions & 9 deletions deploy/runtime/ui/Battery Dispatch Carbon Free.json

This file was deleted.

4 changes: 2 additions & 2 deletions deploy/runtime/ui/Battery Dispatch Options BTM.json
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
},
"Items": {
"Type": 6.0,
"StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|24/7 carbon-free energy"
"StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|Self-consumption"
},
"ShowCaptions": {
"Type": 2.0,
Expand Down Expand Up @@ -586,7 +586,7 @@
"Label": "Battery dispatch options BTM",
"Units": " ",
"Group": "Battery Dispatch",
"IndexLabels": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast| 24/7 carbon-free energy",
"IndexLabels": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|Self-consumption",
"Flags": 3.0,
"DefaultValue": 0.0,
"UIObject": "RadioChoice",
Expand Down
109 changes: 109 additions & 0 deletions deploy/runtime/ui/Battery Dispatch Self Consumption.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,109 @@
{
"Name": "Battery Dispatch Self Consumption",
"Width": 1059.0,
"Height": 101.0,
"FormObjects": {
"GroupBox": {
"Visible": 1.0,
"ObjectProperties": {
"Name": {
"Type": 5.0,
"String": "object 4"
},
"X": {
"Type": 3.0,
"Integer": 6.0
},
"Y": {
"Type": 3.0,
"Integer": 3.0
},
"Width": {
"Type": 3.0,
"Integer": 1044.0
},
"Height": {
"Type": 3.0,
"Integer": 84.0
},
"Tool Tip": {
"Type": 5.0,
"String": ""
},
"Caption": {
"Type": 5.0,
"String": "Self-consumption"
},
"Bold": {
"Type": 2.0,
"Boolean": 1.0
}
}
},
"Label": {
"Visible": 1.0,
"ObjectProperties": {
"Name": {
"Type": 5.0,
"String": "object 7"
},
"X": {
"Type": 3.0,
"Integer": 27.0
},
"Y": {
"Type": 3.0,
"Integer": 33.0
},
"Width": {
"Type": 3.0,
"Integer": 1008.0
},
"Height": {
"Type": 3.0,
"Integer": 45.0
},
"Tool Tip": {
"Type": 5.0,
"String": ""
},
"Caption": {
"Type": 5.0,
"String": "The self-consumption dispatch option tries to minimize power imported from or exported to the grid. This is also referred to as 24/7 carbon-free energy. There are no additional inputs required for this dispatch 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
}
}
}
},
"VarDatabase": {},
"Equations": [],
"Callbacks": []
}
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
},
"Items": {
"Type": 6.0,
"StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast|24/7 carbon-free energy"
"StringList": "Peak shaving|Input grid power targets|Input battery power targets|Manual dispatch|Price signal forecast"
},
"ShowCaptions": {
"Type": 2.0,
Expand Down Expand Up @@ -267,7 +267,7 @@
"Label": "Battery dispatch choice",
"Units": " ",
"Group": "Battery Dispatch",
"IndexLabels": "Peak shaving| Input grid power targets| Input battery power targets| Manual dispatch| Price signal forecast| 24/7 carbon-free energy",
"IndexLabels": "Peak shaving| Input grid power targets| Input battery power targets| Manual dispatch| Price signal forecast",
"Flags": 3.0,
"DefaultValue": 3.0,
"UIObject": "RadioChoice",
Expand Down

0 comments on commit 5cd1075

Please sign in to comment.