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.2.0 #551

Merged
merged 6 commits into from
Jul 6, 2023
Merged

Grad release 1.2.0 #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a8ed19
GRAD2-2170 corrected the spelling mistake of activity code
githubmamatha Jun 22, 2023
9eeb348
Merge pull request #548 from bcgov/Grad2-2170ActivityCodeSpellingMistake
cditcher Jun 22, 2023
2e84b27
GRAD2-2170 corrected the spelling mistake of activity code and update…
githubmamatha Jun 22, 2023
bd48b29
Merge pull request #549 from bcgov/Grad2-2170ActivityCodeSpellingMistake
kamal-mohammed Jun 22, 2023
29cc678
GRAD2-2191: task is complete
infstar Jul 5, 2023
2c3dbdf
GRAD2-2199: task is complete
kamal-mohammed Jul 5, 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
4 changes: 2 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/api/gradstudent/service/DataConversionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@

import java.sql.Date;
import java.time.LocalDateTime;
import java.util.Optional;
import java.util.UUID;
import java.util.*;

/**
* Initial Student Loads
Expand Down Expand Up @@ -97,6 +96,7 @@ public GraduationStudentRecord saveGraduationStudentRecord(UUID studentID, Gradu

if (!sourceObject.getProgram().equalsIgnoreCase(gradEntity.getProgram())) {
if(gradEntity.getProgram().equalsIgnoreCase("SCCP")) {
sourceObject.setProgramCompletionDate(null);
graduationStatusService.archiveStudentAchievements(sourceObject.getStudentID(),accessToken);
} else {
graduationStatusService.deleteStudentAchievements(sourceObject.getStudentID(), accessToken);
Expand Down
14 changes: 14 additions & 0 deletions api/src/main/resources/db/migration/1.0/V1.0.50__DML-UPDATE_TABLE-HISTORY_ACTIVITY_CODE.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
INSERT INTO HISTORY_ACTIVITY_CODE
(HISTORY_ACTIVITY_CODE, LABEL, DESCRIPTION, DISPLAY_ORDER, EFFECTIVE_DATE, EXPIRY_DATE)
VALUES('USERDISTPSIF', 'User Distribution Run PSI FTP', 'Record updated by User Requested Distribution Run for PSI Transcript Print FTP', 30, TIMESTAMP'2021-09-29 13:27:12.0',NULL);

UPDATE GRADUATION_STUDENT_RECORD_HISTORY
SET HISTORY_ACTIVITY_CODE='USERDISTPSIF'
WHERE HISTORY_ACTIVITY_CODE='USERDISTPISF';

UPDATE STUDENT_OPTIONAL_PROGRAM_HISTORY
SET HISTORY_ACTIVITY_CODE='USERDISTPSIF'
WHERE HISTORY_ACTIVITY_CODE='USERDISTPISF';

DELETE FROM HISTORY_ACTIVITY_CODE
WHERE HISTORY_ACTIVITY_CODE = 'USERDISTPISF';
Loading