diff options
| author | Joel Kronqvist <joelkronqvist@proton.me> | 2023-06-21 13:01:57 +0300 |
|---|---|---|
| committer | Joel Kronqvist <joelkronqvist@proton.me> | 2023-06-21 13:01:57 +0300 |
| commit | 529477dc21ec03842ac55a2719b0875133d2aa43 (patch) | |
| tree | dc45521555cfd16407f1b712507556014d0cde8d /server.js | |
| parent | 9760c6242572f6ed17890b84ec3d14fa414b7579 (diff) | |
| parent | d10272298acb4d6e07fb5b73dd7af06d653afd7b (diff) | |
| download | LYLLRuoka-529477dc21ec03842ac55a2719b0875133d2aa43.tar.gz LYLLRuoka-529477dc21ec03842ac55a2719b0875133d2aa43.zip | |
Merge master branches of GitHub repo and server repo
Diffstat (limited to 'server.js')
| -rw-r--r-- | server.js | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -182,7 +182,7 @@ async function buildMain(args) let day = d.getDay(); day = (day + +(day === 0) * 7) - 1; // converts from 0 = sunday to 0 = monday const actualDay = day; - day = +(!(day === 5) && !(day === 6)) * day; + day = +(!(day === 5) && !(day === 6)) * day; // resets day to monday if saturday or sunday if ((typeof query.day === "string") && (parseInt(query.day).toString() === query.day) && (!isNaN(parseInt(query.day))) && (parseInt(query.day) >= 0) && (parseInt(query.day) < 5)) day = parseInt(query.day); // set the day selected (must be done manually with this replacement system) @@ -239,11 +239,13 @@ async function buildMain(args) const examInfo = await SQLDB.query("SELECT * FROM exams"); for(let week = 0; week < examInfo.length; week++) { + // get the date of the requested day const nextDate = new Date( d.getFullYear(), d.getMonth(), d.getDate() + day - actualDay + (day < actualDay)*7 ); + if (dateFuncs.between( nextDate, new Date(examInfo[week].start), |