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

#3721 - PT Assessment - Books and Supplies Limit #3771

Merged
merged 9 commits into from
Oct 10, 2024

Conversation

andrepestana-aot
Copy link
Collaborator

@andrepestana-aot andrepestana-aot commented Oct 7, 2024

  • Added limitWeeklyBooksAndSupplies to dmnPartTimeProgramYearMaximums:
    image

  • Changed calculatedDataProgramRelatedCosts to check the minimum between offeringProgramRelatedCosts and dmnPartTimeProgramYearMaximums.limitWeeklyBooksAndSupplies * offeringWeeks:
    image

  • Added offering delivery "blended" to allow calculatedDataWeeklyMinTransport to receive dmnPartTimeProgramYearMaximums.limitTransportationAllowance:
    image

  • Added offering delivery "blended" to allow inputDataRemainingTransportWeeks to receive the value of offeringWeeks - calculatedDataAdditionalTransportWeeks
    image

  • Added offering delivery "blended" to allow calculatedDataTotalTransportationAllowance to receive the value of offeringWeeks * dmnPartTimeProgramYearMaximums.limitTransportationAllowance
    image

  • Added tests to check program related costs impacted by books and supply costs;

  • Added tests to check transportation costs when the offering delivery is blended;

  • Added calculatedDataTotalAssessedNeed to assessment.model.ts as this variable has a typo for FT and it is correct for PT. Added a TODO to be done in another ticket;

  • Removed the python3 and make versions to fix a problem with local forms container (not related to this ticket).

@andrepestana-aot andrepestana-aot self-assigned this Oct 7, 2024
@andrepestana-aot andrepestana-aot added the Camunda Worflow Involves camunda workflow changes label Oct 7, 2024
@andrepestana-aot andrepestana-aot marked this pull request as ready for review October 10, 2024 17:18
@lewischen-aot lewischen-aot self-requested a review October 10, 2024 19:21
@@ -8,8 +8,8 @@ ARG FORMIO_SOURCE_REPO_TAG
# Note: using pinned versions to ensure immutable build environment.
RUN apk update && \
apk upgrade && \
apk add make=4.4.1-r2 && \
apk add python3=3.12.6-r0 && \
apk add make && \
Copy link
Collaborator

Choose a reason for hiding this comment

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

Thanks for taking care of this. I would suggest removing the version from the other packages also (lines 13 and 14).

Copy link
Collaborator

@andrewsignori-aot andrewsignori-aot left a comment

Choose a reason for hiding this comment

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

Great work, looks good 👍

Comment on lines 9 to 12
it(
"Should use minimum (offering program related costs) " +
"when dmn limit for books and supplies * number of offering weeks has a higher value.",
async () => {
Copy link
Collaborator

@lewischen-aot lewischen-aot Oct 10, 2024

Choose a reason for hiding this comment

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

Minor suggestion. The test case description is great, but maybe we could use "Should get program related costs as the offering program related costs when the DMN limit for books and supplies multiplied by offering weeks has the greater value."

Copy link
Collaborator

@lewischen-aot lewischen-aot left a comment

Choose a reason for hiding this comment

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

LGTM @andrepestana-aot. Just left a minor comment, but a blocker. Great work 👍

Copy link

Copy link

Backend Unit Tests Coverage Report

Totals Coverage
Statements: 21.9% ( 3495 / 15956 )
Methods: 9.89% ( 197 / 1991 )
Lines: 25.6% ( 3081 / 12036 )
Branches: 11.25% ( 217 / 1929 )

Copy link

E2E Workflow Workers Coverage Report

Totals Coverage
Statements: 58.64% ( 509 / 868 )
Methods: 52.88% ( 55 / 104 )
Lines: 62.27% ( 411 / 660 )
Branches: 41.35% ( 43 / 104 )

Copy link

E2E Queue Consumers Coverage Report

Totals Coverage
Statements: 84.49% ( 1035 / 1225 )
Methods: 84.13% ( 106 / 126 )
Lines: 85.59% ( 885 / 1034 )
Branches: 67.69% ( 44 / 65 )

Copy link

E2E SIMS API Coverage Report

Totals Coverage
Statements: 65.62% ( 5524 / 8418 )
Methods: 63.14% ( 680 / 1077 )
Lines: 69.75% ( 4367 / 6261 )
Branches: 44.17% ( 477 / 1080 )

@andrepestana-aot andrepestana-aot added this pull request to the merge queue Oct 10, 2024
Merged via the queue into main with commit 53c5af1 Oct 10, 2024
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Camunda Worflow Involves camunda workflow changes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants