Skip to content

Disabling score menu if fight is over. #637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
softwaremagico merged 1 commit into from
Nov 11, 2025
Merged

Disabling score menu if fight is over. #637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions frontend/src/app/components/fight/duel/user-score/fault/fault.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<div [matMenuTriggerFor]="menu" class="fault" *ngIf="!locked &&
<div [matMenuTriggerFor]="duel.finished ? null : menu" class="fault" *ngIf="!locked &&
(RbacActivity.ASSIGN_FAULTS | rbac : this.rbacService.getActivities())">
<mat-menu #menu="matMenu">
<button (click)="updateFault(true)" *ngIf="this.duel.competitor1 !== null && this.duel.competitor2 !== null"
<button [disabled]="duel.finished" (click)="updateFault(true)"
mat-menu-item>{{'fault' | translate}}
</button>
<button (click)="updateFault(false)" mat-menu-item>{{'clear' | translate}}</button>
<button [disabled]="duel.finished" (click)="updateFault(false)" mat-menu-item>{{'clear' | translate}}</button>
</mat-menu>
<div *ngIf="(this.left && !this.swapTeams) || (!this.left && this.swapTeams) ?
this.duel.competitor1Fault && this.duel.competitor1Fault : this.duel.competitor2Fault"
Expand Down
12 changes: 6 additions & 6 deletions frontend/src/app/components/fight/duel/user-score/score/score.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<div [matMenuTriggerFor]="menu" class="score-area" *ngIf="!locked &&
<div [matMenuTriggerFor]="duel.finished ? null : menu" class="score-area" *ngIf="!locked &&
(RbacActivity.EDIT_DUEL | rbac : this.rbacService.getActivities())">
<mat-menu #menu="matMenu">
<button (click)="updateScore(score)" *ngFor="let score of possibleScores()"
mat-menu-item>{{Score.toCamel(score) | translate}}
<button [disabled]="duel.finished" (click)="updateScore(score)" *ngFor="let score of possibleScores()"
mat-menu-item>{{ Score.toCamel(score) | translate }}
</button>
</mat-menu>
<div (mouseout)="clearCoordinates()" (mouseover)="updateCoordinates($event)" *ngIf="scoreRepresentation!==''"
(focus)="clearCoordinates();"
(blur)="clearCoordinates();"
class="point" [ngClass]="{'hidden-point': scoreRepresentation === 'F'}" >
<span class="point-value">{{scoreRepresentation}}</span>
class="point" [ngClass]="{'hidden-point': scoreRepresentation === 'F'}">
<span class="point-value">{{ scoreRepresentation }}</span>
<div *ngIf="this.timeRepresentation" [innerHTML]="tooltipText()"
[ngClass]="{
'left-border': onLeftBorder,
Expand All @@ -24,7 +24,7 @@
<!-- Score representation when menu is disabled -->
<div class="score-area" *ngIf="locked || !(RbacActivity.EDIT_DUEL | rbac : this.rbacService.getActivities())">
<div class="point" *ngIf="scoreRepresentation!==''">
{{scoreRepresentation}}
{{ scoreRepresentation }}
<div *ngIf="this.timeRepresentation" [innerHTML]="tooltipText()"
[ngClass]="{
'left-border': onLeftBorder,
Expand Down
6 changes: 6 additions & 0 deletions frontend/src/app/components/fight/duel/user-score/score/score.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,9 @@
padding-right: 3px;
padding-left: 2px;
}

.disabled {
pointer-events: none;
opacity: .5;
}

Loading