From 767eb4d92cde5a5299478e46a1ff306544581b0c Mon Sep 17 00:00:00 2001 From: mightycox Date: Wed, 30 Oct 2024 10:04:51 -0700 Subject: [PATCH] GRAD2-3018 - Updates from pr review and requirement changes --- .../util/EducGradStudentApiConstants.java | 2 +- ...0__DML-INSERT_DATA-STUDENT_GRADE_CODES.sql | 40 +++++++++---------- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java index 1d3689b8..a930ac1f 100644 --- a/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java +++ b/api/src/main/java/ca/bc/gov/educ/api/gradstudent/util/EducGradStudentApiConstants.java @@ -43,7 +43,7 @@ public class EducGradStudentApiConstants { public static final String GRADUATION_RECORD_HISTORY_BY_BATCH_ID_DISTRIBUTION_RUN = "/distribution/batchid/{batchID}"; public static final String UPDATE_GRAD_STUDENT_FLAG_BY_BATCH_JOB_TYPE_AND_MULTIPLE_STUDENTIDS = "/multistudentids/batchflag/jobtype/{batchJobType}"; public static final String GRAD_STUDENT_NON_GRAD_REASON_BY_PEN = "/pen/{pen}/nongrad-reason"; - public static final String GET_ALL_STUDENT_GRADE_CODES = "/student-grade-codes"; + public static final String GET_ALL_STUDENT_GRADE_CODES = "/grade-codes"; public static final String GRAD_STUDENT_OPTIONAL_PROGRAM_BY_PEN = "/optionalprogram/studentid/{studentID}"; public static final String GRAD_STUDENT_OPTIONAL_PROGRAM_BY_PEN_PROGRAM_OPTIONAL_PROGRAM = "/optionalprogram/{studentID}/{optionalProgramID}"; diff --git a/api/src/main/resources/db/migration/1.0/V1.0.70__DML-INSERT_DATA-STUDENT_GRADE_CODES.sql b/api/src/main/resources/db/migration/1.0/V1.0.70__DML-INSERT_DATA-STUDENT_GRADE_CODES.sql index c3db6a06..74a15bbe 100644 --- a/api/src/main/resources/db/migration/1.0/V1.0.70__DML-INSERT_DATA-STUDENT_GRADE_CODES.sql +++ b/api/src/main/resources/db/migration/1.0/V1.0.70__DML-INSERT_DATA-STUDENT_GRADE_CODES.sql @@ -1,62 +1,62 @@ INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('01','Grade 1','First grade',110,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('01','Grade 1','First grade',180,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('02','Grade 2','Second grade',120,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('02','Grade 2','Second grade',170,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('03','Grade 3','Third grade',130,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('03','Grade 3','Third grade',160,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('04','Grade 4','Fourth grade',140,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('04','Grade 4','Fourth grade',150,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('05','Grade 5','Fifth grade',150,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('05','Grade 5','Fifth grade',140,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('06','Grade 6','Sixth grade',160,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('06','Grade 6','Sixth grade',130,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('07','Grade 7','Seventh grade',170,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('07','Grade 7','Seventh grade',120,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('08','Grade 8','Eighth grade',10,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('08','Grade 8','Eighth grade',90,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('09','Grade 9','Ninth grade',20,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('09','Grade 9','Ninth grade',100,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('10','Grade 10','Tenth grade',30,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('10','Grade 10','Tenth grade',10,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('11','Grade 11','Eleventh grade',40,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('11','Grade 11','Eleventh grade',20,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('12','Grade 12','Twelfth grade',50,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('12','Grade 12','Twelfth grade',30,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('AD','Adult Grad','Student on the Adult Graduation Program who is expected to graduate this year (subgrade)',60,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('AD','Adult Grad','Student on the Adult Graduation Program who is expected to graduate this year (subgrade)',40,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('AN','Adult Non Grad','Student on the Adult Graduation Program who is not expected to graduate this year (subgrade)',70,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('AN','Adult Non Grad','Student on the Adult Graduation Program who is not expected to graduate this year (subgrade)',50,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('GA','Graduated Adult','An adult student who has graduated in BC or another jurisdiction (subgrade)',90,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('GA','Graduated Adult','An adult student who has graduated in BC or another jurisdiction (subgrade)',60,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('GR','Graduated','Used by MyEdBC schools only when a student withdraws or the school believes they have finished their program',100,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('GR','Graduated','Used by MyEdBC schools only when a student withdraws or the school believes they have finished their program',110,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('KF','Kindergarten Full-time','After 2012, the only valid grade code for kindergarten (subgrade)',180,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('KF','Kindergarten Full-time','After 2012, the only valid grade code for kindergarten (subgrade)',200,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('SU','Secondary Upgraded','Secondary upgraded (subgrade)',190,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('SU','Secondary Upgraded','Secondary ungraded (subgrade)',80,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('EU','Elementary Upgraded','Elementary ungraded (subgrade)',200,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); +VALUES ('EU','Elementary Upgraded','Elementary ungraded (subgrade)',190,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'N'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) -VALUES ('HS','Home School','Students whose parents provide their educational program and who are registered with the school (subgrade)',80,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); +VALUES ('HS','Home School','Students whose parents provide their educational program and who are registered with the school (subgrade)',70,TIMESTAMP'2024-10-01 00:00:00.0',NULL, 'Y'); INSERT INTO STUDENT_GRADE_CODE (STUDENT_GRADE_CODE,LABEL,DESCRIPTION,DISPLAY_ORDER,EFFECTIVE_DATE,EXPIRY_DATE, EXPECTED) VALUES ('KH','Kindergarten Half','Kindergarten half-time, applicable only until 2012 (subgrade)',210,TIMESTAMP'2024-10-01 00:00:00.0',TIMESTAMP'2012-06-30 00:00:00.0', 'N');