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

Changes to capture number of attempts & rename column final percentage. #70

Merged
merged 1 commit into from
Nov 28, 2024
Merged

Changes to capture number of attempts & rename column final percentage. #70

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/eas/api/model/v1/AssessmentStudentEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ public class AssessmentStudentEntity {
@Column(name = "ASSESSMENT_STUDENT_STATUS_CODE", nullable = false, length = 20)
private String assessmentStudentStatusCode;

@Column(name = "NUMBER_OF_ATTEMPTS", length = 1)
private Integer numberOfAttempts;

@Column(name = "CREATE_USER", updatable = false , length = 100)
private String createUser;

Expand Down
7 changes: 5 additions & 2 deletions api/src/main/java/ca/bc/gov/educ/eas/api/model/v1/AssessmentStudentHistoryEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ public class AssessmentStudentHistoryEntity {
@Column(name = "IS_ELECTRONIC_EXAM", length = 1)
private Boolean isElectronicExam;

@Column(name = "FINAL_PERCENTAGE", length = 3)
private String finalPercentage;
@Column(name = "PROFICIENCY_SCORE", length = 1)
private Integer proficiencyScore;

@Column(name = "PROVINCIAL_SPECIAL_CASE_CODE", length = 1)
private String provincialSpecialCaseCode;
Expand All @@ -74,6 +74,9 @@ public class AssessmentStudentHistoryEntity {
@Column(name = "ASSESSMENT_STUDENT_STATUS_CODE", nullable = false, length = 20)
private String assessmentStudentStatusCode;

@Column(name = "NUMBER_OF_ATTEMPTS", length = 1)
private Integer numberOfAttempts;

@Column(name = "CREATE_USER", updatable = false, length = 100)
private String createUser;

Expand Down
2 changes: 2 additions & 0 deletions api/src/main/java/ca/bc/gov/educ/eas/api/struct/v1/AssessmentStudent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@ public class AssessmentStudent extends BaseRequest implements Serializable {
@Size(max = 1)
@IsAllowedValue(enumName = "CourseStatusCodes", message = "Invalid course status code.")
private String courseStatusCode;

private Integer numberOfAttempts;
}
3 changes: 0 additions & 3 deletions api/src/main/java/ca/bc/gov/educ/eas/api/struct/v1/AssessmentStudentListItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,4 @@ public class AssessmentStudentListItem extends AssessmentStudent {
@ReadOnlyProperty
private String courseYear;

@ReadOnlyProperty
private Integer numberOfAttempts;

}
8 changes: 8 additions & 0 deletions api/src/main/resources/db/migration/V1.14__EAS.API.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ALTER TABLE ASSESSMENT_STUDENT_HISTORY DROP COLUMN FINAL_PERCENTAGE;
ALTER TABLE ASSESSMENT_STUDENT_HISTORY ADD COLUMN PROFICIENCY_SCORE NUMERIC(1,0);

ALTER TABLE ASSESSMENT_STUDENT
ADD COLUMN NUMBER_OF_ATTEMPTS NUMERIC(1,0) NULL;

ALTER TABLE ASSESSMENT_STUDENT_HISTORY
ADD COLUMN NUMBER_OF_ATTEMPTS NUMERIC(1,0) NULL;
Loading