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 #690

Merged
merged 5 commits into from
Oct 18, 2024
Merged

Grad release #690

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
1449417
GRAD2-2905: fixed the equal interim issue for OPEN program in xml pre…
infstar Oct 10, 2024
d0b209f
Merge pull request #688 from bcgov/feature/GRAD2-2905
infstar Oct 10, 2024
676a067
Added hikari settings
Oct 17, 2024
5139260
Bumped maxlifetime
Oct 17, 2024
f7082dc
Merge pull request #689 from bcgov/GRAD2-2992
infstar Oct 17, 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
7 changes: 6 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/grad/report/dto/impl/TranscriptCourseImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,12 @@ public boolean compareCourse(final TranscriptCourse compareCourse) {

// Removes duplication of courses by comparing and finding course with
// highest percentage.
return percentage <= comparePercentage && comparePercentage != 0;
// GRAD2-2905
if (this.isCompletedCourseUsedForGrad() && !compareCourse.isCompletedCourseUsedForGrad()) {
return percentage < comparePercentage && comparePercentage != 0;
} else {
return percentage <= comparePercentage && comparePercentage != 0;
}
}

public boolean isCompletedCourseUsedForGrad() {
Expand Down
1 change: 1 addition & 0 deletions api/src/main/java/ca/bc/gov/educ/grad/report/service/impl/StudentTranscriptServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -715,6 +715,7 @@ private TranscriptCourse getInterimCourse(
final List<TranscriptCourse> results, boolean openGradProgram) {
//Check for duplicate courses
for (final TranscriptCourse compareCourse : results) {
if (course.equals(compareCourse)) continue;
//Check and compare two courses for duplication and if required
//replace course based on requirement.
if (isInterimCourse(course, compareCourse, openGradProgram)) {
Expand Down
6 changes: 5 additions & 1 deletion tools/config/update-configmap.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,11 @@ oc create -n "$GRAD_NAMESPACE"-"$envValue" configmap "$APP_NAME"-config-map \
--from-literal=GRAD_STUDENT_API="http://educ-grad-student-api.$GRAD_NAMESPACE-$envValue.svc.cluster.local:8080/" \
--from-literal=GRAD_TRAX_API="http://educ-grad-trax-api.$GRAD_NAMESPACE-$envValue.svc.cluster.local:8080/" \
--from-literal=PEN_API="http://student-api-master.$COMMON_NAMESPACE-$envValue.svc.cluster.local:8080/" \
--from-literal=MAXIMUM_POOL_SIZE="10" \
--from-literal=CONNECTION_TIMEOUT='30000' \
--from-literal=MAXIMUM_POOL_SIZE='10' \
--from-literal=MIN_IDLE='10' \
--from-literal=IDLE_TIMEOUT='300000' \
--from-literal=MAX_LIFETIME='1500000' \
--dry-run=client -o yaml | oc apply -f -
echo

Expand Down
Loading