Skip to content

Commit

Permalink
settings retrieval and css improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@dj-nitehawk
dj-nitehawk committed Sep 18, 2022
1 parent 31ee782 commit d8ca81d
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 26 deletions.
49 changes: 25 additions & 24 deletions src/Client/Pages/Settings.razor
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,75 +146,75 @@
<div class="col-6 my-auto fw-bold">
Bulk Charge Voltage:
</div>
<div class="col-6 bg-secondary p-2">
<div class="col-6 bg-secondary p-1">
<div class="row">
<div>
<input @bind-value=settings.BulkChargeVoltage class="form-control bg-light d-inline" style="width:4rem;" type="text" maxlength="4" >
<button type="button" class="btn btn-light m-2" @onclick="()=>SetVoltage(Setting.BulkVoltage)">
<input @bind-value=settings.BulkChargeVoltage class="form-control bg-light d-inline m-1" style="width:4rem;" type="text" maxlength="4" >
<button type="button" class="btn btn-light d-inline m-1" @onclick="()=>SetVoltage(Setting.BulkVoltage)">
<span class="@Spinner(Button.BulkVoltage)"></span>
<span class="@Hidden(Button.BulkVoltage)">Save</span>
</button>
</div>
</div>
</div>
</div>
<div class="row border-primary bg-light px-3 mt-0">
<div class="row border-primary bg-light px-3 mt-1">
<div class="col-6 my-auto fw-bold">
Float Charge Voltage:
</div>
<div class="col-6 bg-secondary p-2">
<div class="col-6 bg-secondary p-1">
<div class="row">
<div>
<input @bind-value=settings.FloatChargeVoltage class="form-control bg-light d-inline" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light m-2" @onclick="()=>SetVoltage(Setting.FloatVoltage)">
<input @bind-value=settings.FloatChargeVoltage class="form-control bg-light d-inline m-1" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light d-inline m-1" @onclick="()=>SetVoltage(Setting.FloatVoltage)">
<span class="@Spinner(Button.FloatVoltage)"></span>
<span class="@Hidden(Button.FloatVoltage)">Save</span>
</button>
</div>
</div>
</div>
</div>
<div class="row border-primary bg-light px-3 mt-0">
<div class="row border-primary bg-light px-3 mt-1">
<div class="col-6 my-auto fw-bold">
Discharge Cutoff Voltage:
</div>
<div class="col-6 bg-secondary p-2">
<div class="col-6 bg-secondary p-1">
<div class="row">
<div>
<input @bind-value=settings.DischargeCuttOffVoltage class="form-control bg-light d-inline" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light m-2" @onclick="()=>SetVoltage(Setting.DischargeCutOff)">
<input @bind-value=settings.DischargeCuttOffVoltage class="form-control bg-light d-inline m-1" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light d-inline m-1" @onclick="()=>SetVoltage(Setting.DischargeCutOff)">
<span class="@Spinner(Button.DischargeCutOff)"></span>
<span class="@Hidden(Button.DischargeCutOff)">Save</span>
</button>
</div>
</div>
</div>
</div>
<div class="row border-primary bg-light px-3 mt-0">
<div class="row border-primary bg-light px-3 mt-1">
<div class="col-6 my-auto fw-bold">
Back To Grid Voltage:
</div>
<div class="col-6 bg-secondary p-2">
<div class="col-6 bg-secondary p-1">
<div class="row">
<div>
<input @bind-value=settings.BackToGridVoltage class="form-control bg-light d-inline" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light m-2" @onclick="()=>SetVoltage(Setting.BackToGrid)">
<input @bind-value=settings.BackToGridVoltage class="form-control bg-light d-inline m-1" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light d-inline m-1" @onclick="()=>SetVoltage(Setting.BackToGrid)">
<span class="@Spinner(Button.BackToGridVoltage)"></span>
<span class="@Hidden(Button.BackToGridVoltage)">Save</span>
</button>
</div>
</div>
</div>
</div>
<div class="row border-primary bg-light px-3 mt-0">
<div class="row border-primary bg-light px-3 mt-1">
<div class="col-6 my-auto fw-bold">
Back To Battery Voltage:
</div>
<div class="col-6 bg-secondary p-2">
<div class="col-6 bg-secondary p-1">
<div class="row">
<div>
<input @bind-value=settings.BackToBatteryVoltage class="form-control bg-light d-inline" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light m-2" @onclick="()=>SetVoltage(Setting.BackToBattery)">
<input @bind-value=settings.BackToBatteryVoltage class="form-control bg-light d-inline m-1" style="width:4rem;" type="text" maxlength="4">
<button type="button" class="btn btn-light d-inline m-1" @onclick="()=>SetVoltage(Setting.BackToBattery)">
<span class="@Spinner(Button.BackToBattery)"></span>
<span class="@Hidden(Button.BackToBattery)">Save</span>
</button>
Expand All @@ -238,7 +238,7 @@
</div>
</div>
</div>
<div class="row border-primary bg-light px-3 mt-0">
<div class="row border-primary bg-light px-3 mt-1">
<div class="col-6 my-auto fw-bold">
Battery Capacity:
</div>
Expand Down Expand Up @@ -278,20 +278,20 @@
</div>
</div>
<div class="row border-primary px-3 mt-1">
<div class="col-5"></div>
<button type="button" class="btn btn-primary my-3 col-2" @onclick="UpdateUserSettings">
<div class="col-3"></div>
<button type="button" class="btn btn-primary my-3 col-6" @onclick="UpdateUserSettings">
<span class="@Spinner(Button.UpdateUserSettings)" style="width:1.2rem;height:1.2rem;"></span>
<span class="@Hidden(Button.UpdateUserSettings)">Update</span>
</button>
<div class="col-5"></div>
<div class="col-3"></div>
</div>
</div>
</div>
}

@code{
private static ChargeAmpereValues? chargeAmpereValues;
private CurrentSettings? settings;
private static CurrentSettings? settings;
private Button currentButton = Button.None;
private bool isSuccess;
private string inProgressSetting = "";
Expand Down Expand Up @@ -341,6 +341,7 @@
protected override async Task OnInitializedAsync()
{
settings = await Http.GetFromJsonAsync<CurrentSettings>("api/settings/get-setting-values");
StateHasChanged();
}

private async Task SetChargePriority(string priority)
Expand Down
4 changes: 2 additions & 2 deletions src/changelog.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## changelog
- add settings and pv log shortcuts to navbar
- upgrade dependencies
- faster settings screen loading on subsequent visits
- css fixes & improvements

0 comments on commit d8ca81d

Please sign in to comment.