refactor: Change results graph & save fatigue data

Graymattermetrics · Aug 23, 2024 · f58d7b4 · f58d7b4
1 parent c5464c1
commit f58d7b4
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/src/assets/results_graph.png b/src/assets/results_graph.png
diff --git a/src/main.ts b/src/main.ts
@@ -49,7 +49,7 @@ async function loadConfig(): Promise<Config> {
  * @param config 
  * @param startNow Called from restart. Bypasses sleep data
  */
-export async function startUp(config: Config | null = null, startNow: boolean = false) {
+export async function startUp(config: Config | null = null, startNowData: Record<string, any> | false = false) {
   if (config === null) {
     config = await loadConfig();
     if (config.error) throw new Error(config.reason);
@@ -81,10 +81,10 @@ export async function startUp(config: Config | null = null, startNow: boolean =
 
   // Display the home page
   const startPage = new StartPage(config, app, graphicsManager);
-  if (!startNow) await startPage.displayHomePage();
+  if (startNowData == false) await startPage.displayHomePage();
 
   // Display start page
-  const sleepData = await startPage.start(startNow);
+  const sleepData = await startPage.start(startNowData);
   if (!sleepData) throw new Error("No sleep data");
 
   // Game phase - called after start button is clicked

diff --git a/src/routes/results.ts b/src/routes/results.ts
@@ -228,7 +228,7 @@ export class ProcessResultsPage {
       Date/time: ${data._date}
       Location: ${data.location.normalizedLocation}
       Status: ${data.status}
-      Test duration: ${data.testDuration}s`, {
+      Test duration: ${data.testDuration/60}s`, {
       fontFamily: "Trebuchet",
       fontSize: 18,
       fill: 0xffffff,
@@ -320,7 +320,7 @@ export class ProcessResultsPage {
     restartTestButtonContainer.on("pointerdown", () => {
       // TODO: Send back to home page
       this.app.destroy();
-      startUp(config, true);
+      startUp(config, data.sleepData);
     });
 
     const homeButton = this.ui.createButton(

diff --git a/src/routes/start.ts b/src/routes/start.ts
@@ -339,10 +339,10 @@ private async confirmSleepData(sleepData: { [key: string]: any }): Promise<boole
    * TODO: Seperate pages better
    * @returns {Promise<SleepData>} The test data
    */
-  public async start(skipToDisplay: boolean): Promise<SleepData | false> {
+  public async start(sleepData: Record<string, any> | false): Promise<SleepData | false> {
     if (process.env.NODE_ENV === "development") return {fatigueLevel: -1};
 
-    if (skipToDisplay) {
+    if (sleepData != false) {
       await this.displayReadyDemo(Infinity);
       return {fatigueLevel: 1};
     }