Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions server/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ services:
dockerfile: Dockerfile
env_file:
- .env
environment:
- REDIS_HOST=redis
- REDIS_PORT=6379
depends_on:
- redis
- postgres
Expand Down
15 changes: 8 additions & 7 deletions server/src/api/controllers/api.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,14 @@ export const getDayOrder = async (req, res, next) => {
.setZone("Asia/Kolkata")
.toFormat("yyyy-MM-dd");

const { dayOrder } = await prisma.academia.findFirst({
where: {
date: todayIST,
},
});

res.status(200).json({ success: true, data: dayOrder });
const academiaRecord = await prisma.academia.findFirst({
where: {
date: todayIST,
},
});

const dayOrder = academiaRecord?.dayOrder || null;
res.status(200).json({ success: true, data: dayOrder });
} catch (error) {
console.error(error);
next(error);
Expand Down
1 change: 0 additions & 1 deletion server/src/bull/worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ const initCalendar = () => {

worker.on("error", (err) => {
console.error("Worker error:", err);
job.log("Worker error:", err);
});
};

Expand Down
16 changes: 13 additions & 3 deletions server/src/parsers/timetableParser.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,22 @@ export const parseTimetable = (htmlSnippet) => {
const rows = $(".course_tbl tbody tr").slice(1);
rows.each((i, row) => {
const columns = $(row).find("td");
const courseTitle = columns.eq(2).text().trim() || "N/A";
const slot = columns.eq(8).text().trim() || "N/A";
const roomNumber = columns.eq(9).text().trim() || "N/A"; // GCR Code column contains room numbers like "TP 706"
console.log(`Column 9 (GCR/Room): '${columns.eq(9).text().trim()}'`);
console.log(`Column 10 (Room No): '${columns.eq(10).text().trim()}'`);
console.log(`Column 11 (Year): '${columns.eq(11).text().trim()}'`);

console.log(`Row ${i}: Title=${courseTitle}, Slot=${slot}, Room=${roomNumber}, Total columns=${columns.length}`);

courses.push({
courseTitle: columns.eq(2).text().trim() || "N/A",
slot: columns.eq(8).text().trim() || "N/A",
courseTitle,
slot,
roomNumber,
});
});

console.log(courses)
console.log("Final courses array:", courses)
return { batch, courses };
};
5 changes: 4 additions & 1 deletion server/src/utils/generateTimetable.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ const generateTimetable = (courses, batch) => {
.split(/[-/]+/)
.filter((code) => code.trim() !== "");
codes.forEach((code) => {
slotMap[code] = course.courseTitle;
const subjectWithRoom = course.roomNumber && course.roomNumber !== "N/A"
? `${course.courseTitle} - ${course.roomNumber}`
: course.courseTitle;
slotMap[code] = subjectWithRoom;
});
});

Expand Down