@if (query.error()) {
diff --git a/webapp/src/app/home/home.component.ts b/webapp/src/app/home/home.component.ts
index db66317c..f2057b39 100644
--- a/webapp/src/app/home/home.component.ts
+++ b/webapp/src/app/home/home.component.ts
@@ -24,12 +24,6 @@ export class HomeComponent {
protected before = computed(() => this.queryParams().get('before') ?? dayjs().format('YYYY-MM-DD'));
protected repository = computed(() => this.queryParams().get('repository') ?? 'all');
- constructor() {
- effect(() => {
- console.log('HomeComponent: effect: ', this.repository());
- });
- }
-
query = injectQuery(() => ({
queryKey: ['leaderboard', { after: this.after(), before: this.before(), repository: this.repository() }],
queryFn: async () =>
diff --git a/webapp/src/app/home/leaderboard/filter/filter.component.html b/webapp/src/app/home/leaderboard/filter/filter.component.html
index bc0c909c..fee368f4 100644
--- a/webapp/src/app/home/leaderboard/filter/filter.component.html
+++ b/webapp/src/app/home/leaderboard/filter/filter.component.html
@@ -4,7 +4,7 @@
Filter
diff --git a/webapp/src/app/home/leaderboard/filter/filter.component.ts b/webapp/src/app/home/leaderboard/filter/filter.component.ts
index 5cfe0cee..9b346f84 100644
--- a/webapp/src/app/home/leaderboard/filter/filter.component.ts
+++ b/webapp/src/app/home/leaderboard/filter/filter.component.ts
@@ -12,6 +12,4 @@ import { LeaderboardFilterRepositoryComponent } from './repository/repository.co
})
export class LeaderboardFilterComponent {
protected ListFilter = ListFilter;
- after = input
('');
- before = input('');
}
diff --git a/webapp/src/app/home/leaderboard/filter/repository/repository.component.ts b/webapp/src/app/home/leaderboard/filter/repository/repository.component.ts
index 3d5f0827..b9142865 100644
--- a/webapp/src/app/home/leaderboard/filter/repository/repository.component.ts
+++ b/webapp/src/app/home/leaderboard/filter/repository/repository.component.ts
@@ -1,11 +1,10 @@
-import { Component, computed, effect, input, signal } from '@angular/core';
+import { Component, computed, effect, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
import { BrnSelectModule } from '@spartan-ng/ui-select-brain';
import { HlmSelectModule } from '@spartan-ng/ui-select-helm';
import { HlmLabelModule } from '@spartan-ng/ui-label-helm';
-// ls1intum/Artemis, ls1intum/Pyris, ls1intum/Athena, ls1intum/Athena-CoFee, ls1intum/artemis-ansible-collection, ls1intum/Ares, ls1intum/Ares2, ls1intum/Aeolus, ls1intum/hades, ls1intum/Apollon, ls1intum/Hephaestus, ls1intum/Apollon_standalone
export const repositoryNames = [
'ls1intum/Artemis',
'ls1intum/Athena',
@@ -55,8 +54,8 @@ export class LeaderboardFilterRepositoryComponent {
constructor(private router: Router) {
this.value.set(this.router.parseUrl(this.router.url).queryParams['repository'] ?? 'all');
+
effect(() => {
- console.log('LeaderboardFilterRepositoryComponent: effect: ', this.value());
if (!this.value() || this.value() === '') return;
const queryParams = this.router.parseUrl(this.router.url).queryParams;
if (this.value() === 'all') {
diff --git a/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts b/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts
index ed200acc..72d90e3a 100644
--- a/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts
+++ b/webapp/src/app/home/leaderboard/filter/timeframe/timeframe.component.ts
@@ -1,4 +1,4 @@
-import { Component, computed, effect, input, signal } from '@angular/core';
+import { Component, computed, effect, signal } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { Router, RouterLink } from '@angular/router';
import dayjs from 'dayjs';
@@ -17,7 +17,7 @@ dayjs.extend(weekOfYear);
function formatLabel(startDate: dayjs.Dayjs, endDate: dayjs.Dayjs | undefined) {
const calendarWeek = startDate.week();
- if (!endDate) {
+ if (!endDate || endDate.isSame(dayjs(), 'day')) {
return `CW\xa0${calendarWeek}:\xa0${startDate.format('MMM D')}\xa0-\xa0Today`;
}
@@ -36,9 +36,8 @@ function formatLabel(startDate: dayjs.Dayjs, endDate: dayjs.Dayjs | undefined) {
templateUrl: './timeframe.component.html'
})
export class LeaderboardFilterTimeframeComponent {
- after = input('');
- before = input('');
-
+ after = signal('');
+ before = signal('');
value = signal(`${this.after()}.${this.before()}`);
placeholder = computed(() => {
@@ -71,6 +70,12 @@ export class LeaderboardFilterTimeframeComponent {
});
constructor(private router: Router) {
+ // init params
+ const queryParams = this.router.parseUrl(this.router.url).queryParams;
+ this.after.set(queryParams['after'] ?? dayjs().day(1).format('YYYY-MM-DD'));
+ this.before.set(queryParams['before'] ?? dayjs().format('YYYY-MM-DD'));
+
+ // persist changes in url
effect(() => {
if (this.value().length === 1) return;
diff --git a/webapp/src/app/home/leaderboard/leaderboard.component.html b/webapp/src/app/home/leaderboard/leaderboard.component.html
index 3318e303..7f167945 100644
--- a/webapp/src/app/home/leaderboard/leaderboard.component.html
+++ b/webapp/src/app/home/leaderboard/leaderboard.component.html
@@ -28,6 +28,15 @@
}
+ } @else if (!leaderboard() || leaderboard()?.length === 0) {
+
+ |
+
+
+ No entries found
+
+ |
+
} @else {
@for (entry of leaderboard(); track entry.githubName) {
diff --git a/webapp/src/app/home/leaderboard/leaderboard.component.ts b/webapp/src/app/home/leaderboard/leaderboard.component.ts
index 50e322ac..bde91e08 100644
--- a/webapp/src/app/home/leaderboard/leaderboard.component.ts
+++ b/webapp/src/app/home/leaderboard/leaderboard.component.ts
@@ -1,6 +1,6 @@
import { Component, input } from '@angular/core';
import { NgIconComponent } from '@ng-icons/core';
-import { octFileDiff, octCheck, octComment, octGitPullRequest, octChevronLeft } from '@ng-icons/octicons';
+import { octFileDiff, octCheck, octComment, octGitPullRequest, octChevronLeft, octNoEntry } from '@ng-icons/octicons';
import { LeaderboardEntry } from 'app/core/modules/openapi';
import { TableBodyDirective } from 'app/ui/table/table-body.directive';
import { TableCaptionDirective } from 'app/ui/table/table-caption.directive';
@@ -37,6 +37,7 @@ export class LeaderboardComponent {
protected octComment = octComment;
protected octGitPullRequest = octGitPullRequest;
protected octChevronLeft = octChevronLeft;
+ protected octNoEntry = octNoEntry;
protected Math = Math;
protected Array = Array;