fix: use after of previous week

ls1intum · Nov 24, 2024 · 1d97f0b · 1d97f0b
1 parent 570524d
commit 1d97f0b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/webapp/src/app/home/home.component.ts b/webapp/src/app/home/home.component.ts
@@ -44,24 +44,14 @@ export class HomeComponent {
     };
   });
 
-  protected afterParam = computed(
-    () =>
-      this.queryParams().get('after') ??
-      (() => {
-        let defaultDate = dayjs().isoWeekday(this.leaderboardSchedule().day).startOf('hour').hour(this.leaderboardSchedule().hour).minute(this.leaderboardSchedule().minute);
-        if (defaultDate.isAfter(dayjs())) {
-          defaultDate = defaultDate.subtract(1, 'week');
-        }
-        return defaultDate.format();
-      })()
-  );
+  protected afterParam = computed(() => this.queryParams().get('after'));
   protected beforeParam = computed(() => this.queryParams().get('before') ?? dayjs().format());
   protected teamParam = computed(() => this.queryParams().get('team') ?? 'all');
 
   query = injectQuery(() => ({
-    enabled: !!this.metaQuery.data(),
+    enabled: !!this.metaQuery.data() && !!this.afterParam() && !!this.beforeParam() && !!this.teamParam(),
     queryKey: ['leaderboard', { after: this.afterParam(), before: this.beforeParam(), team: this.teamParam() }],
-    queryFn: async () => lastValueFrom(this.leaderboardService.getLeaderboard(this.afterParam(), this.beforeParam(), this.teamParam() !== 'all' ? this.teamParam() : undefined))
+    queryFn: async () => lastValueFrom(this.leaderboardService.getLeaderboard(this.afterParam()!, this.beforeParam(), this.teamParam() !== 'all' ? this.teamParam() : undefined))
   }));
 
   protected teams = computed(() => this.metaQuery.data()?.teams?.map((team) => team.name) ?? []);

diff --git a/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts b/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts
@@ -66,7 +66,15 @@ export class LeaderboardFilterTimeframeComponent {
     };
   });
 
-  after = computed(() => this.queryParams().get('after') ?? (this.leaderboardSchedule() ? this.leaderboardSchedule().full.format() : ''));
+  getDefaultDate() {
+    let defaultDate = dayjs().isoWeekday(this.leaderboardSchedule().day).startOf('hour').hour(this.leaderboardSchedule().hour).minute(this.leaderboardSchedule().minute);
+    if (defaultDate.isAfter(dayjs())) {
+      defaultDate = defaultDate.subtract(1, 'week');
+    }
+    return defaultDate;
+  }
+
+  after = computed(() => this.queryParams().get('after') ?? (this.leaderboardSchedule() ? this.getDefaultDate().format() : ''));
   before = computed(() => this.queryParams().get('before') ?? dayjs().format());
   selectValue = signal<string>(`${this.after()}.${this.before()}`);
 

diff --git a/webapp/src/app/workspace/teams/table/teams-table.component.ts b/webapp/src/app/workspace/teams/table/teams-table.component.ts
@@ -80,7 +80,7 @@ export class WorkspaceTeamsTableComponent {
   // Controls for mutations
   _newLabelName = new FormControl('');
   _newTeamName = new FormControl('');
-  _newTeamColor = new FormControl('');
+  _newTeamColor = new FormControl('#000000');
 
   displayLabelAlert = signal(false);