Skip to content
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

v1.2.2 Release #41

Merged
merged 15 commits into from
Oct 20, 2024
Merged

v1.2.2 Release #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
2485405
Implement Automatic Reminder Emails (#23)
cdconn00 Feb 21, 2024
9d1f692
Merge branch 'master' into development
cdconn00 Feb 21, 2024
777fe92
Merge branch 'master' into development
cdconn00 Feb 22, 2024
e2ed52e
[#22] Add Missing Activity Check Before Inactive Notice Email (#27)
cdconn00 Feb 22, 2024
c24131f
Change Controller Profile Certifications/Endorsements (#29)
cdconn00 Feb 28, 2024
16b512f
Allow EC Read Feedback Access (#30)
cdconn00 Feb 28, 2024
9a400de
Merge branch 'master' into development
cdconn00 Feb 28, 2024
1c6e5f1
Merge branch 'master' into development
cdconn00 Mar 3, 2024
6686ad7
Issue Reporting #16 - Change to 90 day / 3 hour activity (#32)
cdconn00 Mar 6, 2024
b4b83ba
Allow manual run. (#36)
cdconn00 Sep 5, 2024
959d6d2
Disable Activity Emails (#37)
cdconn00 Sep 19, 2024
00aa7f7
Activity and staff email update (Should have been here. not on master…
XDerpingxGruntX Oct 11, 2024
a08f77c
Hotfix: API 90d to Quarter
XDerpingxGruntX Oct 15, 2024
dc7d927
ATM role update API
XDerpingxGruntX Oct 17, 2024
065af64
Merge branch 'master' into development
XDerpingxGruntX Oct 20, 2024
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
1,808 changes: 961 additions & 847 deletions controllers/ControllerController.js
View file
Open in desktop

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions controllers/EventController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ router.delete('/:slug/signup', getUser, async (req, res) => {
return res.json(res.stdRes);
});

router.delete('/:slug/mandelete/:cid', getUser, auth(['atm', 'datm', 'ec']), async(req, res) => {
router.delete('/:slug/mandelete/:cid', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async(req, res) => {
try {
const signup = await Event.findOneAndUpdate({url: req.params.slug}, {
$pull: {
Expand Down Expand Up @@ -211,7 +211,7 @@ router.delete('/:slug/mandelete/:cid', getUser, auth(['atm', 'datm', 'ec']), asy
return res.json(res.stdRes);
});

router.put('/:slug/mansignup/:cid', getUser, auth(['atm', 'datm', 'ec']), async (req, res) => {
router.put('/:slug/mansignup/:cid', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async (req, res) => {
try {
const user = await User.findOne({cid: req.params.cid});
if(user !== null) {
Expand Down Expand Up @@ -242,7 +242,7 @@ router.put('/:slug/mansignup/:cid', getUser, auth(['atm', 'datm', 'ec']), async
return res.json(res.stdRes);
});

router.post('/', getUser, auth(['atm', 'datm', 'ec']), upload.single('banner'), async (req, res) => {
router.post('/', getUser, auth(['atm1', 'datm', 'ec', 'wm']), upload.single('banner'), async (req, res) => {
try {
const url = req.body.name.replace(/\s+/g, '-').toLowerCase().replace(/^-+|-+(?=-|$)/g, '').replace(/[^a-zA-Z0-9-_]/g, '') + '-' + Date.now().toString().slice(-5);
const allowedTypes = ['image/jpg', 'image/jpeg', 'image/png', 'image/gif'];
Expand Down Expand Up @@ -296,7 +296,7 @@ router.post('/', getUser, auth(['atm', 'datm', 'ec']), upload.single('banner'),
return res.json(res.stdRes);
});

router.put('/:slug', getUser, auth(['atm', 'datm', 'ec']), upload.single('banner'), async (req, res) => {
router.put('/:slug', getUser, auth(['atm1', 'datm', 'ec', 'wm']), upload.single('banner'), async (req, res) => {
try {
const event = await Event.findOne({url: req.params.slug});
const {name, description, startTime, endTime, positions} = req.body;
Expand Down Expand Up @@ -408,7 +408,7 @@ router.put('/:slug', getUser, auth(['atm', 'datm', 'ec']), upload.single('banner
return res.json(res.stdRes);
});

router.delete('/:slug', getUser, auth(['atm', 'datm', 'ec']), async (req, res) => {
router.delete('/:slug', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async (req, res) => {
try {
const deleteEvent = await Event.findOne({url: req.params.slug});
await deleteEvent.delete();
Expand Down Expand Up @@ -448,7 +448,7 @@ router.delete('/:slug', getUser, auth(['atm', 'datm', 'ec']), async (req, res) =
// return res.json(res.stdRes);
// });

router.put('/:slug/assign', getUser, auth(['atm', 'datm', 'ec']), async (req, res) => {
router.put('/:slug/assign', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async (req, res) => {
try {
const {position, cid} = req.body;

Expand Down Expand Up @@ -484,7 +484,7 @@ router.put('/:slug/assign', getUser, auth(['atm', 'datm', 'ec']), async (req, re
return res.json(res.stdRes);
});

router.put('/:slug/notify', getUser, auth(['atm', 'datm', 'ec']), async (req, res) => {
router.put('/:slug/notify', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async (req, res) => {
try {
await Event.updateOne({url: req.params.slug}, {
$set: {
Expand Down Expand Up @@ -524,7 +524,7 @@ router.put('/:slug/notify', getUser, auth(['atm', 'datm', 'ec']), async (req, re
return res.json(res.stdRes);
});

router.put('/:slug/close', getUser, auth(['atm', 'datm', 'ec']), async (req, res) => {
router.put('/:slug/close', getUser, auth(['atm1', 'datm', 'ec', 'wm']), async (req, res) => {
try {
await Event.updateOne({url: req.params.slug}, {
$set: {
Expand Down
8 changes: 4 additions & 4 deletions controllers/FeedbackController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Notification from '../models/Notification.js';
import getUser from '../middleware/getUser.js';
import auth from '../middleware/auth.js';

router.get('/', getUser, auth(['atm', 'datm', 'ta', 'ec']), async (req, res) => { // All feedback
router.get('/', getUser, auth(['atm1', 'datm', 'ta', 'ec','wm']), async (req, res) => { // All feedback
try {
const page = +req.query.page || 1;
const limit = +req.query.limit || 20;
Expand Down Expand Up @@ -85,7 +85,7 @@ router.get('/controllers', async ({res}) => { // Controller list on feedback pag
return res.json(res.stdRes);
});

router.get('/unapproved', getUser, auth(['atm', 'datm', 'ta', 'ec']), async ({res}) => { // Get all unapproved feedback
router.get('/unapproved', getUser, auth(['atm1', 'datm', 'ta', 'ec', 'wm']), async ({res}) => { // Get all unapproved feedback
try {
const feedback = await Feedback.find({deletedAt: null, approved: false}).populate('controller', 'fname lname cid').sort({createdAt: 'desc'}).lean();
res.stdRes.data = feedback;
Expand All @@ -96,7 +96,7 @@ router.get('/unapproved', getUser, auth(['atm', 'datm', 'ta', 'ec']), async ({re
return res.json(res.stdRes);
});

router.put('/approve/:id', getUser, auth(['atm', 'datm', 'ta']), async (req, res) => { // Approve feedback
router.put('/approve/:id', getUser, auth(['atm1', 'datm', 'ta']), async (req, res) => { // Approve feedback
try {
const approved = await Feedback.findOneAndUpdate({_id: req.params.id}, {
approved: true
Expand All @@ -123,7 +123,7 @@ router.put('/approve/:id', getUser, auth(['atm', 'datm', 'ta']), async (req, res
return res.json(res.stdRes);
});

router.put('/reject/:id', getUser, auth(['atm', 'datm', 'ta']), async (req, res) => { // Reject feedback
router.put('/reject/:id', getUser, auth(['atm1', 'datm', 'ta']), async (req, res) => { // Reject feedback
try {
const feedback = await Feedback.findOne({_id: req.params.id});
await feedback.delete();
Expand Down
12 changes: 6 additions & 6 deletions controllers/FileController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ router.get('/downloads/:id', async (req, res) => {
return res.json(res.stdRes);
});

router.post('/downloads', getUser, auth(['atm', 'datm', 'ta', 'fe']), upload.single('download'), async (req, res) => {
router.post('/downloads', getUser, auth(['atm1', 'datm', 'ta', 'fe']), upload.single('download'), async (req, res) => {
try {
if(!req.body.category) {
throw {
Expand Down Expand Up @@ -95,7 +95,7 @@ router.post('/downloads', getUser, auth(['atm', 'datm', 'ta', 'fe']), upload.sin
return res.json(res.stdRes);
});

router.put('/downloads/:id', upload.single('download'), getUser, auth(['atm', 'datm', 'ta', 'fe']), async (req, res) => {
router.put('/downloads/:id', upload.single('download'), getUser, auth(['atm1', 'datm', 'ta', 'fe']), async (req, res) => {
try {
if(!req.file) { // no updated file provided
await Downloads.findByIdAndUpdate(req.params.id, {
Expand Down Expand Up @@ -140,7 +140,7 @@ router.put('/downloads/:id', upload.single('download'), getUser, auth(['atm', 'd
return res.json(res.stdRes);
});

router.delete('/downloads/:id', getUser, auth(['atm', 'datm', 'ta', 'fe']), async (req, res) => {
router.delete('/downloads/:id', getUser, auth(['atm1', 'datm', 'ta', 'fe']), async (req, res) => {
try {
const download = await Downloads.findByIdAndDelete(req.params.id).lean();
await req.app.dossier.create({
Expand Down Expand Up @@ -181,7 +181,7 @@ router.get('/documents/:slug', async (req, res) => {
return res.json(res.stdRes);
});

router.post('/documents', getUser, auth(['atm', 'datm', 'ta', 'fe']), upload.single('download'), async (req, res) => {
router.post('/documents', getUser, auth(['atm1', 'datm', 'ta', 'fe']), upload.single('download'), async (req, res) => {
try {
const {name, category, description, content, type} = req.body;
if(!category) {
Expand Down Expand Up @@ -252,7 +252,7 @@ router.post('/documents', getUser, auth(['atm', 'datm', 'ta', 'fe']), upload.sin
return res.json(res.stdRes);
});

router.put('/documents/:slug', upload.single('download'), getUser, auth(['atm', 'datm', 'ta', 'fe']), async (req, res) => {
router.put('/documents/:slug', upload.single('download'), getUser, auth(['atm1', 'datm', 'ta', 'fe']), async (req, res) => {
try {
const document = await Document.findOne({slug: req.params.slug});
const {name, category, description, content, type} = req.body;
Expand Down Expand Up @@ -318,7 +318,7 @@ router.put('/documents/:slug', upload.single('download'), getUser, auth(['atm',
return res.json(res.stdRes);
})

router.delete('/documents/:id', getUser, auth(['atm', 'datm', 'ta', 'fe']), async (req, res) => {
router.delete('/documents/:id', getUser, auth(['atm1', 'datm', 'ta', 'fe']), async (req, res) => {
try {
const doc = await Document.findByIdAndDelete(req.params.id);
await req.app.dossier.create({
Expand Down
6 changes: 3 additions & 3 deletions controllers/NewsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ router.get('/', async (req, res) => {
return res.json(res.stdRes);
});

router.post('/', getUser, auth(['atm', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) => {
router.post('/', getUser, auth(['atm1', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) => {
try {
if(!req.body || !req.body.title || !req.body.content) {
throw {
Expand Down Expand Up @@ -74,7 +74,7 @@ router.get('/:slug', async (req, res) =>{
return res.json(res.stdRes);
});

router.put('/:slug', getUser, auth(['atm', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) => {
router.put('/:slug', getUser, auth(['atm1', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) => {
try {
const {title, content} = req.body;
const newsItem = await News.findOne({uriSlug: req.params.slug});
Expand All @@ -98,7 +98,7 @@ router.put('/:slug', getUser, auth(['atm', 'datm', 'ta', 'ec', 'fe', 'wm']), asy
return res.json(res.stdRes);
});

router.delete('/:slug', getUser, auth(['atm', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) =>{
router.delete('/:slug', getUser, auth(['atm1', 'datm', 'ta', 'ec', 'fe', 'wm']), async (req, res) =>{
try {
const newsItem = await News.findOne({uriSlug: req.params.slug});
const status = await newsItem.delete();
Expand Down
6 changes: 3 additions & 3 deletions controllers/StatsController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { DateTime as L } from 'luxon';
const months = ['', 'January', 'February', 'March', 'April', 'May', 'June', 'July', 'August', 'September', 'October', 'November', 'December'];
const ratings = ["Unknown", "OBS", "S1", "S2", "S3", "C1", "C2", "C3", "I1", "I2", "I3", "SUP", "ADM"];

router.get('/admin', getUser, auth(['atm', 'datm', 'ta', 'fe', 'ec', 'wm']), async (req, res) => {
router.get('/admin', getUser, auth(['atm1', 'datm', 'ta', 'fe', 'ec', 'wm']), async (req, res) => {
try {
const d = new Date();
const thisMonth = new Date(Date.UTC(d.getUTCFullYear(), d.getUTCMonth(), 1));
Expand Down Expand Up @@ -117,7 +117,7 @@ router.get('/admin', getUser, auth(['atm', 'datm', 'ta', 'fe', 'ec', 'wm']), asy
return res.json(res.stdRes);
})

router.get('/ins', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
router.get('/ins', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
try {
let lastTraining = await TrainingSession.aggregate([
{$group: {
Expand Down Expand Up @@ -170,7 +170,7 @@ router.get('/ins', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (re
return res.json(res.stdRes);
})

router.get('/activity', getUser, auth(['atm', 'datm', 'ta', 'wm']), async (req, res) => {
router.get('/activity', getUser, auth(['atm1', 'datm', 'ta', 'wm']), async (req, res) => {
try {
const today = L.utc();
const chkDate = today.minus({days: 91});
Expand Down
20 changes: 10 additions & 10 deletions controllers/TrainingController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ router.get('/milestones', getUser, async (req, res) => {
return res.json(res.stdRes);
});

router.get('/request/open', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
router.get('/request/open', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
try {
const days = +req.query.period || 21; // days from start of CURRENT week
const d = new Date(Date.now()),
Expand All @@ -155,7 +155,7 @@ router.get('/request/open', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']),
return res.json(res.stdRes);
});

router.post('/request/take/:id', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
router.post('/request/take/:id', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
try {
if(new Date(req.body.startTime) >= new Date(req.body.endTime)) {
throw {
Expand Down Expand Up @@ -206,7 +206,7 @@ router.post('/request/take/:id', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr
return res.json(res.stdRes);
});

router.delete('/request/:id', getUser, auth(['atm', 'datm', 'ta']), async (req, res) => {
router.delete('/request/:id', getUser, auth(['atm1', 'datm', 'ta']), async (req, res) => {
try {
const request = await TrainingRequest.findById(req.params.id);
request.delete();
Expand All @@ -224,7 +224,7 @@ router.delete('/request/:id', getUser, auth(['atm', 'datm', 'ta']), async (req,
return res.json(res.stdRes);
});

router.get('/request/:date', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
router.get('/request/:date', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
try {
const d = new Date(`${req.params.date.slice(0,4)}-${req.params.date.slice(4,6)}-${req.params.date.slice(6,8)}`);
const dayAfter = new Date(d);
Expand All @@ -248,7 +248,7 @@ router.get('/request/:date', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']),
return res.json(res.stdRes);
});

router.get('/session/open', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
router.get('/session/open', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async (req, res) => {
try {
const sessions = await TrainingSession.find({
instructorCid: res.user.cid,
Expand All @@ -266,7 +266,7 @@ router.get('/session/open', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']),

router.get('/session/:id', getUser, async(req, res) => {
try {
const isIns = ['ta', 'ins', 'mtr', 'atm', 'datm'].some(r => res.user.roleCodes.includes(r));
const isIns = ['ta', 'ins', 'mtr', 'atm1', 'datm'].some(r => res.user.roleCodes.includes(r));

if(isIns) {
const session = await TrainingSession.findById(
Expand Down Expand Up @@ -303,7 +303,7 @@ router.get('/session/:id', getUser, async(req, res) => {
return res.json(res.stdRes);
});

router.get('/sessions', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
router.get('/sessions', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
try {
const page = +req.query.page || 1;
const limit = +req.query.limit || 20;
Expand Down Expand Up @@ -404,7 +404,7 @@ router.get('/sessions/past', getUser, async (req, res) => {
return res.json(res.stdRes);
});

router.get('/sessions/:cid', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
router.get('/sessions/:cid', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
try {
const controller = await User.findOne({cid: req.params.cid}).select('fname lname').lean();
if(!controller) {
Expand Down Expand Up @@ -441,7 +441,7 @@ router.get('/sessions/:cid', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']),
return res.json(res.stdRes);
});

router.put('/session/save/:id', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
router.put('/session/save/:id', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
try {
await TrainingSession.findByIdAndUpdate(req.params.id, req.body);
} catch(e) {
Expand All @@ -452,7 +452,7 @@ router.put('/session/save/:id', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr'
return res.json(res.stdRes);
});

router.put('/session/submit/:id', getUser, auth(['atm', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
router.put('/session/submit/:id', getUser, auth(['atm1', 'datm', 'ta', 'ins', 'mtr']), async(req, res) => {
try {
if(req.body.position === '' || req.body.progress === null || req.body.movements === null || req.body.location === null || req.body.ots === null || req.body.studentNotes === null || (req.body.studentNotes && req.body.studentNotes.length > 3000) || (req.body.insNotes && req.body.insNotes.length > 3000)) {
throw {
Expand Down
Loading
Loading