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

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

Merged
merged 9 commits into from
Oct 10, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
616410c
initial commit
andrepestana-aot Oct 7, 2024
62faeaa
fixed broken tests
andrepestana-aot Oct 8, 2024
583fe29
fixed broken tests
andrepestana-aot Oct 8, 2024
d5eea0a
add tests for program related costs
andrepestana-aot Oct 9, 2024
e11a003
add tests for transportation costs
andrepestana-aot Oct 9, 2024
afaae15
added tests for transportation costs and comment
andrepestana-aot Oct 9, 2024
fde81c8
added tests for transportation costs
andrepestana-aot Oct 9, 2024
e1342f7
removed version for make in Dockerfile.dev
andrepestana-aot Oct 10, 2024
90ee650
review issues
andrepestana-aot Oct 10, 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
188 changes: 94 additions & 94 deletions ...ces/packages/backend/workflow/src/workflow-definitions/parttime-assessment-2022-2023.bpmn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ dmnX (comes from dmn)</bpmn:text>
<zeebe:ioMapping>
<zeebe:output source="=offeringActualTuitionCosts" target="calculatedDataActualTuitionCosts" />
<zeebe:output source="=offeringMandatoryFees" target="calculatedDataMandatoryFees" />
<zeebe:output source="=offeringProgramRelatedCosts" target="calculatedDataProgramRelatedCosts" />
<zeebe:output source="=min(offeringProgramRelatedCosts, dmnPartTimeProgramYearMaximums.limitWeeklyBooksAndSupplies * offeringWeeks)" target="calculatedDataProgramRelatedCosts" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_08xi7o2</bpmn:incoming>
Expand Down Expand Up @@ -866,7 +866,7 @@ dmnX (comes from dmn)</bpmn:text>
<bpmn:intermediateThrowEvent id="Event_0tjlor6" name="Define minimum transport weekly limit">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:output source="=// If student is in onsite courses they get a minimum per study week, otherwise 0&#10;if(offeringDelivered = &#34;onsite&#34;)&#10;then &#10; dmnPartTimeProgramYearMaximums.limitTransportationAllowance&#10;else&#10; 0" target="calculatedDataWeeklyMinTransport" />
<zeebe:output source="=// If student is in onsite or blended courses they get a minimum per study week, otherwise 0&#10;if(offeringDelivered = &#34;onsite&#34; or offeringDelivered = &#34;blended&#34;)&#10;then &#10; dmnPartTimeProgramYearMaximums.limitTransportationAllowance&#10;else&#10; 0" target="calculatedDataWeeklyMinTransport" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_0onzs1l</bpmn:incoming>
Expand Down Expand Up @@ -925,7 +925,7 @@ dmnX (comes from dmn)</bpmn:text>
<bpmn:scriptTask id="Activity_0twtlpj" name="Calculate total transportation Allowance">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:input source="=// Accounts for students who requested additional transport for weeks than their offering weeks.&#10;if(offeringDelivered = &#34;onsite&#34;)&#10;then &#10; offeringWeeks - calculatedDataAdditionalTransportWeeks&#10;else &#10; 0" target="inputDataRemainingTransportWeeks" />
<zeebe:input source="=// Accounts for students who requested additional transport for weeks than their offering weeks.&#10;if(offeringDelivered = &#34;onsite&#34; or offeringDelivered = &#34;blended&#34;)&#10;then &#10; offeringWeeks - calculatedDataAdditionalTransportWeeks&#10;else &#10; 0" target="inputDataRemainingTransportWeeks" />
</zeebe:ioMapping>
<zeebe:script expression="=calculatedDataTotalAdditionalTransportationAllowance + (inputDataRemainingTransportWeeks * calculatedDataWeeklyMinTransport)" resultVariable="calculatedDataTotalTransportationAllowance" />
</bpmn:extensionElements>
Expand All @@ -944,7 +944,7 @@ dmnX (comes from dmn)</bpmn:text>
<bpmn:intermediateThrowEvent id="Event_10lg4rt" name="Calculate total transportation Allowance">
<bpmn:extensionElements>
<zeebe:ioMapping>
<zeebe:output source="=if(offeringDelivered = &#34;onsite&#34;)&#10;then &#10; offeringWeeks * dmnPartTimeProgramYearMaximums.limitTransportationAllowance&#10;else&#10; 0" target="calculatedDataTotalTransportationAllowance" />
<zeebe:output source="=if(offeringDelivered = &#34;onsite&#34; or offeringDelivered = &#34;blended&#34;)&#10;then &#10; offeringWeeks * dmnPartTimeProgramYearMaximums.limitTransportationAllowance&#10;else&#10; 0" target="calculatedDataTotalTransportationAllowance" />
</zeebe:ioMapping>
</bpmn:extensionElements>
<bpmn:incoming>Flow_0ra2rum</bpmn:incoming>
Expand Down Expand Up @@ -1227,20 +1227,20 @@ dmnX (comes from dmn)</bpmn:text>
<dc:Bounds x="160" y="80" width="7708" height="2892" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_1gxyyjh_di" bpmnElement="Lane_1gxyyjh" isHorizontal="true">
<dc:Bounds x="190" y="80" width="7678" height="1147" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0ejpwa7_di" bpmnElement="Lane_0ejpwa7" isHorizontal="true">
<dc:Bounds x="190" y="1227" width="7678" height="1745" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0pbg2l1_di" bpmnElement="Lane_0pbg2l1" isHorizontal="true">
<dc:Bounds x="220" y="1227" width="7648" height="1053" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0l32w49_di" bpmnElement="Lane_0l32w49" isHorizontal="true">
<dc:Bounds x="220" y="2280" width="7648" height="692" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Lane_0pbg2l1_di" bpmnElement="Lane_0pbg2l1" isHorizontal="true">
<dc:Bounds x="220" y="1227" width="7648" height="1053" />
<bpmndi:BPMNShape id="Lane_1gxyyjh_di" bpmnElement="Lane_1gxyyjh" isHorizontal="true">
<dc:Bounds x="190" y="80" width="7678" height="1147" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNShape id="Event_1sg75ph_di" bpmnElement="Event_1sg75ph">
Expand Down Expand Up @@ -2320,90 +2320,6 @@ dmnX (comes from dmn)</bpmn:text>
<di:waypoint x="2110" y="940" />
<di:waypoint x="2110" y="895" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0jm8vsl_di" bpmnElement="Association_0jm8vsl">
<di:waypoint x="2561" y="1030" />
<di:waypoint x="2556" y="971" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0cp4qvu_di" bpmnElement="Association_0cp4qvu">
<di:waypoint x="980" y="735" />
<di:waypoint x="980" y="852" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1i7iirc_di" bpmnElement="Association_1i7iirc">
<di:waypoint x="730" y="852" />
<di:waypoint x="730" y="742" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0eiso39_di" bpmnElement="Association_0eiso39">
<di:waypoint x="830" y="888" />
<di:waypoint x="830" y="980" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0ptatj5_di" bpmnElement="Association_0ptatj5">
<di:waypoint x="7200" y="2625" />
<di:waypoint x="7239" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1nid8vk_di" bpmnElement="Association_1nid8vk">
<di:waypoint x="7107" y="2624" />
<di:waypoint x="7133" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0gzo1wo_di" bpmnElement="Association_0gzo1wo">
<di:waypoint x="7020" y="2622" />
<di:waypoint x="7020" y="2550" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1vdevsr_di" bpmnElement="Association_1vdevsr">
<di:waypoint x="6544" y="2623" />
<di:waypoint x="6557" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_18qf11c_di" bpmnElement="Association_18qf11c">
<di:waypoint x="7449" y="2624" />
<di:waypoint x="7481" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1gi7mg0_di" bpmnElement="Association_1gi7mg0">
<di:waypoint x="7451" y="2756" />
<di:waypoint x="7471" y="2730" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1mr7raq_di" bpmnElement="Association_1mr7raq">
<di:waypoint x="6639" y="2624" />
<di:waypoint x="6672" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_01prvbh_di" bpmnElement="Association_01prvbh">
<di:waypoint x="5748" y="1628" />
<di:waypoint x="5846" y="1607" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0k52tdi_di" bpmnElement="Association_0k52tdi">
<di:waypoint x="5747" y="1705" />
<di:waypoint x="5846" y="1682" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1kl6b20_di" bpmnElement="Association_1kl6b20">
<di:waypoint x="5747" y="1783" />
<di:waypoint x="5846" y="1745" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1ledsf9_di" bpmnElement="Association_1ledsf9">
<di:waypoint x="5747" y="1873" />
<di:waypoint x="5846" y="1833" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1y0l2mk_di" bpmnElement="Association_1y0l2mk">
<di:waypoint x="5747" y="1956" />
<di:waypoint x="5846" y="1936" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0rsi8j4_di" bpmnElement="Association_0rsi8j4">
<di:waypoint x="3279" y="1372" />
<di:waypoint x="3279" y="1351" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0hwwkv8_di" bpmnElement="Association_0hwwkv8">
<di:waypoint x="3930" y="1350" />
<di:waypoint x="3930" y="1314" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1skh123_di" bpmnElement="Association_1skh123">
<di:waypoint x="4070" y="1350" />
<di:waypoint x="4070" y="1314" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1p9iqwc_di" bpmnElement="Association_1p9iqwc">
<di:waypoint x="3180" y="1372" />
<di:waypoint x="3180" y="1324" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0hybcza_di" bpmnElement="Association_0hybcza">
<di:waypoint x="3754" y="1608" />
<di:waypoint x="3799" y="1570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNShape id="BPMNShape_0hjhvfj" bpmnElement="TextAnnotation_15vd5py">
<dc:Bounds x="7429" y="2700" width="100" height="30" />
<bpmndi:BPMNLabel />
Expand Down Expand Up @@ -2498,6 +2414,90 @@ dmnX (comes from dmn)</bpmn:text>
<dc:Bounds x="4020" y="1242" width="180" height="72" />
<bpmndi:BPMNLabel />
</bpmndi:BPMNShape>
<bpmndi:BPMNEdge id="Association_1gi7mg0_di" bpmnElement="Association_1gi7mg0">
<di:waypoint x="7451" y="2756" />
<di:waypoint x="7471" y="2730" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1mr7raq_di" bpmnElement="Association_1mr7raq">
<di:waypoint x="6639" y="2624" />
<di:waypoint x="6672" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_18qf11c_di" bpmnElement="Association_18qf11c">
<di:waypoint x="7449" y="2624" />
<di:waypoint x="7481" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0ptatj5_di" bpmnElement="Association_0ptatj5">
<di:waypoint x="7200" y="2625" />
<di:waypoint x="7239" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1nid8vk_di" bpmnElement="Association_1nid8vk">
<di:waypoint x="7107" y="2624" />
<di:waypoint x="7133" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1vdevsr_di" bpmnElement="Association_1vdevsr">
<di:waypoint x="6544" y="2623" />
<di:waypoint x="6557" y="2570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_01prvbh_di" bpmnElement="Association_01prvbh">
<di:waypoint x="5748" y="1628" />
<di:waypoint x="5846" y="1607" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1ledsf9_di" bpmnElement="Association_1ledsf9">
<di:waypoint x="5747" y="1873" />
<di:waypoint x="5846" y="1833" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1kl6b20_di" bpmnElement="Association_1kl6b20">
<di:waypoint x="5747" y="1783" />
<di:waypoint x="5846" y="1745" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0k52tdi_di" bpmnElement="Association_0k52tdi">
<di:waypoint x="5747" y="1705" />
<di:waypoint x="5846" y="1682" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0gzo1wo_di" bpmnElement="Association_0gzo1wo">
<di:waypoint x="7020" y="2622" />
<di:waypoint x="7020" y="2550" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1i7iirc_di" bpmnElement="Association_1i7iirc">
<di:waypoint x="730" y="852" />
<di:waypoint x="730" y="742" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0eiso39_di" bpmnElement="Association_0eiso39">
<di:waypoint x="830" y="888" />
<di:waypoint x="830" y="980" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1y0l2mk_di" bpmnElement="Association_1y0l2mk">
<di:waypoint x="5747" y="1956" />
<di:waypoint x="5846" y="1936" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0jm8vsl_di" bpmnElement="Association_0jm8vsl">
<di:waypoint x="2561" y="1030" />
<di:waypoint x="2556" y="971" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0cp4qvu_di" bpmnElement="Association_0cp4qvu">
<di:waypoint x="980" y="735" />
<di:waypoint x="980" y="852" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1p9iqwc_di" bpmnElement="Association_1p9iqwc">
<di:waypoint x="3180" y="1372" />
<di:waypoint x="3180" y="1324" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0rsi8j4_di" bpmnElement="Association_0rsi8j4">
<di:waypoint x="3279" y="1372" />
<di:waypoint x="3279" y="1351" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0hwwkv8_di" bpmnElement="Association_0hwwkv8">
<di:waypoint x="3930" y="1350" />
<di:waypoint x="3930" y="1314" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_0hybcza_di" bpmnElement="Association_0hybcza">
<di:waypoint x="3754" y="1608" />
<di:waypoint x="3799" y="1570" />
</bpmndi:BPMNEdge>
<bpmndi:BPMNEdge id="Association_1skh123_di" bpmnElement="Association_1skh123">
<di:waypoint x="4070" y="1350" />
<di:waypoint x="4070" y="1314" />
</bpmndi:BPMNEdge>
</bpmndi:BPMNPlane>
</bpmndi:BPMNDiagram>
</bpmn:definitions>
Loading