SAK-40948 Set timestamp each time course grade is overridden

Change checkbox label and csv header to better indicate a course grade override.
chundcm · Dec 11, 2018 · a20bf15 · a20bf15
1 parent fa5e390
commit a20bf15
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java b/...ice/impl/src/java/org/sakaiproject/component/gradebook/GradebookServiceHibernateImpl.java
@@ -3451,7 +3451,6 @@ public Object doInHibernate(final Session session) throws HibernateException {
 
 			courseGradeRecord = new CourseGradeRecord(courseGrade, studentUuid);
 			courseGradeRecord.setGraderId(getUserUid());
-			courseGradeRecord.setDateRecorded(new Date());
 
 		} else {
 			// if passed in grade override is same as existing grade override, nothing to do
@@ -3462,6 +3461,8 @@ public Object doInHibernate(final Session session) throws HibernateException {
 
 		// set the grade override
 		courseGradeRecord.setEnteredGrade(grade);
+		// record the last grade override date
+		courseGradeRecord.setDateRecorded(new Date());
 
 		// create a grading event
 		final GradingEvent gradingEvent = new GradingEvent();

diff --git a/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties b/gradebookng/tool/src/java/org/sakaiproject/gradebookng/GradebookNgApplication.properties
@@ -317,7 +317,7 @@ importExport.export.advancedOption.exportFormat = Export File Format
 importExport.export.advancedOption.includeStudentName = Student Name
 importExport.export.advancedOption.includeStudentNumber = Student Number
 importExport.export.advancedOption.includePoints = Total Points
-importExport.export.advancedOption.includeLastLogDate = Last Log Date
+importExport.export.advancedOption.includeLastLogDate = Course Grade Override Date
 importExport.export.advancedOption.includeCourseGrade = Course Grade
 importExport.export.advancedOption.includeStudentId = Student ID
 importExport.export.advancedOption.includeStudentDisplayId = Student Display ID
@@ -333,7 +333,7 @@ importExport.export.csv.headers.points = Total Points
 importExport.export.csv.headers.courseGrade = Course Grade
 importExport.export.csv.headers.calculatedGrade = Calculated Grade
 importExport.export.csv.headers.gradeOverride = Grade Override
-importExport.export.csv.headers.lastLogDate = Last Log Date
+importExport.export.csv.headers.lastLogDate = Course Grade Override Date
 importExport.export.csv.headers.example.points = Example Assignment With Points
 importExport.export.csv.headers.example.nopoints = Example Assignment With No Points
 importExport.export.csv.headers.example.pointscomments = Example Assignment With Points And Comments