-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added match review and audience display fix.
- Loading branch information
1 parent
b40a7c9
commit 3037d18
Showing
12 changed files
with
342 additions
and
27 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,207 @@ | ||
| import * as React from "react"; | ||
| import {Button, Card, Dimmer, DropdownProps, Form, Grid, Loader} from "semantic-ui-react"; | ||
| import GameSpecificScorecard from "../../components/GameSpecificScorecard"; | ||
| import EventConfiguration from "../../shared/models/EventConfiguration"; | ||
| import {ApplicationActions, IApplicationState} from "../../stores"; | ||
| import {connect} from "react-redux"; | ||
| import {PostQualConfig, TournamentLevels} from "../../shared/AppTypes"; | ||
| import Match from "../../shared/models/Match"; | ||
| import {getTheme} from "../../shared/AppTheme"; | ||
| import {SyntheticEvent} from "react"; | ||
| import MatchFlowController from "../match-play/controllers/MatchFlowController"; | ||
| import {ISetActiveDetails, ISetActiveMatch, ISetActiveParticipants} from "../../stores/scoring/types"; | ||
| import MatchDetails from "../../shared/models/MatchDetails"; | ||
| import MatchParticipant from "../../shared/models/MatchParticipant"; | ||
| import {Dispatch} from "redux"; | ||
| import {setActiveDetails, setActiveMatch, setActiveParticipants} from "../../stores/scoring/actions"; | ||
| import HttpError from "../../shared/models/HttpError"; | ||
| import DialogManager from "../../shared/managers/DialogManager"; | ||
| import {IDisableNavigation, ISetEliminationsMatches} from "../../stores/internal/types"; | ||
| import {disableNavigation, setEliminationsMatches} from "../../stores/internal/actions"; | ||
| import ConfirmActionModal from "../../components/ConfirmActionModal"; | ||
|
|
||
| interface IProps { | ||
| eventConfig?: EventConfiguration, | ||
| practiceMatches?: Match[], | ||
| qualificationMatches?: Match[], | ||
| finalsMatches?: Match[], | ||
| elimsMatches?: Match[], | ||
| activeMatch?: Match, | ||
| activeDetails?: MatchDetails, | ||
| activeParticipants?: MatchParticipant[], | ||
| setActiveMatch?: (match: Match) => ISetActiveMatch, | ||
| setActiveDetails?: (details: MatchDetails) => ISetActiveDetails, | ||
| setActiveParticipants?: (participants: MatchParticipant[]) => ISetActiveParticipants, | ||
| setNavigationDisabled?: (disabled: boolean) => IDisableNavigation, | ||
| setEliminationsMatches?: (match: Match[]) => ISetEliminationsMatches | ||
| } | ||
|
|
||
| interface IState { | ||
| selectedLevel: TournamentLevels, | ||
| updatingScores: boolean, | ||
| confirmModalOpen: boolean | ||
| } | ||
|
|
||
| class MatchReviewView extends React.Component<IProps, IState> { | ||
| constructor(props: IProps) { | ||
| super(props); | ||
| this.state = { | ||
| selectedLevel: "Practice", | ||
| updatingScores: false, | ||
| confirmModalOpen: false | ||
| }; | ||
| this.changeSelectedLevel = this.changeSelectedLevel.bind(this); | ||
| this.changeSelectedMatch = this.changeSelectedMatch.bind(this); | ||
| this.openConfirmModal = this.openConfirmModal.bind(this); | ||
| this.closeConfirmModal = this.closeConfirmModal.bind(this); | ||
| this.updateScores = this.updateScores.bind(this); | ||
| } | ||
|
|
||
| public render() { | ||
| const {eventConfig, activeMatch} = this.props; | ||
| const {selectedLevel, updatingScores, confirmModalOpen} = this.state; | ||
|
|
||
| const availableLevels = this.getAvailableTournamentLevels(eventConfig.postQualConfig).map(tournamentLevel => { | ||
| return { | ||
| text: tournamentLevel, | ||
| value: tournamentLevel | ||
| }; | ||
| }); | ||
|
|
||
| const availableMatches = this.getMatchesByTournamentLevel(selectedLevel).map(match => { | ||
| return { | ||
| text: match.matchName, | ||
| value: match.matchKey | ||
| }; | ||
| }); | ||
| const selectedMatch: Match = activeMatch === null ? new Match() : activeMatch; | ||
| return ( | ||
| <div className="view"> | ||
| <ConfirmActionModal open={confirmModalOpen} onClose={this.closeConfirmModal} onConfirm={this.updateScores} innerText={`Are you sure you want to update the scores for ${selectedMatch.matchName}? (${selectedMatch.matchKey})`}/> | ||
| <Card fluid={true} color={getTheme().secondary}> | ||
| <Card.Content> | ||
| <Grid columns={16}> | ||
| <Grid.Row> | ||
| <Grid.Column width={3}><Form.Dropdown fluid={true} selection={true} disabled={updatingScores} value={selectedLevel} options={availableLevels} onChange={this.changeSelectedLevel} label="Tournament Level"/></Grid.Column> | ||
| <Grid.Column width={3}><Form.Dropdown fluid={true} selection={true} disabled={updatingScores} value={selectedMatch.matchKey} options={availableMatches} onChange={this.changeSelectedMatch} label="Match"/></Grid.Column> | ||
| <Grid.Column width={7}/> | ||
| <Grid.Column width={3} verticalAlign={"bottom"}><Button fluid={true} color="red" disabled={selectedMatch === null || typeof selectedMatch === "undefined" || updatingScores} loading={updatingScores} onClick={this.openConfirmModal}>Update Scores</Button></Grid.Column> | ||
| </Grid.Row> | ||
| </Grid> | ||
| </Card.Content> | ||
| </Card> | ||
| <Card.Group itemsPerRow={2}> | ||
| <Dimmer active={updatingScores}> | ||
| <Loader/> | ||
| </Dimmer> | ||
| <GameSpecificScorecard type={eventConfig.eventType} alliance={"Red"}/> | ||
| <GameSpecificScorecard type={eventConfig.eventType} alliance={"Blue"}/> | ||
| </Card.Group> | ||
| </div> | ||
| ); | ||
| } | ||
|
|
||
| private openConfirmModal() { | ||
| this.setState({confirmModalOpen: true}); | ||
| } | ||
|
|
||
| private closeConfirmModal() { | ||
| this.setState({confirmModalOpen: false}); | ||
| } | ||
|
|
||
| private getAvailableTournamentLevels(postQualConfig: PostQualConfig): TournamentLevels[] { | ||
| return ["Practice", "Qualification", postQualConfig === "elims" ? "Eliminations" : "Finals"]; | ||
| } | ||
|
|
||
| private getMatchesByTournamentLevel(tournamentLevel: TournamentLevels): Match[] { // TODO - Only show fields that EMS controls | ||
| switch (tournamentLevel) { | ||
| case "Practice": | ||
| return this.props.practiceMatches.filter(match => this.props.eventConfig.fieldsControlled.indexOf(match.fieldNumber) > -1); | ||
| case "Qualification": | ||
| return this.props.qualificationMatches.filter(match => this.props.eventConfig.fieldsControlled.indexOf(match.fieldNumber) > -1); | ||
| case "Finals": | ||
| return this.props.finalsMatches.filter(match => this.props.eventConfig.fieldsControlled.indexOf(match.fieldNumber) > -1); | ||
| case "Eliminations": | ||
| return this.props.elimsMatches.filter(match => this.props.eventConfig.fieldsControlled.indexOf(match.fieldNumber) > -1); | ||
| default: | ||
| return []; | ||
| } | ||
| } | ||
|
|
||
| private changeSelectedLevel(event: SyntheticEvent, props: DropdownProps) { | ||
| const matches = this.getMatchesByTournamentLevel((props.value as TournamentLevels)); | ||
| if (matches.length > 0) { | ||
| this.props.setActiveMatch(matches[0]); | ||
| this.setState({ | ||
| selectedLevel: (props.value as TournamentLevels), | ||
| }); | ||
| } else { | ||
| this.setState({ | ||
| selectedLevel: (props.value as TournamentLevels) | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| private changeSelectedMatch(event: SyntheticEvent, props: DropdownProps) { | ||
| for (const match of this.getMatchesByTournamentLevel(this.state.selectedLevel)) { | ||
| if (match.matchKey === (props.value as string)) { | ||
| this.props.setActiveMatch(match); | ||
| // Temporarily set the match to what we have now, and then get ALL the details. | ||
| MatchFlowController.getMatchResults(match.matchKey).then((data: Match) => { | ||
| this.props.setActiveMatch(data); | ||
| this.props.setActiveParticipants(data.participants); | ||
| this.props.setActiveDetails(data.matchDetails); | ||
| }); | ||
| break; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private updateScores() { | ||
| // Make sure all of our 'active' objects are on the same page. | ||
| this.setState({updatingScores: true, confirmModalOpen: false}); | ||
| this.props.activeMatch.matchDetails = this.props.activeDetails; | ||
| this.props.activeMatch.participants = this.props.activeParticipants; | ||
| MatchFlowController.commitScores(this.props.activeMatch, this.props.eventConfig).then(() => { | ||
| this.props.setNavigationDisabled(false); | ||
| this.setState({updatingScores: false}); | ||
| if (this.props.activeMatch.tournamentLevel >= 10) { | ||
| MatchFlowController.checkForAdvancements(this.props.activeMatch.tournamentLevel, this.props.eventConfig.elimsFormat).then((matches: Match[]) => { | ||
| if (this.props.elimsMatches.length < matches.length) { | ||
| this.props.setEliminationsMatches(matches); | ||
| } | ||
| }).catch((error: HttpError) => { | ||
| console.error(error); | ||
| }); | ||
| } | ||
| }).catch((error: HttpError) => { | ||
| this.setState({updatingScores: false}); | ||
| DialogManager.showErrorBox(error); | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| export function mapStateToProps({configState, internalState, scoringState}: IApplicationState) { | ||
| return { | ||
| eventConfig: configState.eventConfiguration, | ||
| practiceMatches: internalState.practiceMatches, | ||
| qualificationMatches: internalState.qualificationMatches, | ||
| finalsMatches: internalState.finalsMatches, | ||
| elimsMatches: internalState.eliminationsMatches, | ||
| activeMatch: scoringState.activeMatch, | ||
| activeDetails: scoringState.activeDetails, | ||
| activeParticipants: scoringState.activeParticipants | ||
| }; | ||
| } | ||
|
|
||
| export function mapDispatchToProps(dispatch: Dispatch<ApplicationActions>) { | ||
| return { | ||
| setActiveMatch: (match: Match) => dispatch(setActiveMatch(match)), | ||
| setActiveDetails: (details: MatchDetails) => dispatch(setActiveDetails(details)), | ||
| setActiveParticipants: (participants: MatchParticipant[]) => dispatch(setActiveParticipants(participants)), | ||
| setNavigationDisabled: (disabled: boolean) => dispatch(disableNavigation(disabled)), | ||
| setEliminationsMatches: (matches: Match[]) => dispatch(setEliminationsMatches(matches)) | ||
| }; | ||
| } | ||
|
|
||
| export default connect(mapStateToProps, mapDispatchToProps)(MatchReviewView); |
Oops, something went wrong.