Jl - Protocol merge ssr ordering and new validations #2297

jleonardw9 · 2020-04-15T17:03:49Z

…ged.

app/controllers/dashboard/protocol_merges_controller.rb

I have implemented the requested changes.

…uest/sparc-request into jl-protocol-merge-ssr-ordering

jleonardw9 added 4 commits April 8, 2020 16:40

Merged ssr_ids now number from master protocol's next_ssr_id.

0b95190

Adding a check for protocols that do not have ssrs.

8b3b556

Roughing out check for requests split/notify organization.

569c2f2

Adding in a check to see if the requests under 2 protocols can be mer…

e563c66

…ged.

jleonardw9 added MUSC refactors version 3.7.0 labels Apr 15, 2020

kayla-glick suggested changes Apr 15, 2020

View reviewed changes

app/controllers/dashboard/protocol_merges_controller.rb Outdated Show resolved Hide resolved

kayla-glick previously requested changes Apr 15, 2020

View reviewed changes

app/controllers/dashboard/protocol_merges_controller.rb Show resolved Hide resolved

Merge branch 'v3.7.0' into jl-protocol-merge-ssr-ordering

cf8d7b8

jleonardw9 added the not ready label Apr 16, 2020

jleonardw9 added 3 commits April 16, 2020 09:51

Slight refactor of method for determining ineligible merge.

2ba99b1

Don't need that any more.

8e27e2f

Merge branch 'jl-protocol-merge-ssr-ordering' of github.com:sparc-req…

75aade2

…uest/sparc-request into jl-protocol-merge-ssr-ordering

jleonardw9 removed the not ready label Apr 16, 2020

kayla-glick approved these changes Apr 16, 2020

View reviewed changes

Stuart-Johnson approved these changes Apr 17, 2020

View reviewed changes

Stuart-Johnson merged commit 4441747 into v3.7.0 Apr 17, 2020

Stuart-Johnson deleted the jl-protocol-merge-ssr-ordering branch April 17, 2020 21:01

Provide feedback