Hi {firstName},
+Your time off request from {startDate} to {endDate} has been approved.
+Please find the calendar invite attached.
+Time Off Request Approved.
'; + } + } +}; diff --git a/backend/src/services/pto_journal_entries.js b/backend/src/services/pto_journal_entries.js index fd8d8ce..3183eaf 100644 --- a/backend/src/services/pto_journal_entries.js +++ b/backend/src/services/pto_journal_entries.js @@ -65,6 +65,34 @@ module.exports = class Pto_journal_entriesService { } } + static async bulkAdjust(data, currentUser) { + const { userIds, entry_type, leave_bucket, amount_hours, amount_days, memo } = data; + const transaction = await db.sequelize.transaction(); + try { + const entries = userIds.map(userId => ({ + userId, + entry_type, + leave_bucket, + amount_hours: amount_hours || 0, + amount_days: amount_days || 0, + memo, + entered_byId: currentUser.id, + entered_at: new Date(), + posting_status: 'posted', + calendar_year: new Date().getFullYear(), + effective_at: new Date(), + counts_against_balance: true, // Assuming adjustments usually count + })); + + await db.pto_journal_entries.bulkCreate(entries, { transaction }); + + await transaction.commit(); + } catch (error) { + await transaction.rollback(); + throw error; + } + } + static async update(data, id, currentUser) { const transaction = await db.sequelize.transaction(); try { @@ -133,6 +161,4 @@ module.exports = class Pto_journal_entriesService { } -}; - - +}; \ No newline at end of file diff --git a/backend/src/services/time_off_requests.js b/backend/src/services/time_off_requests.js index f888a47..5de2749 100644 --- a/backend/src/services/time_off_requests.js +++ b/backend/src/services/time_off_requests.js @@ -1,11 +1,13 @@ const db = require('../db/models'); const Time_off_requestsDBApi = require('../db/api/time_off_requests'); +const HolidaysDBApi = require('../db/api/holidays'); const processFile = require("../middlewares/upload"); const ValidationError = require('./notifications/errors/validation'); const csv = require('csv-parser'); const axios = require('axios'); const config = require('../config'); const stream = require('stream'); +const moment = require('moment'); @@ -15,6 +17,17 @@ module.exports = class Time_off_requestsService { static async create(data, currentUser) { const transaction = await db.sequelize.transaction(); try { + if (data.starts_at && data.ends_at) { + const holidays = await HolidaysDBApi.findAll({ + calendarStart: data.starts_at, + calendarEnd: data.ends_at, + limit: 1000 + }, { transaction }); + + const workSchedule = currentUser.workSchedule || [1, 2, 3, 4, 5]; + data.days = Time_off_requestsService.calculateWorkingDays(data.starts_at, data.ends_at, workSchedule, holidays.rows); + } + await Time_off_requestsDBApi.create( data, { @@ -79,6 +92,34 @@ module.exports = class Time_off_requestsService { ); } + // Check if user is admin or if the request is in the past + const isAdmin = currentUser.app_role?.name === config.roles.admin; + const isPast = moment(time_off_requests.starts_at).isBefore(moment(), 'day'); + + if (!isAdmin && isPast) { + throw new ValidationError( + 'errors.forbidden.message', + 'Cannot modify past time off requests. Please contact an administrator.', + ); + } + + // Recalculate days if dates are changing + if (data.starts_at || data.ends_at) { + const startsAt = data.starts_at || time_off_requests.starts_at; + const endsAt = data.ends_at || time_off_requests.ends_at; + + if (startsAt && endsAt) { + const holidays = await HolidaysDBApi.findAll({ + calendarStart: startsAt, + calendarEnd: endsAt, + limit: 1000 + }, { transaction }); + + const workSchedule = currentUser.workSchedule || [1, 2, 3, 4, 5]; + data.days = Time_off_requestsService.calculateWorkingDays(startsAt, endsAt, workSchedule, holidays.rows); + } + } + const updatedTime_off_requests = await Time_off_requestsDBApi.update( id, data, @@ -101,6 +142,21 @@ module.exports = class Time_off_requestsService { const transaction = await db.sequelize.transaction(); try { + const isAdmin = currentUser.app_role?.name === config.roles.admin; + if (!isAdmin) { + const requests = await Time_off_requestsDBApi.findAll({ + id: ids + }, { transaction }); + + const hasPastRequests = requests.rows.some(req => moment(req.starts_at).isBefore(moment(), 'day')); + if (hasPastRequests) { + throw new ValidationError( + 'errors.forbidden.message', + 'Cannot delete past time off requests. Please contact an administrator.', + ); + } + } + await Time_off_requestsDBApi.deleteByIds(ids, { currentUser, transaction, @@ -117,6 +173,17 @@ module.exports = class Time_off_requestsService { const transaction = await db.sequelize.transaction(); try { + const isAdmin = currentUser.app_role?.name === config.roles.admin; + if (!isAdmin) { + const request = await Time_off_requestsDBApi.findBy({ id }, { transaction }); + if (request && moment(request.starts_at).isBefore(moment(), 'day')) { + throw new ValidationError( + 'errors.forbidden.message', + 'Cannot delete past time off requests. Please contact an administrator.', + ); + } + } + await Time_off_requestsDBApi.remove( id, { @@ -132,7 +199,24 @@ module.exports = class Time_off_requestsService { } } - -}; + static calculateWorkingDays(startDate, endDate, workSchedule, holidays) { + let count = 0; + let current = moment(startDate); + const end = moment(endDate); + while (current.isSameOrBefore(end, 'day')) { + const dayOfWeek = current.day(); // 0 = Sunday, 1 = Monday + const isWorkDay = workSchedule.includes(dayOfWeek); + + const isHoliday = holidays.some(h => + current.isBetween(moment(h.starts_at), moment(h.ends_at), 'day', '[]') + ); + if (isWorkDay && !isHoliday) { + count++; + } + current.add(1, 'days'); + } + return count; + } +}; \ No newline at end of file diff --git a/frontend/src/components/KanbanBoard/KanbanCard.tsx b/frontend/src/components/KanbanBoard/KanbanCard.tsx index 7655572..338483a 100644 --- a/frontend/src/components/KanbanBoard/KanbanCard.tsx +++ b/frontend/src/components/KanbanBoard/KanbanCard.tsx @@ -3,6 +3,7 @@ import Link from 'next/link'; import moment from 'moment'; import ListActionsPopover from '../ListActionsPopover'; import { DragSourceMonitor, useDrag } from 'react-dnd'; +import { useAppSelector } from '../../stores/hooks'; type Props = { item: any; @@ -19,22 +20,31 @@ const KanbanCard = ({ setItemIdToDelete, column, }: Props) => { + const { currentUser } = useAppSelector((state) => state.auth); + + // Determine if the item is editable based on entity type and date + const isAdmin = currentUser?.app_role?.name === 'Administrator'; + const isTimeOffRequest = entityName === 'time_off_requests'; + const isPast = isTimeOffRequest && moment(item.starts_at).isBefore(moment(), 'day'); + const isEditable = !isTimeOffRequest || isAdmin || !isPast; + const [{ isDragging }, drag] = useDrag( () => ({ type: 'box', item: { item, column }, + canDrag: isEditable, collect: (monitor: DragSourceMonitor) => ({ isDragging: monitor.isDragging(), }), }), - [item], + [item, isEditable], ); return ({moment(item.createdAt).format('MMM DD hh:mm a')}
-{stat.label}
-{stat.value} Days
+ {stats.map((stat, index) => { + const content = ( +{stat.label}
+{stat.value} Days
+Login History
+| IP Address | +User Agent | +Login Time | +
|---|---|---|
| {item.ipAddress || 'Unknown'} | ++ {item.userAgent || 'Unknown'} + | +{dataFormatter.dateTimeFormatter(item.createdAt)} | +
| No login history found | +
| Date | -Event / Name | -Type | -
|---|---|---|
| - {moment(item.holiday_date || item.start_date).format('MMM D, YYYY')} - | -- {isHoliday ? item.name : `${item.user?.firstName} ${item.user?.lastName}`} - | -- - {isHoliday ? 'Holiday' : 'PTO'} - - | -
| No upcoming events | -