fix: school year

MartinKanera · Jan 7, 2021 · 28d524f · 28d524f
1 parent dd7f600
commit 28d524f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pages/index.vue b/pages/index.vue
@@ -26,9 +26,11 @@ export default defineComponent({
 
     const yearModalDisplay = computed(() => mainStore.state.user.currentYear === null && mainStore.isLoggedIn && mainStore.isStudent);
 
-    for (let i = 1; i < 5; i++) {
+    for (let i = 0; i < 5; i++) {
       const year = (new Date().getFullYear() + i).toString();
 
+      console.log(year);
+
       graduationYears.value.push({
         placeholder: year,
         value: year,

diff --git a/server/api/proposal/accept.ts b/server/api/proposal/accept.ts
@@ -22,8 +22,7 @@ export default async (req: Request, res: Response) => {
   try {
     await admin.firestore().runTransaction(async (transaction) => {
       const sfDoc = await transaction.get(proposalRef);
-
-      const schoolYear = (await transaction.get(admin.firestore().collection('system').doc('schoolYear'))).data();
+      const userDoc = await transaction.get(admin.firestore().collection('users').doc(sfDoc.data()?.currentYear));
 
       const projectRef = admin.firestore().collection('projects').doc();
 
@@ -34,7 +33,7 @@ export default async (req: Request, res: Response) => {
         studentId: sfDoc.data()?.studentId,
         teacherId: sfDoc.data()?.teacherId,
         opponentId: '',
-        currentYear: schoolYear?.currentYear,
+        currentYear: userDoc.data()?.currentYear,
         public: false,
         submitted: false,
         submittedDate: null,

diff --git a/server/api/user/update-year.ts b/server/api/user/update-year.ts
@@ -10,7 +10,7 @@ export default async (req: Request, res: Response) => {
     const yearTolerance = 4;
     const year = req.body?.year;
 
-    if (!year && year <= year + yearTolerance) return res.status(400).send('Missing parameters');
+    if (!year && year <= new Date().getFullYear() + yearTolerance) return res.status(400).send('Missing parameters');
 
     const currentYearTimestamp = admin.firestore.Timestamp.fromDate(new Date(Date.UTC(year, 4, 25)));