Skip to content

Commit

Permalink
A number of changes as per Rob's requests.
Browse files Browse the repository at this point in the history
  • Loading branch information
@luke-marshall
luke-marshall committed May 27, 2019
1 parent b8e11f5 commit 46f0e65
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 22 deletions.
2 changes: 1 addition & 1 deletion Vue/app/src/charts/_RevRCC.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
data:grid_import_variable,
},
{
name: 'Fixed Grid Import',
name: 'Daily Charge',
data:grid_import_fixed,
},
{
Expand Down
18 changes: 16 additions & 2 deletions Vue/app/src/pages/inputs/ModelParticipants.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
{{ header.additional_text }}
</td>
</tr>
<tr v-for="row in input_data.table_rows" :key="row.row_id">
<tr v-for="(row, index) in input_data.table_rows" :key="row.row_id">
<td v-for="input in row.row_inputs" :key="input.col_id">
<SimpleNumberInput
v-if="input.tag==='my_number'"
Expand All @@ -44,6 +44,7 @@
</td>

<td><div class="show-data-button" v-on:click="show_chart(row.row_id)">Show Data</div></td>
<td><div class="remove-row-button" v-on:click="remove_row(index);">Remove</div></td>
</tr>
</table>

Expand Down Expand Up @@ -162,7 +163,7 @@
tariff_type_options: [
"TOU",
"TOU + Block",
// "TOU + Block",
],
battery_options: [
Expand Down Expand Up @@ -289,6 +290,10 @@
},
methods: {
remove_row(index){
this.input_data.table_rows.splice(index,1);
},
auto_fill(){
if(this.input_data.selected_load_file != "" && this.input_data.selected_solar_file != ""){
var solar_profiles = this.input_data.my_options.solar_profiles_options;
Expand Down Expand Up @@ -715,5 +720,14 @@
margin: 4vh 0 0 0;
}
.remove-row-button{
font-size: 0.7em;
background-color:$button-warning;
color:$button-text;
border-radius:4px;
cursor: pointer;
padding: 0 0.5vw 0 0.5vw;
}
</style>
34 changes: 21 additions & 13 deletions Vue/app/src/pages/inputs/ModelTariffs.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<div class="container">
<div class="container-header">
Retail Tariffs
Retail Component
</div>
<div class="container-content">
<Chart class="mychart" :options="retailChartOptions"></Chart>
Expand Down Expand Up @@ -48,7 +48,7 @@

<div class="container">
<div class="container-header">
Network Tariffs
Network Component
</div>
<div class="container-content">
<Chart class="mychart" :options="networkChartOptions"></Chart>
Expand Down Expand Up @@ -108,13 +108,13 @@

<div class="container">
<div class="container-header">
Local Solar
Local Solar Component
</div>
<div class="container-content">
<div class="tariffs">
<div class="input">
<!-- <div class="input">
Energy <input v-model="input_data.tariffs.local_solar.energy"/> <span class="units">($/kWh)</span>
</div>
</div> -->
<div class="input">
Retail <input v-model="input_data.tariffs.local_solar.retail"/> <span class="units">($/kWh)</span>
</div>
Expand All @@ -124,19 +124,22 @@
<div class="input">
TUOS <input v-model="input_data.tariffs.local_solar.tuos"/> <span class="units">($/kWh)</span>
</div>
<div class="input">
Total: {{total_solar_tariff}}
</div>
</div>
</div>
</div>
<div class="container">
<div class="container-header">
Central Battery
Central Battery Component
</div>

<div class="tariffs">

<div class="input">
<!-- <div class="input">
Energy <input v-model="input_data.tariffs.central_battery.energy"/> <span class="units">($/kWh)</span>
</div>
</div> -->
<div class="input">
Retail <input v-model="input_data.tariffs.central_battery.retail"/> <span class="units">($/kWh)</span>
</div>
Expand All @@ -147,7 +150,7 @@
TUOS <input v-model="input_data.tariffs.central_battery.tuos"/> <span class="units">($/kWh)</span>
</div>
<div class="input">
TUOS <input v-model="input_data.tariffs.central_battery.nuos"/> <span class="units">($/kWh)</span>
NUOS <input v-model="input_data.tariffs.central_battery.nuos"/> <span class="units">($/kWh)</span>
</div>
<div class="input">
Profit <input v-model="input_data.tariffs.central_battery.profit"/> <span class="units">($/kWh)</span>
Expand All @@ -156,10 +159,10 @@

<div class="container-content">
<div class="tariffs">
<div class="tariff-label">Local Solar Import</div>
<div class="input">
<div class="tariff-label">Paid to Local Solar</div>
<!-- <div class="input">
Energy <input v-model="input_data.tariffs.central_battery.local_solar_import_energy"/> <span class="units">($/kWh)</span>
</div>
</div> -->
<div class="input">
Retail <input v-model="input_data.tariffs.central_battery.local_solar_import_retail"/> <span class="units">($/kWh)</span>
</div>
Expand All @@ -170,7 +173,7 @@
TUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_tuos"/> <span class="units">($/kWh)</span>
</div>
<div class="input">
TUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_nuos"/> <span class="units">($/kWh)</span>
NUOS <input v-model="input_data.tariffs.central_battery.local_solar_import_nuos"/> <span class="units">($/kWh)</span>
</div>
</div>

Expand Down Expand Up @@ -328,6 +331,11 @@
computed:{
total_solar_tariff(){
var total = Number(this.input_data.tariffs.local_solar.retail) + Number(this.input_data.tariffs.local_solar.tuos) + Number(this.input_data.tariffs.local_solar.duos);
return Number(total).toFixed(2);
},
shoulder_1_times(){
return {
start: this.input_data.tariffs.tou_times[0],
Expand Down
12 changes: 6 additions & 6 deletions Vue/app/src/pages/inputs/ModelTariffsMike.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<div class="container">
<div class="container-header">
Imports
Import Component
</div>
<div class="container-content">
<Chart class="mychart" :options="static_imports_chart_options"></Chart>
Expand All @@ -28,7 +28,7 @@

<div class="container">
<div class="container-header">
Solar Imports
Solar Import Component
</div>
<div class="container-content">
<Chart class="mychart" :options="static_solar_imports_chart_options"></Chart>
Expand All @@ -51,7 +51,7 @@

<div class="container">
<div class="container-header">
Exports
Export Component
</div>
<div class="container-content">
<Chart class="mychart" :options="static_exports_chart_options"></Chart>
Expand All @@ -73,7 +73,7 @@

<div class="container">
<div class="container-header">
Daily Block Tariffs
Daily Block Tariff Component
</div>
<div class="container-content">
<div class="tariffs">
Expand Down Expand Up @@ -120,7 +120,7 @@

<div class="container">
<div class="container-header">
Metering Service Charges
Metering Service Charge Component
</div>
<div class="container-content">
<div class="tariffs">
Expand All @@ -138,7 +138,7 @@

<div class="container">
<div class="container-header">
Solar
Solar Component
</div>
<div class="container-content">
<div class="tariffs">
Expand Down

0 comments on commit 46f0e65

Please sign in to comment.