chore: update supplementary event generation for 2024/2025 semester

markfejes · markfejes · commit c29929737118 · 2024-12-08T17:24:48.000+01:00
diff --git a/bin/commands/generate-supplementary-events.js b/bin/commands/generate-supplementary-events.js
@@ -98,12 +98,7 @@ module.exports = async () => {
           where: {
             name: {
               $and: [
-                { $ne: 'a1' },
-               { $ne: 'a2' },
-               { $ne: 'a3' },
-               { $ne: 'pot0' },
-               { $ne: 'pot1' },
-               { $ne: 'pot2' },
+                { $ne: 'cs16-1a' }, { $ne: 'cs16-2a' }, { $ne: 'cs16-3a' }
               ]
             }
           },
@@ -118,7 +113,7 @@ module.exports = async () => {
         const eventOk = event.grade >= 2;
         const deliverableOk = event.Deliverables.every(deliverable => deliverable.uploaded && deliverable.grade >= 2);
 
-        return eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2020-11-11T00:00:00.000Z'), moment('2020-11-13T23:59:00.000Z'));
+        return eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2024-11-29T00:00:00.000Z'), moment('2024-11-29T23:59:00.000Z'));
       });
       return okEvents.length === studentReg.Events.length - 1;
     });
@@ -246,7 +241,7 @@ module.exports = async () => {
         const eventOk = event.grade >= 2;
         const deliverableOk = event.Deliverables.every(deliverable => deliverable.uploaded && deliverable.grade >= 2);
 
-        return !(eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2020-11-11T00:00:00.000Z'), moment('2020-11-13T23:59:00.000Z')));
+        return !(eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2024-11-29T00:00:00.000Z'), moment('2024-11-29T23:59:00.000Z')));
       });
       failedEventStats[failedEvent.ExerciseSheet.ExerciseCategory.type]++;
       failedEventStatsNeptuns[failedEvent.ExerciseSheet.ExerciseCategory.type].push(studentReg.User.neptun);
diff --git a/bin/commands/get-supplementary-statistics.js b/bin/commands/get-supplementary-statistics.js
@@ -64,7 +64,7 @@ module.exports = async (argv) => {
           // exclude english and german student group
           where: {
             name: {
-              $and: [{ $ne: 'c16-1a' }, { $ne: 'c16-2a' }],
+              $and: [{ $ne: 'cs16-1a' }, { $ne: 'cs16-2a' }, { $ne: 'cs16-3a' }],
             },
           },
           model: db.StudentGroups,
@@ -85,7 +85,7 @@ module.exports = async (argv) => {
         (deliverable) => deliverable.uploaded && deliverable.grade >= 2
       );
 
-      return eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2020-11-11T00:00:00.000Z'), moment('2020-11-13T23:59:00.000Z'));
+      return eventOk || (deliverableOk && event.grade === null) || moment(event.date).isBetween(moment('2024-11-29T00:00:00.000Z'), moment('2024-11-29T23:59:00.000Z'));
     };
 
     const studentRegsWithSupplementary = studentRegs.filter((studentReg) => {
