Merge pull request #504 from softwaremagico/499-timer-time-is-restart…

…ed-after-adding-one-point 499 timer time is restarted after adding one point
softwaremagico · Oct 21, 2024 · aac6919 · aac6919
2 parents 2e58d48 + 2b0c5b0
commit aac6919
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@
 [![GitHub commit activity](https://img.shields.io/github/commit-activity/y/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![GitHub last commit](https://img.shields.io/github/last-commit/softwaremagico/KendoTournamentManager)](https://github.com/softwaremagico/KendoTournamentManager)
 [![CircleCI](https://circleci.com/gh/softwaremagico/KendoTournamentManager.svg?style=shield)](https://circleci.com/gh/softwaremagico/KendoTournamentManager)
-[![Time](https://img.shields.io/badge/development-651.5h-blueviolet.svg)]()
+[![Time](https://img.shields.io/badge/development-652h-blueviolet.svg)]()
 
 [![Powered by](https://img.shields.io/badge/powered%20by%20java-orange.svg?logo=OpenJDK&logoColor=white)]()
 [![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=kendo-tournament-backend&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=kendo-tournament-backend)

diff --git a/frontend/src/app/components/basic/basic-table/basic-table.component.ts b/frontend/src/app/components/basic/basic-table/basic-table.component.ts
@@ -133,15 +133,15 @@ export class BasicTableComponent implements OnInit, OnDestroy {
     }
   }
 
-  filter(filter: string) {
+  filter(filter: string): void {
     this.basicTableData.dataSource.filter = filter;
   }
 
   isColumnVisible(column: string): boolean {
     return this.basicTableData.visibleColumns.includes(column);
   }
 
-  toggleColumnVisibility(column: string) {
+  toggleColumnVisibility(column: string): void {
     const index: number = this.basicTableData.visibleColumns.indexOf(column);
     if (index !== -1) {
       this.basicTableData.visibleColumns.splice(index, 1);
@@ -164,7 +164,7 @@ export class BasicTableComponent implements OnInit, OnDestroy {
   }
 
 
-  onPaginateChange($event: PageEvent) {
+  onPaginateChange($event: PageEvent): void {
     this.userSessionService.setItemsPerPage($event.pageSize);
   }
 

diff --git a/frontend/src/app/components/team-ranking/team-ranking.component.ts b/frontend/src/app/components/team-ranking/team-ranking.component.ts
@@ -77,7 +77,6 @@ export class TeamRankingComponent extends RbacBasedComponent implements OnInit {
   importantDrawWinner(): boolean {
     for (let i = 0; i < this.numberOfWinners; i++) {
       if (this.isDrawWinner(i)) {
-        console.log("Found draws on index ", i);
         return true;
       }
     }

diff --git a/frontend/src/app/views/fight-list/fight-dialog-box/fight-dialog-box.component.ts b/frontend/src/app/views/fight-list/fight-dialog-box/fight-dialog-box.component.ts
@@ -83,7 +83,7 @@ export class FightDialogBoxComponent implements OnInit {
   }
 
   closeDialog(): void {
-    this.dialogRef.close();
+    this.dialogRef.close({action: Action.Cancel, data: this.data});
   }
 
   dropTeam(event: CdkDragDrop<Team[], any>): Team {
@@ -119,7 +119,7 @@ export class FightDialogBoxComponent implements OnInit {
       this.groupServices.update(this.group).subscribe((_group: Group): void => {
         this.messageService.infoMessage("addFightMessage");
         this.groupUpdatedService.isGroupUpdated.next(_group);
-        this.dialogRef.close(this.fight);
+        this.dialogRef.close({action: this.action, data: this.data});
       });
     });