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

Jump to bottom

Grad release 1.10.0 #454

Merged
merged 5 commits into from
Nov 16, 2023
Merged

Grad release 1.10.0 #454

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7aeaff8
GRAD2-2271: task is completed.
infstar Oct 26, 2023
5154d7a
Merge pull request #451 from bcgov/feature/GRAD2-2271
infstar Nov 1, 2023
fb3d1e5
GRAD2-2271: improved for a student with "X" courses and regular courses.
infstar Nov 1, 2023
b1e1904
Merge pull request #452 from bcgov/feature/GRAD2-2271
infstar Nov 3, 2023
6c524bb
Update pom.xml
kamal-mohammed Nov 16, 2023
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
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</parent>
<groupId>ca.bc.gov.educ</groupId>
<artifactId>educ-grad-rule-engine-api</artifactId>
<version>1.8.50</version>
<version>1.8.52</version>
<name>educ-grad-rule-engine-api</name>
<description>Rule Engine API for GRAD team</description>

Expand Down
3 changes: 2 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/DuplicateCoursesRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ public RuleData fire() {
&& studentCourseList.get(i).getCourseLevel().equals(studentCourseList.get(j).getCourseLevel())
&& !studentCourseList.get(j).isDuplicate()) {

logger.debug("comparing {} with {} -> Duplicate FOUND - CourseID: {}-{}",studentCourseList.get(i).getCourseCode(),studentCourseList.get(j).getCourseCode(),studentCourseList.get(i).getCourseCode(),studentCourseList.get(i).getCourseLevel());
logger.debug("comparing {} with {} -> Duplicate FOUND - CourseID: {}-{} {}",studentCourseList.get(i).getCourseCode(),studentCourseList.get(j).getCourseCode(),
studentCourseList.get(j).getCourseCode(),studentCourseList.get(j).getCourseLevel(),studentCourseList.get(j).getSessionDate());

if (studentCourseList.get(i).getCredits() > studentCourseList.get(j).getCredits()) {
studentCourseList.get(i).setDuplicate(false);
Expand Down
5 changes: 3 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/ruleengine/rule/MinAdultCoursesRule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,9 @@ public RuleData fire() {
}
}
}

ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
if (!studentCourses.isEmpty()) {
ruleProcessorData.getStudentCourses().addAll(ruleProcessorData.getExcludedCourses());
}
return ruleProcessorData;
}

Expand Down
Loading