-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…ng-screen-improvements #172 Charging Screen Improvements
- Loading branch information
Showing
70 changed files
with
1,021 additions
and
276 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
22 changes: 22 additions & 0 deletions
22
angular-client/src/components/current-total-timer/current-total-timer.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| <info-background svgIcon="timer" title="Timer"> | ||
| <div style="display: flex; justify-content: center; align-items: center; height: 80%; padding-top: 20px"> | ||
| <vstack spacing="10px" style="padding-left: 20px"> | ||
| <hstack> | ||
| <typography variant="info-subtitle" content="CURRENT:" additionalStyles="fontSize:15px" /> | ||
| <typography | ||
| variant="info-subtitle" | ||
| [content]="getCurrentTime()" | ||
| additionalStyles="color: #fbf7f5; text-shadow: 0 0 5px rgba(217,217,214, 0.3);" | ||
| /> | ||
| </hstack> | ||
| <hstack spacing="42px"> | ||
| <typography variant="info-subtitle" content="TOTAL:" additionalStyles="fontSize:15px" /> | ||
| <typography | ||
| variant="info-subtitle" | ||
| [content]="getTotalTime()" | ||
| additionalStyles="color: #fbf7f5; text-shadow: 0 0 5px rgba(217,217,214, 0.3);" | ||
| /> | ||
| </hstack> | ||
| </vstack> | ||
| </div> | ||
| </info-background> |
35 changes: 35 additions & 0 deletions
35
angular-client/src/components/current-total-timer/current-total-timer.component.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| import { Component, Input } from '@angular/core'; | ||
| import Storage from 'src/services/storage.service'; | ||
|
|
||
| @Component({ | ||
| selector: 'current-total-timer', | ||
| templateUrl: './current-total-timer.component.html', | ||
| styleUrls: ['./current-total-timer.component.css'] | ||
| }) | ||
| export default class CurrentTotalTimer { | ||
| @Input() currentTime: number = 0; | ||
| @Input() totalTime: number = 0; | ||
|
|
||
| constructor(private storage: Storage) {} | ||
|
|
||
| getCurrentTime() { | ||
| return this.formatTime(this.currentTime); | ||
| } | ||
|
|
||
| getTotalTime() { | ||
| return this.formatTime(this.totalTime); | ||
| } | ||
|
|
||
| /** | ||
| * Formats the given time. | ||
| * | ||
| * @param time the time to format. | ||
| * @returns the time as a string in the given format: 00:00 (leading zeros included). | ||
| */ | ||
| formatTime(time: number) { | ||
| const minutes = Math.floor(time / 60); | ||
| const seconds = time % 60; | ||
|
|
||
| return `${minutes.toString().padStart(2, '0')}:${seconds.toString().padStart(2, '0')}`; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
39 changes: 20 additions & 19 deletions
39
...r-client/src/pages/charging-page/charging-page-mobile/charging-page-mobile.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,22 +1,23 @@ | ||
| <vstack style="width: 100%" spacing="20px"> | ||
| <typography variant="xx-large-title" content="Argos"></typography> | ||
| <typography variant="x-large-title" [content]="time | date: 'HH:mm:ss'"></typography> | ||
| <typography variant="x-large-title" content="{{ time | date: 'MM/dd/yyyy' }}"></typography> | ||
| <state-of-charge-display style="width: 100%" /> | ||
|
|
||
| <hstack style="width: 100%"> | ||
| <battery-status-display style="width: 100%" /> | ||
| <latency-display style="width: 70%" /> | ||
| </hstack> | ||
|
|
||
| <hstack style="width: 100%"> | ||
| <pack-temp style="width: 50%; height: 20vh" /> | ||
| </hstack> | ||
| <cell-temp-display style="width: 100%; height: 20vh" /> | ||
| <cell-temp-graph style="width: 100%; height: 20vh" /> | ||
|
|
||
| <hstack style="width: 100%"> | ||
| <current-display style="width: 60%" /> | ||
| <fault-display style="width: 40%" /> | ||
| <typography variant="x-large-title" content="Argos" additionalStyles="fontSize:40px"></typography> | ||
| <hstack> | ||
| <typography variant="large-header" [content]="time | date: 'HH:mm:ss'" additionalStyles="fontSize:25px"></typography> | ||
| <divider style="height: 40px"></divider> | ||
| <typography | ||
| variant="large-header" | ||
| content="{{ time | date: 'MM/dd/yyyy' }}" | ||
| additionalStyles="fontSize:25px" | ||
| ></typography> | ||
| </hstack> | ||
| <latency-display style="padding-bottom: 20px; margin-top: -10px" /> | ||
| <vstack style="width: 100%" spacing="15px"> | ||
| <combined-status-mobile style="width: 80%; height: 720px" /> | ||
| <state-of-charge-display style="width: 80%; height: 123px" /> | ||
| <current-display style="width: 80%; height: 122px" /> | ||
| <pack-temp style="width: 80%; height: 122px" /> | ||
| <cell-temp-display style="width: 80%; height: 325px" /> | ||
| <high-low-cell-display style="width: 80%; height: 325px" /> | ||
| <pack-voltage-display style="width: 80%; height: 275px" /> | ||
| <fault-display style="width: 80%; height: 375px" /> | ||
| </vstack> | ||
| </vstack> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
7 changes: 7 additions & 0 deletions
7
angular-client/src/pages/charging-page/components/active-status/active-status.component.css
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| .connection-dot { | ||
| background-color: #2c2c2c; | ||
| border: 3px solid; | ||
| width: 40px; | ||
| height: 40px; | ||
| border-radius: 50%; | ||
| } |
16 changes: 16 additions & 0 deletions
16
angular-client/src/pages/charging-page/components/active-status/active-status.component.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| <info-background title="ACTIVE"> | ||
| <hstack> | ||
| <current-total-timer | ||
| style="padding-left: 20px; min-height: 100px" | ||
| [currentTime]="currentSeconds" | ||
| [totalTime]="totalSeconds" | ||
| /> | ||
| <div style="padding-top: 40px"> | ||
| <div | ||
| class="connection-dot" | ||
| [style.background-color]="getStatusColor(isActive)" | ||
| [style.border-color]="isActive ? getStatusColor(isActive) : 'white'" | ||
| ></div> | ||
| </div> | ||
| </hstack> | ||
| </info-background> |
Oops, something went wrong.