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

Jump to bottom

Drtii 1557 min staff #1920

Merged
merged 103 commits into from
Nov 6, 2024
Merged

Drtii 1557 min staff #1920

merged 103 commits into from
Nov 6, 2024

Conversation

ngu04
Copy link
Contributor

@ngu04 ngu04 commented Sep 11, 2024 •
edited
Loading

  • Add edit staff form for updating staffing
  • remove min staff implementation from 1st slice
  • also removing port config and adding terminal config for shift which we will using in next slice

Nilesh Gupta and others added 30 commits August 27, 2024 17:17
initial add min staff component
9941f99 
Signed-off-by: Nilesh Gupta <[email protected]>
Merge branch 'master' of github.com:UKHomeOffice/drt-v2 into DRTII-15…
4779d05 
…57-min-staff
Changes to add min staff
4cbaeef 
Signed-off-by: Nilesh Gupta <[email protected]>
edit min staff
eaee1b7 
Signed-off-by: Nilesh Gupta <[email protected]>
state change only min staff
e4088f6 
Signed-off-by: Nilesh Gupta <[email protected]>
Adding updated version for drt react
b67c748 
Signed-off-by: Nilesh Gupta <[email protected]>
update drt react and add port in montly staffing
530f6e6 
Signed-off-by: Nilesh Gupta <[email protected]>
updating updateAt with change in min staff roster
1a26f95 
Signed-off-by: Nilesh Gupta <[email protected]>
merge master
95ed4b5 
Signed-off-by: Nilesh Gupta <[email protected]>
Separating update alert box
b3e6a2a 
Signed-off-by: Nilesh Gupta <[email protected]>
reposition staff update page
1574037 
Signed-off-by: Nilesh Gupta <[email protected]>
adding cancel and refresh button
e2545b6 
Signed-off-by: Nilesh Gupta <[email protected]>
@richbirch
DRTII-1557 Min staff end point return updated shifts. Detect update &…
bc49aa4 
… reset state in component
getting update to work with confirm on monthly staff
9e4e3c0 
Signed-off-by: Nilesh Gupta <[email protected]>
tidy up changes
d0a1837 
Signed-off-by: Nilesh Gupta <[email protected]>
fixing unit test
7142cd3 
Signed-off-by: Nilesh Gupta <[email protected]>
merge master
2381097 
Signed-off-by: Nilesh Gupta <[email protected]>
remove commented
2403d57 
Signed-off-by: Nilesh Gupta <[email protected]>
add handler for alert update min staff banner
ec8510f 
Signed-off-by: Nilesh Gupta <[email protected]>
moving ShouldShowMinStaffSuccessBanner to monthly banner
e3f3e86 
Signed-off-by: Nilesh Gupta <[email protected]>
changing text for min staff
1c58f70 
Signed-off-by: Nilesh Gupta <[email protected]>
@richbirch
Drtii 1557 min staff monthly staffing data (#1921)
f2b7948 
* DRTII-1557 Tidying

* DRTII-1557 Convert to backend component

* DRTII-1557 Start refactoring month staffing to fix state issues

* DRTII-1557 Finish refactoring monthly staffing. Fix planning page refreshes

* DRTII-1557 Send all shifts to frontend rather than one month

* DRTII-1557 Fix from main ticket branch
add Staff Shift form
cdff1dc 
Signed-off-by: Nilesh Gupta <[email protected]>
merge master
69d3aeb 
Signed-off-by: Nilesh Gupta <[email protected]>
merge master
bce835d 
Signed-off-by: Nilesh Gupta <[email protected]>
adding json serialisation for api for staff shift api
8fc9712 
Signed-off-by: Nilesh Gupta <[email protected]>
Merge branch 'master' of github.com:UKHomeOffice/drt-v2 into DRTII-15…
581a637 
…57-min-staff
Adding staff shift component
ae44217 
Signed-off-by: Nilesh Gupta <[email protected]>
adding update edit shift
3619743 
Signed-off-by: Nilesh Gupta <[email protected]>
editing staff with drawer
14256b4 
Signed-off-by: Nilesh Gupta <[email protected]>
ngu04 and others added 10 commits October 29, 2024 08:27
@ngu04
few of review comment changes
e768e0a 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
Adding test for almost 18k shiftsassignment
1c6774b 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
moving consecutive days to util
9138e60 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
fixing weekly and daily staff
6105211 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
adding interval base edit form and form style change
e53f585 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04 @richbirch
Drtii 1557 min staff update shifts optimal solution (#1943)
1d0e5a1 
* DRTII-1557 Store staff assignments in map to make updates really fast

* DRTII-1557 Add comparison of solutions

* DRTII-1557 Reinstate key

* removing commented and unsed content

Signed-off-by: Nilesh Gupta <[email protected]>

* fixing the test

Signed-off-by: Nilesh Gupta <[email protected]>

---------

Signed-off-by: Nilesh Gupta <[email protected]>
Co-authored-by: Rich Birch <[email protected]>
@ngu04
adding weekly and daily rolling option in calender
14f7791 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
fixing styling for staffing
12b4e1e 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
update react component
d614728 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
removing StaffShiftFormService
922dd9f 
Signed-off-by: Nilesh Gupta <[email protected]>
richbirch
richbirch requested changes Nov 4, 2024
View reviewed changes
Copy link
Collaborator

@richbirch richbirch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice one getting the functionality working.
A few things left:

  • Tidying
  • Consistent and clear naming
  • Remove dead code
  • Fix some dodgy logic

client/src/main/scala/drt/client/components/StaffingUtil.scala Outdated Show resolved Hide resolved
client/src/main/scala/drt/client/components/StaffUpdateSuccess.scala Outdated Show resolved Hide resolved
client/src/main/scala/drt/client/components/MonthlyStaffing.scala Outdated Show resolved Hide resolved
client/src/main/scala/drt/client/components/MonthlyStaffing.scala Outdated Show resolved Hide resolved
client/src/main/scala/drt/client/components/MonthlyStaffing.scala Show resolved Hide resolved
server/src/test/scala/drt/shared/ShiftAssignmentsTest.scala Outdated Show resolved Hide resolved
server/src/test/scala/drt/shared/ShiftAssignmentsTest.scala Outdated Show resolved Hide resolved
server/src/test/scala/drt/shared/ShiftAssignmentsTest.scala Outdated Show resolved Hide resolved
shared/src/main/scala/drt/shared/StaffAssignment.scala Outdated Show resolved Hide resolved
SplitUtil.scala Outdated Show resolved Hide resolved
richbirch
richbirch approved these changes Nov 5, 2024
View reviewed changes
Copy link
Collaborator

@richbirch richbirch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice work!

ngu04 added 9 commits November 5, 2024 16:54
@ngu04
update setting
0ac7712 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
Merge branch 'DRTII-1557-min-staff' of github.com:UKHomeOffice/drt-v2…
36ba7a7 
… into DRTII-1557-min-staff
@ngu04
fixing e2e
88251e6 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
update prevent to failing test
13c598e 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
waiting for saveshift to complete
5ec793d 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
temp adding wait
829a364 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
update react component
8b2eca4 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
update react version 1.5.4
5dd62ae 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04
merge master
7214e05 
Signed-off-by: Nilesh Gupta <[email protected]>
@ngu04 ngu04 merged commit 320ac3d into master Nov 6, 2024
3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@richbirch richbirch richbirch approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ngu04 @richbirch