feat: base Roster Management by krantheman [frappe] PR#1760

Bot Dokosrequested to merge
ft-pr-1760 into develop

From: https://github.com/frappe/hrms/pull/1760
Date: 2024-08-29 18:19:52+05:30

  • Merge pull request #1760 from krantheman/init-roster
  • chore: regenerate yarn.lock file
  • build: add roster as a separate yarn workspace
  • fix: update roster's tailwind config for frappe-ui submodule
  • chore: update frappe-ui to v0.1.67
  • feat: add Shift Assignment Schedule to workspace
  • fix: build routing
  • feat: add Roster shortcut to workspace
  • feat: add Roster button to Shift Assignment list
  • fix: route
  • fix: insertion of an indefinite shift right after a definite one of the same type
  • refactor: use get_holiday_list_for_employee for holidays
  • feat(Shift Assignment): add validations for checking linked employee checkins and attendance before cancelling
  • fix: typing
  • refactor(ShiftAssignmentDialog): change Delete button icon to label for Rucha
  • refactor(Shift Assignment Schedule): change Status to Enabled
  • refactor: select only day of start_date for Repeat On Days by default
  • feat: add toast for moving/swapping shifts
  • fix: Shedule Setting & Repeat On Days label names
  • chore: remove vue-tsc and types/vue
  • refactor: DeleteDialog message formatting
  • revert: ShiftAssignmentDialog
  • fix: field name in process_auto_shift_creation
  • feat: add Confirmation Dialog for delete operations
  • feat: redirect to login page when logged out and make navbar actions functional
  • feat: show schedule for existing shift assignments
  • feat(Shift Assignment Schedule): add field description and Shift Assignment connection
  • feat(Shift Assignment Schedule): add Employee Name field and List View filters
  • fix: Shift Assignment Schedule naming
  • fix: creation of neverending shifts
  • refactor: remove Select Days checkbox and add Shift Schedule Settings section instead
  • refactor: use frappe.delete_doc instead of frappe.db.delete
  • fix: add website route rule for roster
  • feat: use DatePicker instead of FormControl date
  • chore: update frappe-ui to v0.1.62
  • feat: add process auto shift creation for shifts without end date
  • revert(Shift Assignment Schedule): form placement
  • fix(Shift Assignment Schedule): form placement
  • fix(Shift Assignment): check for overlap on update after submission as well
  • feat: add loading state
  • feat: hide original shift element while dragging
  • feat: no bg color for forbidden drop days
  • feat: can't drop shift to cells with same shift type and status
  • feat: add bg color to dragover cell
  • chore: rename repeating shift assignment to shift assignment schedule
  • feat: add delete current shift
  • feat: scale up shift that is being dragged upon
  • fix: drag cursor and dragging into blocked days
  • refactor: use insert shift for creating shifts
  • refactor: join consecutive shifts on moving
  • fix: employee column z index
  • fix: error message translation
  • refactor: shift swapping logic
  • feat: add shift swapping
  • feat: add shift move
  • refactor: change Shift Assignment Group to Shift Assignment Schedule
  • fix: creation of repeating shift with frequency > every week
  • fix: table height
  • style: fix table height and make th row stick
  • fix: import
  • style: center employee names when no designation in employee column
  • revert: removal of vue-router
  • fix: dependencies
  • chore: remove vue router
  • chore: rename file: Navbar.vue -> NavBar.vue
  • fix: fetch events on creating shift from top bar
  • refactor: move employees resource to MonthView
  • feat: add toasts everywhere
  • style: increase employee column width
  • chore: improve readability
  • fix: unselected day button text color
  • feat: add delete repeating shift assignments
  • feat: add Shift Assignment Group
  • feat: use background job for creating repeating shifts if date_diff >= 100
  • fix: clumping of shifts with gap >= 1 week
  • refactor: clump consecutive shift assignments as one
  • feat: add repeating shift assignments
  • fix: setting of default day if no start date
  • feat: select default working day based on start date
  • feat: add Select Working Days ui
  • fix(Filters): use FormControl instead of Autocomplete
  • feat: add leaves to roster
  • feat: get_leaves api
  • fix: spacing
  • fix(ShiftAssignmentDialog): use FormControl instead of Autocomplete
  • feat: add multiple selections for employee search
  • feat: add designation filter
  • fix: spacing
  • fix: leave filter bar open by default
  • refactor: holiday cell
  • fix: font weights
  • feat: add colors for shift types
  • feat: add clear filters button
  • feat: add transition for filter button
  • feat: add button to toggle showing of filters
  • refactor: move filters to month select header
  • chore: improve readability
  • feat: add filters
  • chore: improve readability
  • chore: remove redundant code
  • feat: add FilterBar
  • feat: add makeshift navbar
  • feat: add employee search
  • feat: add holidays
  • chore: add typings
  • fix: dialog buttons
  • fix: cell height fluctuation
  • fix: spacing
  • feat: make employee column sticky
  • feat: add shift assignment deletion
  • fix: fetch employee data only when dialog opens
  • fix: firstOfMonth time
  • fix: submit shift assignment on insert
  • feat: add shift assignment creation
  • feat: select date from selected cell
  • feat: fetch company and department from employee
  • refactor: move ShiftAssignmentDialog to a new component
  • feat: add plus button to create shift assignments
  • feat: add update shift assignment values
  • refactor: use createListresource and createDocumentResource
  • feat: add shift assignment dialog
  • feat: add shift timings
  • feat: add employee pics and fix spacing and font sizes
  • fix: table border
  • feat: display shifts on calendar
  • feat: fetch shifts
  • feat: get context
  • chore: update tsconfig.json
  • feat: add month table header
  • chore: format index.html
  • feat: add month view header
  • chore: enable typescript
  • fix: update server proxy, routing, package.json scripts, .gitignore, etc.
  • feat: init roster app


Diagnostics

Cleaning files from denylist:
 hrms/locale/main.pot | 13467 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 13467 insertions(+)


Conflicts detected for source commit: ce7acf2921ab0d992603d9455a3b28b3db7a7b20
  ↳ Removing file (deleted by them): hrms/hr/doctype/shift_assignment_group/shift_assignment_group.json
Suspicious merge commit detected: 8b1a5e61f5f56e70f28b132b7adaca06548ee64c


Checkout instructions 
# Checkout locally
git fetch upstream
git switch ft-pr-1760

# Alternatively, re-take the changes
git switch develop
ft take ft-pr-1760

# Make changes then rebase
git rebase -i develop

# Fix or ignore conflicts
git checkout --theirs .
git rebase --continue

# Force-push changes
git push --force-with-lease

Merge request reports