Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions public/wcif-extensions/CompetitionConfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@
"printScrambleCheckerForBlankScorecards": {
"description": "A flag indicating whether the box for scrambler checker signature should be printed for blank scorecards.",
"type": "boolean"
},
"printDedicatedMultiBlindScorecards": {
"description": "A flag indicating whether special Multi-Blind scorecards should be printed",
"type": "boolean"
}
},
"required": ["localNamesFirst", "printOneName", "scorecardsBackgroundUrl", "competitorsSortingRule", "noTasksForNewcomers", "tasksForOwnEventsOnly"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ const GeneralConfig = ({ wcif, onWcifChange }) => {
printScrambleCheckerForTopRankedCompetitors,
printScrambleCheckerForFinalRounds,
printScrambleCheckerForBlankScorecards,
printDedicatedMultiBlindScorecards,
} = getExtensionData('CompetitionConfig', wcif);

return (
Expand Down Expand Up @@ -299,6 +300,18 @@ const GeneralConfig = ({ wcif, onWcifChange }) => {
label="Print out scrambler checker sign box for blank scorecards"
/>
</Grid>
<Grid>
<FormControlLabel
control={
<Checkbox
name="printDedicatedMultiBlindScorecards"
checked={printDedicatedMultiBlindScorecards}
onChange={handleCheckboxChange}
/>
}
label="Print out dedicated Multi-Blind scorecards"
/>
</Grid>
<Grid>
<FormControlLabel
control={
Expand Down
27 changes: 26 additions & 1 deletion src/components/Competition/PrintingManager/PrintingManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,16 @@ import {
roundsMissingAssignments,
activityCodeToName,
} from '../../../logic/activities';
import { getExtensionData } from '../../../logic/wcif-extensions';

const PrintingManager = ({ wcif }) => {
const [tabValue, setTabValue] = useState(0);

const { printDedicatedMultiBlindScorecards } = getExtensionData(
'CompetitionConfig',
wcif
);

const roundsMissingAssignmentsNames = roundsMissingAssignments(
wcif
).map(round => activityCodeToName(round.id));
Expand Down Expand Up @@ -49,11 +55,30 @@ const PrintingManager = ({ wcif }) => {
<Tabs value={tabValue} onChange={(event, value) => setTabValue(value)}>
<Tab label="Scorecards" />
<Tab label="Competitor cards" />
{printDedicatedMultiBlindScorecards && (
<Tab label="Multi-Blind scorecards" />
)}
</Tabs>
</Grid>
<Grid item xs={12}>
{tabValue === 0 && <Scorecards wcif={wcif} />}
{tabValue === 0 && (
<Scorecards
wcif={wcif}
printDedicatedMultiBlindScorecards={
printDedicatedMultiBlindScorecards
}
/>
)}
{tabValue === 1 && <CompetitorCards wcif={wcif} />}
{printDedicatedMultiBlindScorecards && tabValue === 2 && (
<Scorecards
wcif={wcif}
multiBlindOnly={true}
printDedicatedMultiBlindScorecards={
printDedicatedMultiBlindScorecards
}
/>
)}
</Grid>
<Grid item>
<Button
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@ import {
import { difference, sortBy } from '../../../../logic/utils';
import languageInfo from '../../../../logic/translations';

const Scorecards = ({ wcif }) => {
const Scorecards = ({
wcif,
multiBlindOnly,
printDedicatedMultiBlindScorecards,
}) => {
const missingScorecards = roundsMissingScorecards(wcif);
const [selectedRounds, setSelectedRounds] = useState(
missingScorecards.every(
Expand All @@ -39,8 +43,13 @@ const Scorecards = ({ wcif }) => {
: []
);
const rounds = sortBy(
roundsWithoutResults(wcif).filter(
round => parseActivityCode(round.id).eventId !== '333fm'
roundsWithoutResults(wcif).filter(round =>
parseActivityCode(round.id).eventId !== '333fm' &&
printDedicatedMultiBlindScorecards
? multiBlindOnly
? parseActivityCode(round.id).eventId === '333mbf'
: parseActivityCode(round.id).eventId !== '333mbf'
: true
),
round => parseActivityCode(round.id).roundNumber
);
Expand Down Expand Up @@ -147,7 +156,13 @@ const Scorecards = ({ wcif }) => {
<Grid item>
<Button
onClick={() =>
downloadScorecards(wcif, selectedRounds, selectedRooms, language)
downloadScorecards(
wcif,
selectedRounds,
selectedRooms,
language,
multiBlindOnly ? 'landscape' : 'horizontal'
)
}
disabled={isSelectionEmpty}
>
Expand All @@ -165,11 +180,13 @@ const Scorecards = ({ wcif }) => {
</Button>
</Grid>
<Grid item style={{ flexGrow: 1 }} />
<Grid item>
<Button onClick={() => downloadBlankScorecards(wcif, language)}>
Blank scorecards
</Button>
</Grid>
{!multiBlindOnly && (
<Grid item>
<Button onClick={() => downloadBlankScorecards(wcif, language)}>
Blank scorecards
</Button>
</Grid>
)}
</Grid>
</Paper>
);
Expand Down
Loading