fix: toggles were wrongly showing

Badminton-Apps · Aug 19, 2024 · 251bdd2 · 251bdd2
1 parent 9eac8ae
commit 251bdd2
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 29 deletions.
diff --git a/.../pages/player/src/pages/ranking-breakdown/components/list-games/list-games.component.html b/.../pages/player/src/pages/ranking-breakdown/components/list-games/list-games.component.html
@@ -3,20 +3,6 @@
     <button mat-stroked-button [matMenuTriggerFor]="menu">Filter</button>
     <mat-menu #menu="matMenu">
       <form [formGroup]="this.breakdownService.filter">
-        <mat-slide-toggle (click)="$event.stopPropagation()" formControlName="includedIgnored">
-          {{ 'all.ranking.breakdown.notUsed' | translate }}:
-          {{
-            lostGamesIgnored()
-              | i18nPlural
-                : {
-                    '=0': 'all.ranking.breakdown.lostGames.none',
-                    '=1': 'all.ranking.breakdown.lostGames.one',
-                    other: 'all.ranking.breakdown.lostGames.other',
-                  }
-              | translate: { count: lostGamesIgnored() }
-          }}</mat-slide-toggle
-        >
-
         <mat-slide-toggle (click)="$event.stopPropagation()" formControlName="includedUpgrade">
           {{ 'all.ranking.breakdown.used-for-upgrade' | translate }}:
           {{
@@ -79,22 +65,19 @@
             }}
           </mat-slide-toggle>
 
-          <mat-slide-toggle
-            (click)="$event.stopPropagation()"
-            formControlName="includeOutOfScopeWonGames"
-          >
-            {{ 'all.ranking.breakdown.outOfScopeWonGames' | translate }}:
+          <mat-slide-toggle (click)="$event.stopPropagation()" formControlName="includedIgnored">
+            {{ 'all.ranking.breakdown.notUsed' | translate }}:
             {{
-              wonGames()
+              lostGamesIgnored()
                 | i18nPlural
                   : {
-                      '=0': 'all.ranking.breakdown.outOfScope.none',
-                      '=1': 'all.ranking.breakdown.outOfScope.one',
-                      other: 'all.ranking.breakdown.outOfScope.other',
+                      '=0': 'all.ranking.breakdown.lostGames.none',
+                      '=1': 'all.ranking.breakdown.lostGames.one',
+                      other: 'all.ranking.breakdown.lostGames.other',
                     }
-                | translate: { count: wonGames() }
-            }}
-          </mat-slide-toggle>
+                | translate: { count: lostGamesIgnored() }
+            }}</mat-slide-toggle
+          >
         }
       </form>
     </mat-menu>

diff --git a/...nd/pages/player/src/pages/ranking-breakdown/components/list-games/list-games.component.ts b/...nd/pages/player/src/pages/ranking-breakdown/components/list-games/list-games.component.ts
@@ -188,16 +188,17 @@ export class ListGamesComponent {
     () => this.currGames().filter((x) => x.type == GameBreakdownType.LOST_IGNORED).length,
   );
 
+
   outOfScopeGamesUpgrade = computed(
     () =>
       this.currGames().filter(
-        (x) => x.type == GameBreakdownType.LOST_UPGRADE && !x.usedForDowngrade,
+        (x) => x.type == GameBreakdownType.LOST_UPGRADE && !x.usedForUpgrade,
       ).length,
   );
   outOfScopeGamesDowngrade = computed(
     () =>
       this.currGames().filter(
-        (x) => x.type == GameBreakdownType.LOST_DOWNGRADE && !x.usedForUpgrade,
+        (x) => x.type == GameBreakdownType.LOST_DOWNGRADE && !x.usedForDowngrade,
       ).length,
   );
 

diff --git a/libs/utils/src/lib/i18n.generated.ts b/libs/utils/src/lib/i18n.generated.ts
@@ -1,6 +1,6 @@
 /* DO NOT EDIT, file generated by nestjs-i18n */
 
- 
+/* eslint-disable */
 /* prettier-ignore */
 import { Path } from "nestjs-i18n";
 /* prettier-ignore */