diff --git a/src/app/jury/jury.component.html b/src/app/jury/jury.component.html index 6ed783e..a1906f2 100644 --- a/src/app/jury/jury.component.html +++ b/src/app/jury/jury.component.html @@ -1,152 +1,153 @@

No pilots for the moment...

Current run

Aucune Api renseignée
Judge {{pilot.seat}} - Pilot : {{pilot.nickname}} | Run n°{{pilot.run}}
False start : Yes
False start : No
Obstructed gate : {{pilot.obstructedGate}}
Obstructed gate : {{pilot.obstructedGate}}
Collision during recovery : {{pilot.collisionRecovery}}
Collision during recovery : {{pilot.collisionRecovery}}
Circuit exit / Above safety net : {{pilot.circuitExit}}
Circuit exit / Above safety net : {{pilot.circuitExit}}
Crash : {{pilot.crash}}
Crash : {{pilot.crash}}
Crashed
In flight
Video problem : {{pilot.videoProblems}}
Video problem : {{pilot.videoProblems}}
Celebratory manoeuvre : {{pilot.celebratoryManoeuvre}}
Celebratory manoeuvre : {{pilot.celebratoryManoeuvre}}
Hazardous / Dangerous piloting : {{pilot.dangerousPiloting}}
Hazardous / Dangerous piloting : {{pilot.dangerousPiloting}}
Missed gate : {{pilot.missedGate}}
Missed gate : {{pilot.missedGate}}
Circuit cut : {{pilot.circuitCut}}
Circuit cut : {{pilot.circuitCut}}
Failsage : {{pilot.failsafe}}
Failsafe : {{pilot.failsafe}}

Old run

- - - +
+
+ + + + -
- +
+
- - - - - + + + + + - - - + + + + - - - - -
{{column}} {{element[column]}} {{column}} {{element[column]}} -
-
-
-
False start : Yes
-
False start : No
+ +
+
-
Obstructed gate : {{element.obstructedGate}}
-
Obstructed gate : {{element.obstructedGate}}
+
+
+
False start : Yes
+
False start : No
-
Collision during recovery : {{element.collisionRecovery}}
-
Collision during recovery : {{element.collisionRecovery}}
+
Obstructed gate : {{element.obstructedGate}}
+
Obstructed gate : {{element.obstructedGate}}
-
Circuit exit / Above safety net : {{element.circuitExit}}
-
Circuit exit / Above safety net : {{element.circuitExit}}
-
+
Collision during recovery : {{element.collisionRecovery}}
+
Collision during recovery : {{element.collisionRecovery}}
+ +
Circuit exit / Above safety net : {{element.circuitExit}}
+
Circuit exit / Above safety net : {{element + .circuitExit}}
+
-
-
Crash : {{element.crash}}
-
Crash : {{element.crash}}
+
+
Crash : {{element.crash}}
+
Crash : {{element.crash}}
-
Video problem : {{element.videoProblems}}
-
Video problem : {{element.videoProblems}}
+
Video problem : {{element.videoProblems}}
+
Video problem : {{element.videoProblems}}
-
Celebratory manoeuvre : {{element.celebratoryManoeuvre}}
-
Celebratory manoeuvre : {{element.celebratoryManoeuvre}}
+
Celebratory manoeuvre : {{element.celebratoryManoeuvre}}
+
Celebratory manoeuvre : {{element.celebratoryManoeuvre}}
-
Hazardous / Dangerous piloting : {{element.dangerousPiloting}}
-
Hazardous / Dangerous piloting : {{element.dangerousPiloting}}
-
+
Hazardous / Dangerous piloting : {{element.dangerousPiloting}}
+
Hazardous / Dangerous piloting : {{element.dangerousPiloting}}
+
-
-
Missed gate : {{element.missedGate}}
-
Missed gate : {{element.missedGate}}
+
+
Missed gate : {{element.missedGate}}
+
Missed gate : {{element.missedGate}}
-
Circuit cut : {{element.circuitCut}}
-
Circuit cut : {{element.circuitCut}}
+
Circuit cut : {{element.circuitCut}}
+
Circuit cut : {{element.circuitCut}}
-
Failsage : {{element.failsafe}}
-
Failsafe : {{element.failsafe}}
-
-
+
Failsage : {{element.failsafe}}
+
Failsafe : {{element.failsafe}}
-
+ + + + - -
-
+ - diff --git a/src/app/jury/jury.component.ts b/src/app/jury/jury.component.ts index bdffd9f..7005be3 100644 --- a/src/app/jury/jury.component.ts +++ b/src/app/jury/jury.component.ts @@ -1,77 +1,78 @@ import {Component, OnInit, ViewChild} from '@angular/core'; import {AuthenticationService} from '../_services'; import {Router} from '@angular/router'; import {PilotsService} from '../_services/pilots.service'; import {MatPaginator} from '@angular/material/paginator'; import {MatSort} from '@angular/material/sort'; import {MatTableDataSource} from '@angular/material/table'; import {animate, state, style, transition, trigger} from '@angular/animations'; @Component({ selector: 'app-jury', templateUrl: './jury.component.html', styleUrls: ['./jury.component.css'], animations: [ trigger('detailExpand', [ state('collapsed', style({height: '0px', minHeight: '0'})), state('expanded', style({height: '*'})), transition('expanded <=> collapsed', animate('225ms cubic-bezier(0.4, 0.0, 0.2, 1)')), ]), ], }) export class JuryComponent implements OnInit { columnsToDisplay = ['pilotId', 'nickname', 'seat', 'run', 'race'] expandedElement: any | null; dataSource: MatTableDataSource; @ViewChild(MatPaginator, {static: true}) paginator: MatPaginator; @ViewChild(MatSort, {static: true}) sort: MatSort; ngOnInit() { if (this.authenticationService.currentUserValue.role != 'jury' && this.authenticationService.currentUserValue.role != 'admin') { this.router.navigate(['home']); } else { if (this.pilotService.passedPilots == undefined) { this.pilotService.getPassedPilots().subscribe(data => { this.pilotService.passedPilots = data; this.updateMatTableDataSource(); }); } else { this.updateMatTableDataSource(); } } } constructor(private router: Router, private authenticationService: AuthenticationService, private pilotService: PilotsService) { } /** * Update the data source for passed pilots table */ updateMatTableDataSource() { this.dataSource = new MatTableDataSource(this.pilotService.passedPilots); this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; } /** * Apply a filter for passed pilots table * @param filterValue */ applyFilter(filterValue: string) { this.dataSource.filter = filterValue.trim().toLowerCase(); if (this.dataSource.paginator) { this.dataSource.paginator.firstPage(); } } /** * charge next run from API */ nextRun() { this.pilotService.updateNewPilots(); + } }