Shreya P taking over for Abhiram Bylahalli Jagadish – Display List of Finished Tasks Reported by Students

src/controllers/educationTaskController.js

@@ -1,3 +1,4 @@
+const mongoose = require('mongoose');
 const EducationTask = require('../models/educationTask');
 const LessonPlan = require('../models/lessonPlan');
 const UserProfile = require('../models/userProfile');
@@ -430,6 +431,116 @@
     }
   };
 
+  const getTaskSubmissions = async (req, res) => {
+    try {
+      const { status, studentId, lessonPlanId } = req.query;
+
+      const allowedStatuses = ['completed', 'graded'];
+      const statusIsValid = status && allowedStatuses.includes(status);
+      const studentIdIsValid = studentId && mongoose.Types.ObjectId.isValid(studentId);
+      const lessonPlanIdIsValid = lessonPlanId && mongoose.Types.ObjectId.isValid(lessonPlanId);
+
+      let submissions;
+
+      if (studentIdIsValid && lessonPlanIdIsValid && statusIsValid) {
+        submissions = await EducationTask.find({
+          status,
+          studentId: new mongoose.Types.ObjectId(studentId),
+          lessonPlanId: new mongoose.Types.ObjectId(lessonPlanId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (studentIdIsValid && lessonPlanIdIsValid) {
+        submissions = await EducationTask.find({
+          status: { $in: ['completed', 'graded'] },
+          studentId: new mongoose.Types.ObjectId(studentId),
+          lessonPlanId: new mongoose.Types.ObjectId(lessonPlanId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (studentIdIsValid && statusIsValid) {
+        submissions = await EducationTask.find({
+          status,
+          studentId: new mongoose.Types.ObjectId(studentId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (lessonPlanIdIsValid && statusIsValid) {
+        submissions = await EducationTask.find({
+          status,
+          lessonPlanId: new mongoose.Types.ObjectId(lessonPlanId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (studentIdIsValid) {
+        submissions = await EducationTask.find({
+          status: { $in: ['completed', 'graded'] },
+          studentId: new mongoose.Types.ObjectId(studentId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (lessonPlanIdIsValid) {
+        submissions = await EducationTask.find({
+          status: { $in: ['completed', 'graded'] },
+          lessonPlanId: new mongoose.Types.ObjectId(lessonPlanId),
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else if (statusIsValid) {
+        submissions = await EducationTask.find({
+          status,
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      } else {
+        submissions = await EducationTask.find({
+          status: { $in: ['completed', 'graded'] },
+        })
+          .populate('studentId', 'firstName lastName email')
+          .populate('lessonPlanId', 'title')
+          .sort({ completedAt: -1 });
+      }
+
+      const formattedSubmissions = submissions
+        .map((task) => {
+          if (!task.studentId || !task.lessonPlanId) {
+            return null;
+          }
+          const lessonId = task.lessonPlanId._id.toString();
+          const lessonTitle = task.lessonPlanId.title || 'Unknown Lesson Plan';
+          return {
+            _id: task._id,
+            studentName: `${task.studentId.firstName} ${task.studentId.lastName}`,
+            studentEmail: task.studentId.email,
+            taskName: task.name || 'Unnamed Task',
+            taskType: task.type,
+            submissionLinks: task.uploadUrls,
+            status: task.status === 'completed' ? 'Pending Review' : 'Graded',
+            isLate:
+              task.completedAt && task.dueAt && new Date(task.completedAt) > new Date(task.dueAt),
+            submittedAt: task.completedAt,
+            assignedAt: task.assignedAt,
+            dueAt: task.dueAt,
+            grade: task.grade,
+            feedback: task.feedback,
+            lessonPlanId: lessonId,
+            lessonPlanTitle: lessonTitle,
+          };
+        })
+        .filter(Boolean);
+
+      res.status(200).json(formattedSubmissions);
+    } catch (error) {
+      res.status(500).json({ error: error.message });
+    }
+  };
   return {
     getEducationTasks,
     getTasksByStudent,
@@ -441,6 +552,7 @@
     updateTaskStatus,
     gradeTask,
     getTasksByStatus,
+    getTaskSubmissions,
     markTaskAsComplete,
   };
 };

src/models/educationTask.js

@@ -2,6 +2,11 @@ const mongoose = require('mongoose');
 
 const educationTaskSchema = new mongoose.Schema(
   {
+    name: {
+      type: String,
+      required: true,
+      trim: true,
+    },
     lessonPlanId: {
       type: mongoose.Schema.Types.ObjectId,
       ref: 'LessonPlan',
@@ -69,5 +74,9 @@ const educationTaskSchema = new mongoose.Schema(
     timestamps: true,
   },
 );
+educationTaskSchema.index({ status: 1 });
+educationTaskSchema.index({ studentId: 1 });
+educationTaskSchema.index({ lessonPlanId: 1 });
+educationTaskSchema.index({ completedAt: -1 });
 
 module.exports = mongoose.model('EducationTask', educationTaskSchema);

src/models/userProfile.js

@@ -489,3 +489,4 @@ userProfileSchema.index({ totalTangibleHrs: 1 });
 userProfileSchema.index({ bioPosted: 1 });
 
 module.exports = mongoose.model('userProfile', userProfileSchema, 'userProfiles');
+mongoose.model('User', userProfileSchema, 'userProfiles');

src/routes/educatorRoutes.js

@@ -0,0 +1,9 @@
+const express = require('express');
+
+const router = express.Router();
+
+const { getTaskSubmissions } = require('../controllers/educationTaskController')();
+
+router.get('/task-submissions', getTaskSubmissions);
+
+module.exports = router;

src/startup/routes.js

@@ -400,6 +400,9 @@ const recipeRouter = require('../routes/kitchenInventory/recipeRouter')();
 
 const jobHitsAndApplicationsRoutes = require('../routes/jobAnalytics/JobHitsAndApplicationsRoutes');
 
+// Education Portal
+const educatorRoutes = require('../routes/educatorRoutes');
+
 module.exports = function (app) {
   app.use('/api/bm/summary-dashboard', summaryDashboardRouter);
   app.use('/api', forgotPwdRouter);
@@ -587,6 +590,9 @@ module.exports = function (app) {
   app.use('/api/lb', bidNotificationsRouter);
   app.use('/api/lb', bidDeadlinesRouter);
   app.use('/api/lb', SMSRouter);
+
+  // Education Portal
+  app.use('/api/educationportal/educator', educatorRoutes);
   app.use('/api', materialCostRouter);
 
   app.use('/api/educator/reports', studentReportRouter());