me/score-tracker
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Improve error handling for divisions

Browse source
This commit is contained in:
sudoer777 2021-11-26 16:46:46 -07:00
parent 3f6251f5bb
commit ad361adab1
2 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
routes/manage.js
View file

@ -114,10 +114,11 @@ router.post('/sport', checkLoginStatus.admin, async function(req, res, next) {
router.get('/division', checkLoginStatus.admin, function(req, res, next) { router.get('/division', checkLoginStatus.admin, function(req, res, next) {
let title = req.query.division ? 'Edit Division' : 'Add Division' let title = req.query.division ? 'Edit Division' : 'Add Division'
res.render('manage/adddivision', { title, userLoggedIn: !!req.user }); res.render('manage/adddivision', { title, userLoggedIn: !!req.user, message: req.flash('error') });
}); });
router.post('/division', checkLoginStatus.admin, function(req, res, next) { router.post('/division', checkLoginStatus.admin, async function(req, res, next) {
try {
const name = req.body['name']; const name = req.body['name'];
const sport = req.body['sport']; const sport = req.body['sport'];
const genderName = req.body['gender']; const genderName = req.body['gender'];
@ -125,21 +126,23 @@ router.post('/division', checkLoginStatus.admin, function(req, res, next) {
const id = req.body['division']; const id = req.body['division'];
const remove = req.body['remove']; const remove = req.body['remove'];
if(remove) await divisions.remove(id);
if(remove) divisions.remove(id).then(res.redirect('/manage')); else if(id) await divisions.rename(id, name);
else if(id) divisions.rename(id, name).then(res.redirect('/manage'));
else {
if(genderName == "both") {
divisions.add(name, genders.FEMALE, sport)
.then(divisions.add(name, genders.MALE, sport)
.then(res.redirect("/manage")));
}
else { else {
if(genderName == 'both') {
await divisions.add(name, genders.FEMALE, sport);
await divisions.add(name, genders.MALE, sport);
} else {
const gender = (genderName == "female") ? genders.FEMALE : genders.MALE; const gender = (genderName == "female") ? genders.FEMALE : genders.MALE;
divisions.add(name, gender, sport) await divisions.add(name, gender, sport);
.then(res.redirect("/manage"));
} }
} }
res.redirect('/manage');
} catch(err) {
console.error("ERROR: " + err.message);
req.flash("error", "An error has occurred.");
res.redirect('/manage/division');
}
}); });
router.get('/team', checkLoginStatus.admin, function(req, res, next) { router.get('/team', checkLoginStatus.admin, function(req, res, next) {

1
views/manage/adddivision.pug
View file

@ -21,6 +21,7 @@ block content
label Division name label Division name
span(class='form-section-input') span(class='form-section-input')
input#name-textbox(type="text", name="name" disabled) input#name-textbox(type="text", name="name" disabled)
.error #{message}
span(class='form-section') span(class='form-section')
button#submit-button(type="submit" disabled) Submit button#submit-button(type="submit" disabled) Submit
span(class='form-section') span(class='form-section')