#172 - fixed charging screen value

Northeastern-Electric-Racing · Sep 15, 2024 · 7d08abe · 7d08abe
1 parent 09b4924
commit 7d08abe
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/angular-client/src/pages/charging-page/charging-page.component.html b/angular-client/src/pages/charging-page/charging-page.component.html
@@ -17,19 +17,19 @@
  />
  <latency-display style="margin-bottom: -30px; margin-top: -10px" />
  </div>
- <vstack>
- <hstack spacing="10px">
- <combined-status-display style="width: 625px; height: 380px" />
- <vstack>
- <state-of-charge-display style="width: 230px; height: 123px" />
- <current-display style="width: 230px; height: 122px" />
- <pack-temp style="width: 230px; height: 122px" />
+ <vstack style="width: 100%">
+ <hstack spacing="10px" style="width: 100%">
+ <combined-status-display style="width: 45%; height: 380px" />
+ <vstack style="width: 15%">
+ <state-of-charge-display style="min-width: 230px; height: 123px" />
+ <current-display style="min-width: 230px; height: 122px" />
+ <pack-temp style="min-width: 230px; height: 122px" />
  </vstack>
- <fault-display style="height: 380px; width: 520px" />
+ <fault-display style="height: 380px; min-width: 520px; width: 40%" />
  </hstack>
- <cell-temp-display style="width: 1400px; height: 175px" />
- <high-low-cell-display style="width: 1400px; height: 175px" />
- <pack-voltage-display style="height: 175px; width: 100%" />
+ <cell-temp-display style="min-width: 1300px; width: 100%; height: 175px" />
+ <high-low-cell-display style="min-width: 1300px; width: 100%; height: 175px" />
+ <pack-voltage-display style="min-width: 1300px; width: 100%; height: 175px" />
  </vstack>
  </vstack>
  </ng-template>

diff --git a/...lar-client/src/pages/charging-page/components/charging-state/charging-status.component.ts b/...lar-client/src/pages/charging-page/components/charging-state/charging-status.component.ts
@@ -20,12 +20,12 @@ export default class ChargingStatusComponent {
  ngOnInit() {
  this.storage.get(IdentifierDataType.CHARGING).subscribe((value) => {
  if (this.isCharging) {
- if (!(floatPipe(value.values[0]) === 1)) {
+ if (floatPipe(value.values[0]) === 1) {
  this.isCharging = false;
  this.stopTimer();
  this.resetCurrentSecs();
  }
- } else if (floatPipe(value.values[0]) === 1) {
+ } else if (floatPipe(value.values[0]) === 0) {
  this.isCharging = true;
  this.startTimer();
  }

diff --git a/...s/charging-page/components/combined-status-display/combined-status-display.component.html b/...s/charging-page/components/combined-status-display/combined-status-display.component.html
@@ -1,12 +1,12 @@
 <info-background svgIcon="quickreply" title="Status">
  <div style="display: flex; justify-content: left; align-items: flex-start; height: 80%">
  <hstack>
- <vstack>
+ <vstack style="width: 45%">
  <active-status />
  <faulted-status />
  </vstack>
  <divider style="height: 300px" />
- <vstack>
+ <vstack style="width: 45%">
  <charging-status />
  <balancing-status />
  </vstack>