Merge branch 'develop' into 'main'

Develop

See merge request sudoer777/score-tracker!17
main
Ethan Reece 2022-03-10 04:05:15 +00:00
commit 1fef5fd818
2 changed files with 3 additions and 3 deletions

View File

@ -1,6 +1,6 @@
{ {
"name": "score-tracker", "name": "score-tracker",
"version": "1.2.0", "version": "1.2.1",
"private": true, "private": true,
"scripts": { "scripts": {
"start": "node ./bin/www" "start": "node ./bin/www"

View File

@ -35,7 +35,7 @@ router.get('/index/dropdown', async function(req, res, next) {
seasonsData = await seasons.retrieveAll(); seasonsData = await seasons.retrieveAll();
sportsData = await sports.retrieveAll(); sportsData = await sports.retrieveAll();
gendersData = await genders.retrieveBySport(latestGame.sportID); gendersData = await genders.retrieveBySport(latestGame.sportID);
divisionsData = await divisions.retrieve(latestGame.sportID); divisionsData = await divisions.retrieve(latestGame.sportID, latestGame.gender);
teamsData = await teams.retrieve(latestGame.sportID); teamsData = await teams.retrieve(latestGame.sportID);
} else { } else {
seasonsData = await seasons.retrieveAll(); seasonsData = await seasons.retrieveAll();
@ -102,7 +102,7 @@ router.get('/submit', async function(req, res, next) {
seasonsData = await seasons.retrieveAll(); seasonsData = await seasons.retrieveAll();
sportsData = await sports.retrieveAll(); sportsData = await sports.retrieveAll();
gendersData = await genders.retrieveBySport(latestGame.sportID); gendersData = await genders.retrieveBySport(latestGame.sportID);
divisionsData = await divisions.retrieve(latestGame.sportID); divisionsData = await divisions.retrieve(latestGame.sportID, latestGame.gender);
teamsData = await teams.retrieve(latestGame.sportID); teamsData = await teams.retrieve(latestGame.sportID);
} else { } else {
seasonsData = await seasons.retrieveAll(); seasonsData = await seasons.retrieveAll();