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

#3788 - Gateway Assessment Data Update - PT & FT #3874

Merged
merged 2 commits into from
Nov 1, 2024
Merged

#3788 - Gateway Assessment Data Update - PT & FT #3874

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd1950e
Updated assessment data for PT/FT.
andrewsignori-aot Nov 1, 2024
c20b2b7
Updated tuitionCost to use calculatedDataActualTuitionCosts
andrewsignori-aot Nov 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sources/packages/backend/workflow/src/workflow-definitions/assessment-gateway.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.23.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.1.0" camunda:diagramRelationId="f874f098-96b6-491d-81ec-ecf7a0d8c67a">
<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:bpmndi="http://www.omg.org/spec/BPMN/20100524/DI" xmlns:dc="http://www.omg.org/spec/DD/20100524/DC" xmlns:zeebe="http://camunda.org/schema/zeebe/1.0" xmlns:di="http://www.omg.org/spec/DD/20100524/DI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:modeler="http://camunda.org/schema/modeler/1.0" xmlns:camunda="http://camunda.org/schema/1.0/bpmn" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn" exporter="Camunda Modeler" exporterVersion="5.28.0" modeler:executionPlatform="Camunda Cloud" modeler:executionPlatformVersion="8.6.0" camunda:diagramRelationId="f874f098-96b6-491d-81ec-ecf7a0d8c67a">
Copy link
Collaborator

Choose a reason for hiding this comment

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

👍

<bpmn:collaboration id="Collaboration_0z9wj8q">
<bpmn:participant id="application-in-progress" name="Assessment" processRef="assessment-gateway" />
<bpmn:group id="Group_1k2osho" categoryValueRef="CategoryValue_1yy7g02" />
Expand Down Expand Up @@ -306,7 +306,7 @@
<bpmn:serviceTask id="save-assessment-data-part-time-task" name="Save assessment output">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:input source="={&#10; weeks: offeringWeeks,&#10; tuitionCost: offeringActualTuitionCosts,&#10; booksAndSuppliesCost: offeringProgramRelatedCosts,&#10; mandatoryFees: calculatedDataMandatoryFees,&#10; exceptionalEducationCost: offeringExceptionalExpenses,&#10; childcareCost: calculatedDataTotalChildCareCost,&#10; totalFamilyIncome: calculatedDataTotalFamilyIncome,&#10; transportationCost: calculatedDataTotalTransportationAllowance,&#10; miscellaneousAllowance: calculatedDataMiscellaneousAllowance,&#10; totalAssessmentNeed: calculatedDataTotalAssessedNeed,&#10; totalAcademicExpenses: calculatedDataTotalAcademicExpenses,&#10; finalFederalAwardNetCSGPAmount: finalFederalAwardNetCSGPAmount,&#10; finalFederalAwardNetCSPTAmount: finalFederalAwardNetCSPTAmount,&#10; finalFederalAwardNetCSGDAmount: finalFederalAwardNetCSGDAmount,&#10; finalProvincialAwardNetBCAGAmount: finalProvincialAwardNetBCAGAmount,&#10; finalProvincialAwardNetSBSDAmount: finalProvincialAwardNetSBSDAmount,&#10; finalFederalAwardNetCSLPAmount: finalFederalAwardNetCSLPAmount,&#10; finalAwardTotal: finalAwardTotal&#10;}" target="assessmentData" />
<zeebe:input source="={&#10; weeks: offeringWeeks,&#10; tuitionCost: calculatedDataActualTuitionCosts,&#10; booksAndSuppliesCost: calculatedDataProgramRelatedCosts,&#10; mandatoryFees: calculatedDataMandatoryFees,&#10; exceptionalEducationCost: offeringExceptionalExpenses,&#10; childcareCost: calculatedDataTotalChildCareCost,&#10; totalFamilyIncome: calculatedDataTotalFamilyIncome,&#10; transportationCost: calculatedDataTotalTransportationAllowance,&#10; miscellaneousAllowance: calculatedDataMiscellaneousAllowance,&#10; totalAssessmentNeed: calculatedDataTotalAssessedNeed,&#10; totalAcademicExpenses: calculatedDataTotalAcademicExpenses,&#10; finalFederalAwardNetCSGPAmount: finalFederalAwardNetCSGPAmount,&#10; finalFederalAwardNetCSPTAmount: finalFederalAwardNetCSPTAmount,&#10; finalFederalAwardNetCSGDAmount: finalFederalAwardNetCSGDAmount,&#10; finalProvincialAwardNetBCAGAmount: finalProvincialAwardNetBCAGAmount,&#10; finalProvincialAwardNetSBSDAmount: finalProvincialAwardNetSBSDAmount,&#10; finalFederalAwardNetCSLPAmount: finalFederalAwardNetCSLPAmount,&#10; finalAwardTotal: finalAwardTotal&#10;}" target="assessmentData" />
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we require the exceptional expense for the PT assessment data at all?
image

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

We do not require it in the NOA but we do for some data inventory reports (that may be removed in the future).
I would not remove it right now.

