8000 Chart data source selection by terratec · Pull Request #955 · bitaxeorg/ESP-Miner · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
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

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
+565 −82
Open

Chart data source selection #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b09e2f1
Unify data types for the statistics data
terratec May 14, 2025
ec26dcb
Add chart data source selection
terratec May 14, 2025
53de4b8
Apply patch for dropdowns on the dashboard
terratec May 31, 2025
041058e
Use api for suggestedMax values / Set precision to 3 for asic voltage
terratec May 31, 2025
6623427
Reload chart after source selection
terratec May 31, 2025
8381b73
Add chart data selection label None
terratec May 31, 2025
19ae76a
Add loadPreviousData and limitDataPoints functions / Apply patch for …
terratec Jun 5, 2025
741529e
Integrate changes after rebase
terratec Jun 12, 2025
6ea31dc
Revert "Unify data types for the statistics data"
terratec Jun 14, 2025
8caceaf
Use enum for data sources
terratec Jun 14, 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
8000
Diff view
29 changes: 24 additions & 5 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 @@ -27,7 +27,7 @@ <h4>Loading...</h4>
<span class="block text-500 font-medium mb-3">Hash Rate</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 @@ -44,7 +44,7 @@ <h4>Loading...</h4>
</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 @@ -55,7 +55,7 @@ <h4>Loading...</h4>
<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'}} <small>J/TH</small>
</span>
<span *ngIf="info.power_fault" class="text-red-500">
Not available - Power fault
C2A3 Expand All @@ -72,7 +72,7 @@ <h4>Loading...</h4>
</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 @@ -133,7 +133,26 @@ <h4>Loading...</h4>

<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"
optionLabel="name"
optionValue="value"
formControlName="chartY1Data"
styleClass="border-primary-500 p-dropdown--small">
</p-dropdown>
<p-dropdown
[options]="dataSourceLabels"
optionLabel="name"
optionValue="value"
formControlName="chartY2Data"
styleClass="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
0