Merge pull request #275 from softwaremagico/273-not-handling-correctl…

…y-tied-ranking-for-the-2nd-winner-of-a-group Fixing draw groups not resolved.
softwaremagico · Nov 21, 2023 · bf36b1a · bf36b1a
2 parents d07c371 + 787b8a3
commit bf36b1a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 3 deletions.
diff --git a/frontend/src/app/components/team-ranking/team-ranking.component.html b/frontend/src/app/components/team-ranking/team-ranking.component.html
@@ -33,9 +33,8 @@
     <mat-icon>file_download</mat-icon>
     {{'download' | translate}}
   </button>
-  <button (click)="undrawTeams(0)" *ngIf="!tournament!.locked && fightsFinished &&
-  (RbacActivity.READ_TEAMS_RANKINGS | rbac : this.rbacService.activities) &&
-  (isDrawWinner(0) || isDrawWinner(1) || isDrawWinner(2))" mat-flat-button mat-raised-button>
+  <button (click)="undrawAllTeams()" *ngIf="!tournament!.locked && fightsFinished && importantDrawWinner() &&
+  (RbacActivity.READ_TEAMS_RANKINGS | rbac : this.rbacService.activities)" mat-flat-button mat-raised-button>
     <mat-icon class="kendo-icon" svgIcon="undraw-score"></mat-icon>
     {{'undraw' | translate}}
   </button>

diff --git a/frontend/src/app/components/team-ranking/team-ranking.component.ts b/frontend/src/app/components/team-ranking/team-ranking.component.ts
@@ -30,6 +30,7 @@ export class TeamRankingComponent extends RbacBasedComponent implements OnInit {
   group: Group;
   showIndex: boolean | undefined;
   existsDraws: boolean = false;
+  numberOfWinners: number;
 
   private destroy$: Subject<void> = new Subject<void>();
   _loading = false;
@@ -57,6 +58,7 @@ export class TeamRankingComponent extends RbacBasedComponent implements OnInit {
 
           forkJoin([rankingRequest, winnersRequest]).subscribe(([_scoresOfTeams, _numberOfWinners]): void => {
             this.teamScores = _scoresOfTeams;
+            this.numberOfWinners = _numberOfWinners !== undefined ? Number(_numberOfWinners.propertyValue) : 1;
             if (this.isDrawWinner(0) || (_numberOfWinners && _numberOfWinners.propertyValue == "2" && this.isDrawWinner(1))) {
               this.messageService.warningMessage("drawScore");
               this.existsDraws = true;
@@ -73,6 +75,16 @@ 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;
+      }
+    }
+    return false;
+  }
+
   isDrawWinner(index: number): boolean {
     return this.teamScores && this.fightsFinished && this.teamScores.filter((scoreOfTeam: ScoreOfTeam): boolean => scoreOfTeam.sortingIndex === index).length > 1;
   }
@@ -118,6 +130,14 @@ export class TeamRankingComponent extends RbacBasedComponent implements OnInit {
     }
   }
 
+  undrawAllTeams(): void {
+    for (let i = 0; i < this.numberOfWinners; i++) {
+      if (this.isDrawWinner(i)) {
+        this.undrawTeams(i);
+      }
+    }
+  }
+
   undrawTeams(index: number): void {
     const teams: Team[] = this.getDrawWinners(index);
     this.dialog.open(UndrawTeamsComponent, {