</zeebe:ioMapping>
<zeebe:taskDefinition type="save-assessment-data" />
</bpmn:extensionElements>
Expand All @@ -316,7 +316,7 @@
<bpmn:serviceTask id="save-assessment-data-task" name="Save assessment output">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:input source="={&#10; weeks: offeringWeeks,&#10; tuitionCost: calculatedDataTotalTutionCost,&#10; childcareCost: calculatedDataChildCareCost,&#10; livingAllowance: calculatedDataTotalMSOLAllowance,&#10; totalAssessedCost: calculatedDataTotalCosts,&#10; totalFamilyIncome: calculatedDataTotalFamilyIncome,&#10; totalFederalAward: awardNetFederalTotalAward,&#10; otherAllowableCost: calculatedDataChildCareCost,&#10; transportationCost: calculatedDataTotalTransportationCost,&#10; secondResidenceCost: calculatedDataTotalSecondResidence,&#10; totalAssessmentNeed: calculatedDataTotalAssessedNeed,&#10; booksAndSuppliesCost: calculatedDataTotalBookCost,&#10; totalProvincialAward: awardNetProvincialTotalAward,&#10; alimonyOrChildSupport: calculatedDataTotalChildSpousalSupport,&#10; federalAssessmentNeed: calculatedDataFederalAssessedNeed,&#10; exceptionalEducationCost: offeringExceptionalExpenses,&#10; provincialAssessmentNeed: calculatedDataProvincialAssessedNeed,&#10; totalFederalContribution: calculatedDataTotalFederalFSC + calculatedDataTotalSpouseContribution + calculatedDataTotalParentalContribution,&#10; parentAssessedContribution: calculatedDataTotalParentalContribution,&#10; partnerAssessedContribution: calculatedDataTotalSpouseContribution,&#10; totalProvincialContribution: calculatedDataTotalProvincialFSC + calculatedDataTotalSpouseContribution + calculatedDataTotalParentalContribution,&#10; studentTotalFederalContribution: calculatedDataTotalFederalFSC,&#10; totalFederalAssessedResources: parentAssessedContribution + partnerAssessedContribution + calculatedDataTargetedResources + calculatedDataTotalFederalFSC,&#10; totalProvincialAssessedResources: parentAssessedContribution + partnerAssessedContribution + calculatedDataTargetedResources + calculatedDataTotalProvincialFSC,&#10; studentTotalProvincialContribution: calculatedDataTotalProvincialFSC,&#10; finalFederalAwardNetCSGPAmount: finalFederalAwardNetCSGPAmount,&#10; finalFederalAwardNetCSGDAmount: finalFederalAwardNetCSGDAmount,&#10; finalProvincialAwardNetBCAGAmount: finalProvincialAwardNetBCAGAmount,&#10; finalProvincialAwardNetSBSDAmount: finalProvincialAwardNetSBSDAmount,&#10; finalProvincialAwardNetBCSLAmount: finalProvincialAwardNetBCSLAmount,&#10; finalFederalAwardNetCSGFAmount: finalFederalAwardNetCSGFAmount,&#10; finalProvincialAwardNetBGPDAmount: finalProvincialAwardNetBGPDAmount,&#10; finalAwardTotal: awardNetFederalTotalAward + awardNetProvincialTotalAward&#10;}" target="assessmentData" />
<zeebe:input source="={&#10; weeks: offeringWeeks,&#10; tuitionCost: calculatedDataTotalTutionCost,&#10; childcareCost: calculatedDataTotalChildCareCost,&#10; livingAllowance: calculatedDataTotalMSOLAllowance,&#10; totalAssessedCost: calculatedDataTotalCosts,&#10; totalFamilyIncome: calculatedDataTotalFamilyIncome,&#10; totalFederalAward: awardNetFederalTotalAward,&#10; otherAllowableCost: calculatedDataTotalChildSpousalSupport + calculatedDataTotalSecondResidence,&#10; transportationCost: calculatedDataTotalTransportationCost,&#10; secondResidenceCost: calculatedDataTotalSecondResidence,&#10; totalAssessmentNeed: calculatedDataTotalAssessedNeed,&#10; booksAndSuppliesCost: calculatedDataTotalBookCost,&#10; totalProvincialAward: awardNetProvincialTotalAward,&#10; alimonyOrChildSupport: calculatedDataTotalChildSpousalSupport,&#10; federalAssessmentNeed: calculatedDataFederalAssessedNeed,&#10; exceptionalEducationCost: offeringExceptionalExpenses,&#10; provincialAssessmentNeed: calculatedDataProvincialAssessedNeed,&#10; totalFederalContribution: calculatedDataTotalFederalContribution,&#10; parentAssessedContribution: calculatedDataTotalParentalContribution,&#10; partnerAssessedContribution: calculatedDataTotalSpouseContribution,&#10; totalProvincialContribution: calculatedDataTotalProvincialContribution,&#10; studentTotalFederalContribution: calculatedDataTotalFederalFSC,&#10; totalFederalAssessedResources: parentAssessedContribution + partnerAssessedContribution + calculatedDataTargetedResources + calculatedDataTotalFederalFSC,&#10; totalProvincialAssessedResources: parentAssessedContribution + partnerAssessedContribution + calculatedDataTargetedResources + calculatedDataTotalProvincialFSC,&#10; studentTotalProvincialContribution: calculatedDataTotalProvincialFSC,&#10; finalFederalAwardNetCSGPAmount: finalFederalAwardNetCSGPAmount,&#10; finalFederalAwardNetCSGDAmount: finalFederalAwardNetCSGDAmount,&#10; finalProvincialAwardNetBCAGAmount: finalProvincialAwardNetBCAGAmount,&#10; finalProvincialAwardNetSBSDAmount: finalProvincialAwardNetSBSDAmount,&#10; finalProvincialAwardNetBCSLAmount: finalProvincialAwardNetBCSLAmount,&#10; finalFederalAwardNetCSGFAmount: finalFederalAwardNetCSGFAmount,&#10; finalProvincialAwardNetBGPDAmount: finalProvincialAwardNetBGPDAmount,&#10; finalAwardTotal: awardNetFederalTotalAward + awardNetProvincialTotalAward&#10;}" target="assessmentData" />
</zeebe:ioMapping>
<zeebe:taskDefinition type="save-assessment-data" />
</bpmn:extensionElements>
Expand Down