Skip to content

Dev #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dishantttt merged 4 commits into from
Sep 1, 2025
Merged

Dev #32

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
67639e9
midlewares added
laladwesh Aug 27, 2025
b074010
exportion for checkin and check out functionality fixed finally direc…
laladwesh Aug 27, 2025
800bc55
Merge pull request #29 from swciitg/admin-panel
laladwesh Aug 27, 2025
2d59c91
Merge pull request #31 from swciitg/main
dishantttt Sep 1, 2025
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
84 changes: 56 additions & 28 deletions routers/khokhaEntryRouter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,20 +141,22 @@ khokhaEntryRouter.post("/entries/table", async (req, res) => {
if (filters.status === 'Open') base.isClosed = false;
if (filters.status === 'Closed') base.isClosed = true;

// Date ranges
// Date ranges (apply -5h30m for BOTH checkOutTime & checkInTime)
const OFFSET = 330 * 60 * 1000;
const needsOffset = (field) => field === 'checkOutTime' || field === 'checkInTime';
const addRange = (field, from, to) => {
if (!from && !to) return;
const r = {};
if (from) {
const d = new Date(from);
r.$gte = field === 'checkOutTime' ? new Date(d.getTime() - 330 * 60 * 1000) : d; // -5h30m
}
if (to) {
const d = new Date(to);
r.$lte = field === 'checkOutTime' ? new Date(d.getTime() - 330 * 60 * 1000) : d; // -5h30m
}
base[field] = r;
};
if (!from && !to) return;
const r = {};
if (from) {
const d = new Date(from);
r.$gte = needsOffset(field) ? new Date(d.getTime() - OFFSET) : d;
}
if (to) {
const d = new Date(to);
r.$lte = needsOffset(field) ? new Date(d.getTime() - OFFSET) : d;
}
base[field] = r;
};
addRange('checkOutTime', filters.coFrom, filters.coTo);
addRange('checkInTime', filters.ciFrom, filters.ciTo);

Expand Down Expand Up @@ -252,6 +254,9 @@ khokhaEntryRouter.get("/new/entries", (req, res) => {

/* -------------------- AUTO-CLOSE & CREATE NEW -------------------- */
khokhaEntryRouter.post("/entries", async (req, res, next) => {
if (!req.session.user) {
return res.redirect(process.env.BASE_URL +'/new/admin/login');
}
try {
const {
name, rollNumber, outlookEmail, phoneNumber, hostel, roomNumber,
Expand Down Expand Up @@ -309,6 +314,9 @@ khokhaEntryRouter.post("/entries", async (req, res, next) => {

/* -------------------- CLOSE OPEN ENTRY BY ROLL (no admin key) -------------------- */
khokhaEntryRouter.post("/entries/close-by-roll", async (req, res) => {
if (!req.session.user) {
return res.redirect(process.env.BASE_URL +'/new/admin/login');
}
try {
const { rollNumber, checkInGate, checkInTime } = req.body || {};
if (!rollNumber) return res.status(400).send("rollNumber is required");
Expand Down Expand Up @@ -395,19 +403,22 @@ khokhaEntryRouter.post("/entries/export", async (req, res) => {
if (filters.status === 'Open') base.isClosed = false;
if (filters.status === 'Closed') base.isClosed = true;

// Date ranges (apply -5h30m for BOTH checkOutTime & checkInTime)
const OFFSET = 330 * 60 * 1000;
const needsOffset = (field) => field === 'checkOutTime' || field === 'checkInTime';
const addRange = (field, from, to) => {
if (!from && !to) return;
const r = {};
if (from) {
const d = new Date(from);
r.$gte = field === 'checkOutTime' ? new Date(d.getTime() - 330 * 60 * 1000) : d; // -5h30m
}
if (to) {
const d = new Date(to);
r.$lte = field === 'checkOutTime' ? new Date(d.getTime() - 330 * 60 * 1000) : d; // -5h30m
}
base[field] = r;
};
if (!from && !to) return;
const r = {};
if (from) {
const d = new Date(from);
r.$gte = needsOffset(field) ? new Date(d.getTime() - OFFSET) : d;
}
if (to) {
const d = new Date(to);
r.$lte = needsOffset(field) ? new Date(d.getTime() - OFFSET) : d;
}
base[field] = r;
};
addRange('checkOutTime', filters.coFrom, filters.coTo);
addRange('checkInTime', filters.ciFrom, filters.ciTo);

Expand Down Expand Up @@ -476,7 +487,14 @@ khokhaEntryRouter.post("/entries/export", async (req, res) => {
const fromDate = new Date(from);
const toDate = new Date(to);
if (isNaN(fromDate) || isNaN(toDate)) return res.status(400).send('Invalid date format.');
q[dateField] = { $gte: fromDate, $lte: toDate };

// Apply -5h30m shift if the chosen dateField is checkOutTime or checkInTime
const OFFSET = 330 * 60 * 1000;
const shiftNeeded = (dateField === 'checkOutTime' || dateField === 'checkInTime');
const fromAdj = shiftNeeded ? new Date(fromDate.getTime() - OFFSET) : fromDate;
const toAdj = shiftNeeded ? new Date(toDate.getTime() - OFFSET) : toDate;

q[dateField] = { $gte: fromAdj, $lte: toAdj };

if (name) q.name = { $regex: name, $options: 'i' };
if (rollNumber) q.rollNumber = rollNumber;
Expand Down Expand Up @@ -537,9 +555,19 @@ function buildFilter(body) {

const q = {};
if (from || to) {
// Apply -5h30m when filtering by checkOutTime or checkInTime
const OFFSET = 330 * 60 * 1000;
const shiftNeeded = (dateField === 'checkOutTime' || dateField === 'checkInTime');

const range = {};
if (from) range.$gte = new Date(from);
if (to) range.$lte = new Date(to);
if (from) {
const d = new Date(from);
range.$gte = shiftNeeded ? new Date(d.getTime() - OFFSET) : d;
}
if (to) {
const d = new Date(to);
range.$lte = shiftNeeded ? new Date(d.getTime() - OFFSET) : d;
}
q[dateField] = range;
}
if (name) q.name = { $regex: name, $options: "i" };
Expand Down