From 29605613c0461c1b9dc83a90daf5023a313bcef3 Mon Sep 17 00:00:00 2001 From: sudoer777 <78781902+sudoer777@users.noreply.github.com> Date: Wed, 9 Mar 2022 16:55:07 -0700 Subject: [PATCH] Improve loading for editing divisions --- public/scripts/manage/division.js | 8 ++++++-- routes/fetch.js | 12 ++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/public/scripts/manage/division.js b/public/scripts/manage/division.js index 1d75742..8474b4b 100644 --- a/public/scripts/manage/division.js +++ b/public/scripts/manage/division.js @@ -15,7 +15,7 @@ async function initializeForm() { let params = new URLSearchParams(location.search); let divisionID = params.get('division'); if(divisionID) { - const division = await Data.getDivision(divisionID); + const division = await (await fetch(`/fetch/manage/division?division=${divisionID}`)).json(); nameTextbox.value = division.name; @@ -27,7 +27,11 @@ async function initializeForm() { if(gender == 'female') genderDropdown.selectedIndex = 1; else genderDropdown.selectedIndex = 2; - Form.populateSports(sportDropdown, division.sportID); + let data = {}; + data.sports = [division.sport]; + data.latestGame = {sportID : division.sportID }; + + Form.populateSports(sportDropdown, null, data); Form.addHiddenValue('division', divisionID, submissionForm); } diff --git a/routes/fetch.js b/routes/fetch.js index a8b317e..f807190 100644 --- a/routes/fetch.js +++ b/routes/fetch.js @@ -136,6 +136,18 @@ router.get('/manage/divisions', async function (req, res, next) { res.json(data); }); +router.get('/manage/division', async function (req, res, next) { + try { + const divisionID = req.query.division; + const data = await divisions.getFromID(divisionID); + data.sport = await sports.getFromID(data.sportID); + res.json(data); + } catch(err) { + console.error("ERROR: " + err.message); + res.status(500).send("An error has occurred"); + } +}); + router.get('/manage/teams', async function (req, res, next) { const data = await teams.retrieve();