Added study count for each subject instead of min and max

Eng-Bunnys · Feb 27, 2025 · 8ca98e1 · 8ca98e1
1 parent e93cc96
commit 8ca98e1
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 4 deletions.
diff --git a/GBF v3/GBF/Timers/TimerStats.ts b/GBF v3/GBF/Timers/TimerStats.ts
@@ -90,7 +90,15 @@ export class TimerStats {
     return this.timerData.currentSemester.semesterSubjects.length || 0;
   }
 
-  public getMostStudiedSubject(): string {
+  public getSubjectsInOrder(): { subjectName: string; timesStudied: number }[] {
+    return this.timerData.currentSemester.semesterSubjects.length > 0
+      ? [...this.timerData.currentSemester.semesterSubjects].sort(
+          (a, b) => b.timesStudied - a.timesStudied
+        )
+      : [];
+  }
+
+  /*   public getMostStudiedSubject(): string {
     return this.timerData.currentSemester.semesterSubjects.length > 0
       ? this.timerData.currentSemester.semesterSubjects.reduce(
           (prev, current) =>
@@ -124,7 +132,7 @@ export class TimerStats {
             prev.timesStudied < current.timesStudied ? prev : current
         ).timesStudied
       : 0;
-  }
+  } */
 
   public getAverageStudyTimePerSubject(): number {
     return this.timerData.currentSemester.semesterSubjects.length > 0

diff --git a/GBF v3/GBF/Timers/Timers.ts b/GBF v3/GBF/Timers/Timers.ts
@@ -458,7 +458,7 @@ export class Timers {
 
       subjectDetails += `• Total study instances across all subjects: ${timerStats.getTotalTimesStudied()}\n`;
 
-      subjectDetails += `• Most Studied Subject: ${
+      /*   subjectDetails += `• Most Studied Subject: ${
         timerStats.getMostStudiedSubject() !== "No Data"
           ? timerStats.getMostStudiedSubject()
           : "N/A"
@@ -468,7 +468,19 @@ export class Timers {
         timerStats.getLeastStudiedSubject() !== "No Data"
           ? timerStats.getLeastStudiedSubject()
           : "N/A"
-      } [${timerStats.getLeastStudiedCount()}]\n`;
+      } [${timerStats.getLeastStudiedCount()}]\n`; */
+
+      const orderedSubjects = timerStats.getSubjectsInOrder();
+
+      if (orderedSubjects.length > 0) {
+        subjectDetails += "**\nSubject Stats**\n";
+        orderedSubjects.forEach(
+          (subject) =>
+            (subjectDetails += `• ${subject.subjectName} [${subject.timesStudied}]\n`)
+        );
+      } else {
+        subjectDetails += "**Subject Stats**\nN/A\n";
+      }
 
       subjectDetails += `• Average Study Time Per Subject: ${
         timerStats.getAverageStudyTimePerSubject() !== 0