Skip to content

Chart data source selection #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WantClue merged 23 commits into from
Sep 19, 2025
Merged

Chart data source selection #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
e385c7c
Unify data types for the statistics data
terratec May 14, 2025
7295339
Add chart data source selection
terratec May 14, 2025
9887a3e
Apply patch for dropdowns on the dashboard
terratec May 31, 2025
dd8ba45
Use api for suggestedMax values / Set precision to 3 for asic voltage
terratec May 31, 2025
ef231ce
Reload chart after source selection
terratec May 31, 2025
41febdd
Add chart data selection label None
terratec May 31, 2025
e84c9d0
Add loadPreviousData and limitDataPoints functions / Apply patch for …
terratec Jun 5, 2025
4b77954
Integrate changes after rebase
terratec Jun 12, 2025
a79fa59
Revert "Unify data types for the statistics data"
terratec Jun 14, 2025
220e4be
Use enum for data sources
terratec Jun 14, 2025
f62bad7
Clean up comments
terratec Jun 26, 2025
c943991
Apply patch for dropdown color and width
terratec Jun 26, 2025
9e9cb5f
Add parameters to the statistics data request
terratec Aug 9, 2025
6ced044
Use column list as parameter
terratec Aug 31, 2025
742737c
Decouple display and backend labels
terratec Aug 31, 2025
4a8154e
Use local storage and data request with parameters
terratec Sep 1, 2025
bf91e65
Update API specification and clean up
terratec Sep 5, 2025
14b3bb8
Remove delay for test data to fix distorted data with ng serve
terratec Sep 5, 2025
2310f0a
Wider drop-down menu to prevent cut-off
Sep 15, 2025
aacdbe3
Filter out vrTemp from drop-down menu if not available (e.g. for Ultra)
Sep 15, 2025
4a9adeb
Remove the <small> option
terratec Sep 16, 2025
07d6371
Merge pull request #1 from duckaxe/bugfix/pr-terratec-955
terratec Sep 16, 2025
802e416
Fix hashrate conversion for the title
terratec Sep 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 25 additions & 6 deletions main/http_server/axe-os/src/app/components/home/home.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<span class="block text-500 font-medium mb-3">Hashrate</span>
<div class="text-900 font-medium text-2xl flex align-items-center gap-2">
<span *ngIf="!info.power_fault">
{{info.hashRate * 1000000000 | hashSuffix}}
{{info.hashRate | hashSuffix}}
</span>
<span *ngIf="info.power_fault" class="text-red-500">
Not available - Power fault
Expand All @@ -47,7 +47,7 @@
</ng-container>

<div class="text-500 text-xs" *ngIf="!info.power_fault && info.expectedHashrate">
Expected: {{info.expectedHashrate * 1000000000 | hashSuffix}}
Expected: {{info.expectedHashrate | hashSuffix}}
</div>
</div>
</div>
Expand All @@ -58,7 +58,7 @@
<span class="block text-500 font-medium mb-3">Efficiency</span>
<div class="text-900 font-medium text-2xl flex align-items-center gap-2">
<span *ngIf="!info.power_fault">
{{info.power / (info.hashRate/1000) | number: '1.2-2'}} <small>J/Th</small>
{{info.power / (info.hashRate / 1000000000000) | number: '1.2-2'}} J/Th
</span>
<span *ngIf="info.power_fault" class="text-red-500">
Not available - Power fault
Expand All @@ -70,12 +70,12 @@
<ng-container *ngIf="!info.power_fault">
Average:
<span class="text-green-500 font-medium">
{{calculateEfficiencyAverage(hashrateData, powerData) | number: '1.2-2'}} <small>J/Th</small>
{{calculateEfficiencyAverage(hashrateData, powerData) | number: '1.2-2'}} J/Th
</span>
</ng-container>

<div class="text-500 text-xs" *ngIf="!info.power_fault && info.expectedHashrate">
Expected: {{info.power / (info.expectedHashrate/1000) | number: '1.2-2'}} J/Th
Expected: {{info.power / (info.expectedHashrate / 1000000000000) | number: '1.2-2'}} J/Th
</div>
</div>
</div>
Expand Down Expand Up @@ -136,7 +136,26 @@

<div class="col-12" *ngIf="!info.power_fault">
<div class="card">
<p-chart #chart id="chart" [data]="chartData" [options]="chartOptions"></p-chart>
<form [formGroup]="form">
<div class="flex flex-nowrap justify-content-between mb-3">
<p-dropdown
[options]="dataSourceLabels(info)"
optionLabel="name"
optionValue="value"
formControlName="chartY1Data"
styleClass="w-10rem p-dropdown--border-color-primary p-dropdown--small">
</p-dropdown>
<p-dropdown
[options]="dataSourceLabels(info)"
optionLabel="name"
optionValue="value"
formControlName="chartY2Data"
styleClass="w-10rem border-500 p-dropdown--small">
</p-dropdown>
</div>

<p-chart #chart id="chart" [data]="chartData" [options]="chartOptions"></p-chart>
</form>
</div>
</div>

Expand Down
Loading
Loading