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

feat(parental-leave): Implement rights code util #4103

Merged
merged 13 commits into from
Jun 9, 2021
Merged

feat(parental-leave): Implement rights code util #4103

merged 13 commits into from
Jun 9, 2021

Conversation

baering
Copy link
Member

@baering baering commented Jun 8, 2021

What

https://app.asana.com/0/1182378413629561/1200340152240431

Implements basic rights code for unborn children.

Primary parents get either M-S-GR (mother-self_employed-basic_rights) or M-L-GR (mother-employed-basic_rights).
Secondary parents without custody get either FO-FL-L-GR (parent-without_custody-salary-basic_rights) or FO-FL-S-GR (parent-without_custody-self_employed-basic_rights), if they are in registered cohabitation with primary parent then they receive custody automatically and then FL- (without custody) is not in the code.

Rights code for born children will be implemented in another PR.

Why

So that the reviewer of the application is aware of what rights the applicant has.

Screenshots

Also updated how error messages are displayed, if the message is a JSON string and contains message then it is used (TODO translate API errors)

image

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • I have added tests that prove my fix is effective or that my feature works
  • Formatting passes locally with my changes
  • I have rebased against main before asking for a review

@cypress
Copy link

cypress bot commented Jun 8, 2021



Test summary

1 0 0 0


Run details

Project island.is
Status Passed
Commit 2c69fbe ℹ️
Started Jun 9, 2021 7:21 PM
Ended Jun 9, 2021 7:32 PM
Duration 11:12 💡
OS Linux Ubuntu - 20.04
Browser Electron 87

View run in Cypress Dashboard ➡️


This comment has been generated by cypress-bot as a result of this project's GitHub integration settings. You can manage this integration in this project's settings in the Cypress Dashboard

@baering baering requested a review from jeremybarbet June 8, 2021 22:37
@@ -208,7 +254,7 @@ export const transformApplicationToParentalLeaveDTO = (
// TODO: refactor period.endDate to not include time
to: period.endDate.split('T')[0],
ratio: Number(period.ratio),
approved: true,
approved: false,
Copy link
Member Author

Choose a reason for hiding this comment

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

At one point we thought this meant approved by employer, but this is updated by VMST when they have approved it.

@baering baering marked this pull request as ready for review June 9, 2021 11:33
@baering baering requested a review from a team June 9, 2021 11:33
Copy link
Contributor

@jeremybarbet jeremybarbet left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@baering baering added the automerge Merge this PR as soon as all checks pass label Jun 9, 2021
Copy link
Contributor

@madebynoam madebynoam left a comment

Choose a reason for hiding this comment

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

lgtm!

@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jun 9, 2021

This PR currently has a merge conflict. Please resolve this and then re-add the automerge label.

@kodiakhq kodiakhq bot removed the automerge Merge this PR as soon as all checks pass label Jun 9, 2021
@baering baering added the automerge Merge this PR as soon as all checks pass label Jun 9, 2021
@kodiakhq kodiakhq bot merged commit 19ba6e1 into main Jun 9, 2021
@kodiakhq kodiakhq bot deleted the PL/rights branch June 9, 2021 22:02
addi added a commit that referenced this pull request Jun 10, 2021
* main:
  Allow pull requests to be prioritized
  feat: ReadSpeaker webreader on articles (#4132)
  fix(api-domains-endorsement-system): Open endorsement list not working (#4156)
  Revert "fix(tests): Run tests as current user (#4152)"
  feat(party-letter): Bulk upload  (#4098)
  fix(tests): Run tests as current user (#4152)
  feat(party-application): Bulk upload in party application (#4092)
  feat(judicial-system): InvestigationRequest Prosecutors (#4023)
  feat(parental-leave): Implement rights code util (#4103)
  fix: add correct License type (#4145)
  chore(core): Update dockerfile node versions from 14.16 to 14.17 (#4147)
  chore(gjafakort): Update heading text for "Ferðagjöfin þín" (#4141)
  chore: Remove package-lock.json (#4142)
  feat(judicial-system): Change placeholder text is appeal date pickers on SignedVerdictOverview page (#4139)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this PR as soon as all checks pass
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants