Skip to content

Conversation

@Mahmoud-Emad
Copy link
Collaborator

Changes

List of changes this PR includes

- Add API endpoint for admin vacation deletion
- Enable admin UI to delete approved vacations
- Update deleted vacation status to 'CANCELED'
- Restore vacation balance to applying user
- Send notification to user for admin deletion
- Introduce generic `ConfirmationDialog` component
- Prompt for confirmation before cancelling or deleting vacations
- Determine vacation balance year based on vacation start date
- Refresh user vacation balance data before update operations
- Refine total days calculation for balance adjustments
- Change `v-dialog` to `VDialog` in template
- Import `VDialog` explicitly from Vuetify components
- Register `VDialog` in component options
- Adjust `v-btn` attribute formatting
- Add `VacationChangelog` component to display history
- Implement `add_vacation_changelog_entry` utility function
- Update vacation actions to use new changelog utility
- Mark `update_vacation_change_log` as legacy
- Change cancel button color in vacation card
- Apply new styles to expansion panel elements
- Introduce scrollable container for changelog entries
- Adjust timeline item dot and icon sizes
- Refine changelog entry layout and detail presentation
- Remove year from activity timestamp formatting
- Add notification service for updated vacations
- Record vacation updates in changelog
- Notify applying user if vacation updated by another
- Initiate websocket event for vacation updates
- Implement `UPDATE_REQUEST` event and handler
- Broadcast latest vacation notification in real-time
- Ensure explicit creation of new update notifications
- Switch changelog timestamp to `django.utils.timezone`
- Add `ADMIN_DELETE_VACATION` request event
- Implement `admin_delete_vacation` WebSocket handler
- Send real-time notifications for admin cancellation
- Update admin vacation button text to 'Cancel Vacation'
@Mahmoud-Emad Mahmoud-Emad merged commit 437bbdc into development Jan 5, 2026
2 checks passed
@Mahmoud-Emad Mahmoud-Emad deleted the development_admin_delete_approved_vacation branch January 5, 2026 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants