Skip to content

Commit c9ceed4

Browse files
committed
Use defaults on tournament create
1 parent 92482ce commit c9ceed4

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

routes/tournaments.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,8 @@ router.get('/admin', function (req, res, next) {
6363
axios.get(`${req.app.locals.kcapp.api}/venue`),
6464
axios.get(`${req.app.locals.kcapp.api}/match/modes`),
6565
axios.get(`${req.app.locals.kcapp.api}/match/types`),
66-
]).then(axios.spread((groups, presets, playersData, offices, venues, modes, types) => {
66+
axios.get(`${req.app.locals.kcapp.api}/option/default`),
67+
]).then(axios.spread((groups, presets, playersData, offices, venues, modes, types, defaults) => {
6768
const players = _.reject(playersData.data, (player) => player.is_placeholder);
6869
res.marko(tournamentsAdminTemplate, {
6970
groups: groups.data,
@@ -73,6 +74,7 @@ router.get('/admin', function (req, res, next) {
7374
venues: venues.data,
7475
modes: modes.data,
7576
types: types.data,
77+
defaults: defaults.data,
7678
max_rounds: [{ id: -1, name: '-' }, { id: 10, name: 10 }, { id: 12, name: 12 }, { id: 16, name: 16 }, { id: 20, name: 20 }, { id: 30, name: 30 }],
7779
});
7880
})).catch(error => {

src/pages/tournaments-admin/components/tournaments-admin/components/generate-tournament-tab/generate-tournament-tab.component.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ module.exports = {
1919
group2: { group: generatedGroups[1], players: [] },
2020
},
2121
name: `Club Evening ${moment().format("Do MMM")}`,
22-
matchType: input.types[0].id,
23-
matchMode: input.modes[0].id,
24-
startingScore: 501,
25-
maxRounds: -1
22+
matchType: input.defaults.match_type.id,
23+
matchMode: input.defaults.match_mode.id,
24+
startingScore: input.defaults.starting_score || 501,
25+
maxRounds: input.defaults.max_rounds || -1
2626
}
2727
},
2828
onMount() {

src/pages/tournaments-admin/components/tournaments-admin/tournaments-admin.marko

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</ul>
1212
</div>
1313
<div class="tab-content" style="width: 100%;">
14-
<generate-tournament-tab players=input.players presets=input.presets offices=input.offices venues=input.venues groups=input.groups types=input.types modes=input.modes maxRounds=input.maxRounds/>
14+
<generate-tournament-tab players=input.players presets=input.presets offices=input.offices venues=input.venues groups=input.groups types=input.types modes=input.modes maxRounds=input.maxRounds defaults=input.defaults/>
1515
<create-tournament-tab players=input.players types=input.types modes=input.modes offices=input.offices groups=input.groups/>
1616
</div>
1717
</div>

src/pages/tournaments-admin/tournaments-admin-template.marko

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ import Layout from "../layout.marko"
44
<@body>
55
<tournaments-admin groups=input.groups players=input.players offices=input.offices
66
venues=input.venues types=input.types modes=input.modes maxRounds=input.max_rounds
7-
presets=input.presets />
7+
presets=input.presets defaults=input.defaults/>
88
</@body>
99
</>

0 commit comments

Comments
 (0)