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 #1947

Merged
merged 117 commits into from
Nov 12, 2024
Merged

Drtii 1557 min staff #1947

merged 117 commits into from
Nov 12, 2024

Conversation

ngu04
Copy link
Contributor

@ngu04 ngu04 commented Nov 6, 2024

using tag instead of fixed hash

Nilesh Gupta and others added 30 commits August 27, 2024 17:17
initial add min staff component
9941f99 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
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 <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
edit min staff
eaee1b7 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
state change only min staff
e4088f6 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
Adding updated version for drt react
b67c748 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
update drt react and add port in montly staffing
530f6e6 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
updating updateAt with change in min staff roster
1a26f95 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
merge master
95ed4b5 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
Separating update alert box
b3e6a2a 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
reposition staff update page
1574037 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
adding cancel and refresh button
e2545b6 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
@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 <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
tidy up changes
d0a1837 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
fixing unit test
7142cd3 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
merge master
2381097 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
remove commented
2403d57 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
add handler for alert update min staff banner
ec8510f 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
moving ShouldShowMinStaffSuccessBanner to monthly banner
e3f3e86 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
changing text for min staff
1c58f70 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
@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 <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
merge master
69d3aeb 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
merge master
bce835d 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
adding json serialisation for api for staff shift api
8fc9712 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
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 <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
adding update edit shift
3619743 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
editing staff with drawer
14256b4 
Signed-off-by: Nilesh Gupta <nilesh.nemichandgupta@digital.homeoffice.gov.uk>
ngu04 and others added 21 commits November 5, 2024 12:43
@ngu04
remove isweekly and isdaily boolean param
29b1099 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
rename EditShiftStaffForm to UpdateStaffForTimeRangeForm
b0c7463 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@richbirch
DRTII-1557 Correct test name
735b532
@ngu04
update setting
0ac7712 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@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 <guptanilesh13@gmail.com>
@ngu04
update prevent to failing test
13c598e 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
waiting for saveshift to complete
5ec793d 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
temp adding wait
829a364 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update react component
8b2eca4 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update react version 1.5.4
5dd62ae 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
merge master
7214e05 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
Merge branch 'master' of github.com:UKHomeOffice/drt-v2 into DRTII-15…
62a693a 
…57-min-staff
@ngu04
update package json
73acd16 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
using commit hash
885abb0 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
using tag for drt-react
b000acd 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
updating timings
6be29c2 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update drt lib for single digit date display
bc13abd 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update drt react for endtime
fb927f4 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
fixing 24hr period
e56f117 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update drt react
5231da6 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
richbirch
richbirch requested changes Nov 8, 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.

We shouldn't need to check for midnight end times - the react component should send the correct end date for a midnight end time.

@richbirch @ngu04
Drtii 1681 min staff handle edits (#1948)
058a42f 
* DRTII-1681 Fix staff assignment date and times

* DRTII-1681 Remove dead code

* update react for calender day fix

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

---------

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
Co-authored-by: Nilesh Gupta <guptanilesh13@gmail.com>
richbirch
richbirch approved these changes Nov 11, 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.

🎖️

ngu04 and others added 4 commits November 12, 2024 22:48
@ngu04 @richbirch
Drtii 1681 min staff handle edits (#1950)
03dbf74 
* DRTII-1681 Fix staff assignment date and times

* DRTII-1681 Remove dead code

* update react for calender day fix

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update drt react component

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* adding update shift e2e

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update drt test

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* moving datacy outside icon

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* using callback in updaeStaffingForm cy

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* adding force for input in date picker

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* e2e fix

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* e2e fix

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update e2e for select to work

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* may for drone build needs { force: true } for start-time-select

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* just apply force to start time

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update force for mui select

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update force for mui select

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* jsut update end time

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update drt react with data-cy instead of data-testid

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update test callback

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* agrument in delete data

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* adding timeout

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* removing staffing test

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* update drt react tag 1.5.7

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

* merge master drt version

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>

---------

Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
Co-authored-by: Rich Birch <ringo@albumsnaps.com>
@ngu04
update drt-react
2f16f95 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
merge
551911c 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04
update package json lock to version 1.5.7
820e501 
Signed-off-by: Nilesh Gupta <guptanilesh13@gmail.com>
@ngu04 ngu04 merged commit bb4114a into master Nov 12, 2024
2 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