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.

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

Feature/equal merit tie breakers #1261

Merged
merged 43 commits into from
Jul 30, 2021
Merged

Conversation

HalcyonJAC
Copy link
Contributor

@HalcyonJAC HalcyonJAC commented Apr 12, 2021


PREVIEW:DEVELOP

@HalcyonJAC HalcyonJAC self-assigned this Apr 12, 2021
@HalcyonJAC HalcyonJAC requested review from a team as code owners April 12, 2021 13:35
@HalcyonJAC HalcyonJAC linked an issue Apr 12, 2021 that may be closed by this pull request
16 tasks
@HalcyonJAC HalcyonJAC closed this Apr 12, 2021
@HalcyonJAC HalcyonJAC reopened this Apr 12, 2021
@HalcyonJAC HalcyonJAC marked this pull request as draft April 12, 2021 13:43
@github-actions
Copy link

github-actions bot commented Apr 12, 2021

Visit the preview URL for this PR (updated for commit 851ac37):

https://jac-admin-develop--pr1261-feature-equal-merit-8xft220h.web.app

(expires Sat, 28 Aug 2021 13:11:28 GMT)

🔥 via Firebase Hosting GitHub Action 🌎

@joy-ade
Copy link

joy-ade commented Jul 21, 2021

@halcyon can you regenerate the PR pls.

@HalcyonJAC HalcyonJAC temporarily deployed to develop July 21, 2021 12:50 Inactive
@HalcyonJAC
Copy link
Contributor Author

Merge conflicts resolved and router bugs fixed. PR url regenerated.

It would be good to get a re-review of this and sent for testing again.

@mbrookeswebdev
Copy link
Contributor

@HalcyonJAC when I click on 'Equal merit tie-breakers' link it takes me back to Exercises list -

EMP1
EMP2

@HalcyonJAC HalcyonJAC temporarily deployed to develop July 21, 2021 14:42 Inactive
@HalcyonJAC
Copy link
Contributor Author

Thanks @mbrookeswebdev it looks like the routes were merged into the wrong place after staged applications maybe? I've edited and it appears to work now. Please could you try again?

@joy-ade
Copy link

joy-ade commented Jul 23, 2021

@HalcyonJAC @JeremykJAC Thanks for resolving the merged conflict. However while l was creating an Equal merit tie breakers test there was an issues inputting date and time in the field. I know Kate has flagged this issue before. The scenario here should be the same as the qualifying time. I should be able to set the date and time without making changes to the date in timeline.Capture.PNG99.PNG

Copy link

@joy-ade joy-ade left a comment

Choose a reason for hiding this comment

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

Approved by UTG

Copy link
Member

@warrensearle warrensearle left a comment

Choose a reason for hiding this comment

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

Code changes look good to me 👍

@JeremykJAC
Copy link

JeremykJAC commented Jul 27, 2021

Hi @joy-ade

The reason this is happening is because there is an EMT second stage date set for the 22/07/21 and therefore the system requires the first EMT to be completed.

This was included on the development plan:

  • 'When creating a EM tie-breaker the start and end dates for the test should default to the Equal Merit Second Phase start and end dates for the exercise'.

Would you like us to ignore the second stage and allow the end date to be set afterwards?

@joy-ade
Copy link

joy-ade commented Jul 27, 2021

@KateMJAC FYI

JeremykJAC
commented 20 minutes ago
Hi @joy-ade

The reason this is happening is because there is an EMT second stage date set for the 22/07/21 and therefore the system requires the first EMT to be completed.

This was included on the development plan:

'When creating a EM tie-breaker the start and end dates for the test should default to the Equal Merit Second Phase start and end dates for the exercise'.
Would you like us to ignore the second stage and allow the end date to be set afterwards?

@KateMJAC
Copy link

@joy-ade, yesterday I outlined to Jeremy that there may be an outlier where a candidate needs to sit the test at a different date, after the intial test.

@JeremykJAC
Copy link

@KateMJAC We will remove the constraint that stops the tie breaker end date being forced to be before the second stage date. If this is ok, then we will do this first thing and hopefully we can get this ticket moving again :)

@HalcyonJAC HalcyonJAC temporarily deployed to develop July 28, 2021 14:11 Inactive
@HalcyonJAC
Copy link
Contributor Author

I have done that now. Darrel.

@HalcyonJAC HalcyonJAC temporarily deployed to develop July 29, 2021 13:06 Inactive
@KateMJAC KateMJAC merged commit 8bc9644 into main Jul 30, 2021
@KateMJAC KateMJAC deleted the feature/equal-merit-tie-breakers branch July 30, 2021 11:03
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.

Equal Merit Zone Tie-break Tests
10 participants