Skip to content
Merged
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
2 changes: 1 addition & 1 deletion client/src/redux/slices/attendanceApiSlice.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const attendanceApi = apiSlice.injectEndpoints({
}),
GetUnitAttendance: builder.query({
query: (unit) => ({
url: `${ATTENDANCE_URL}/captainAttendance/sector/all`,
url: `${ATTENDANCE_URL}/captainAttendance/unit/all`,
method: "GET",
params: unit,
}),
Expand Down
31 changes: 31 additions & 0 deletions server/controllers/captainAttendance.controller.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,37 @@ const captainAttendanceController = {
body: error,
})
}
},
getUnitAttendance: async (req, res) => {
try {
const { unitCaptainId, weekNumber, termNumber } = req.query

const result = await db.query(`
SELECT "Captain".*, "CaptainAttendance".* FROM "Captain" LEFT JOIN "CaptainAttendance" ON "Captain"."captainId" = "CaptainAttendance"."captainId"
AND "CaptainAttendance"."weekNumber" = $2 AND "CaptainAttendance"."termNumber" = $3
INNER JOIN "Sector" ON "Sector"."baseName" = "Captain"."rSectorBaseName" AND "Sector"."suffixName" = "Captain"."rSectorSuffixName"
WHERE "Sector"."unitCaptainId" = $1;
`,
[unitCaptainId, weekNumber, termNumber])

if (result.rowCount === 0) {
return res.status(404).json({
error: "No data exists for the provided info"
})
}

res.status(200).json({
message: "Successful retrieval",
body: result.rows,
count: result.rowCount
})
} catch (error) {
console.log(error)
res.status(500).json({
error: 'An error occured while retrieving unit Attendance',
body: error,
})
}
}
}

Expand Down
1 change: 1 addition & 0 deletions server/routes/captainAttendance.route.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const captainAttendanceRouter = Router()
// Insert a new attendance for a captain
captainAttendanceRouter.post('/', captainAttendanceController.upsertAttendance)
captainAttendanceRouter.get('/sector/all', captainAttendanceController.getSectorAttendance)
captainAttendanceRouter.get('/unit/all', captainAttendanceController.getUnitAttendance)
captainAttendanceRouter.get('/:captainId/:weekNumber/:termNumber', captainAttendanceController.getCaptainAttendance)

export default captainAttendanceRouter;