Index: lams_gradebook/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -raf839eeb85f37cf68092401ad23a4613ca7cd001 -r668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1 --- lams_gradebook/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision af839eeb85f37cf68092401ad23a4613ca7cd001) +++ lams_gradebook/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1) @@ -36,7 +36,6 @@ gradebook.columntitle.averageMark =Average mark gradebook.columntitle.learnerName =Name gradebook.columntitle.attempt =Attempt # -gradebook.columntitle.restart =Restart date gradebook.columntitle.lesson.mark =Lesson mark gradebook.function.window.showColumns =Show/Hide columns gradebook.function.error.enterNumber =Please enter a number value Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java =================================================================== diff -u -raf839eeb85f37cf68092401ad23a4613ca7cd001 -r668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java (.../GBActivityArchiveGridRowDTO.java) (revision af839eeb85f37cf68092401ad23a4613ca7cd001) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityArchiveGridRowDTO.java (.../GBActivityArchiveGridRowDTO.java) (revision 668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1) @@ -23,27 +23,23 @@ package org.lamsfoundation.lams.gradebook.dto; import java.util.ArrayList; -import java.util.Date; import org.lamsfoundation.lams.gradebook.util.GBGridView; import org.lamsfoundation.lams.gradebook.util.GradebookUtil; public class GBActivityArchiveGridRowDTO extends GradebookGridRowDTO { - private Date archiveDate; private Double lessonMark; - public GBActivityArchiveGridRowDTO(int attemptNumber, Date archiveDate, Double lessonMark) { + public GBActivityArchiveGridRowDTO(int attemptNumber, Double lessonMark) { this.id = String.valueOf(attemptNumber); - this.archiveDate = archiveDate; this.lessonMark = lessonMark; } @Override public ArrayList toStringArray(GBGridView view) { ArrayList ret = new ArrayList(); ret.add(id); - ret.add(archiveDate != null ? convertDateToString(archiveDate, null) : CELL_EMPTY); ret.add(lessonMark.toString()); ret.add(status); ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r3cff6b5be84fc9d559306f2d434ffaf92bdc8c7c -r668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 3cff6b5be84fc9d559306f2d434ffaf92bdc8c7c) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1) @@ -211,9 +211,7 @@ List activityArchives = gradebookDAO.getArchivedActivityMarks(activityId, userId); for (GradebookUserLessonArchive lessonArchive : lessonArchives) { Date archiveDate = lessonArchive.getArchiveDate(); - Date adjustedArchiveDate = userTimezone == null ? archiveDate - : DateUtil.convertToTimeZoneFromDefault(userTimezone, archiveDate); - GBActivityArchiveGridRowDTO activityDTO = new GBActivityArchiveGridRowDTO(attemptOrder, adjustedArchiveDate, + GBActivityArchiveGridRowDTO activityDTO = new GBActivityArchiveGridRowDTO(attemptOrder, lessonArchive.getMark()); for (GradebookUserActivityArchive activityArchive : activityArchives) { if (archiveDate.equals(activityArchive.getArchiveDate())) { Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r32838cef678034ccd8427f621e7228e65d5c4055 -r668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 32838cef678034ccd8427f621e7228e65d5c4055) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 668f1ed8de162a63b6d97ed22b86fa6e1bdd8cb1) @@ -327,7 +327,6 @@ pager: false, colNames: [ "", - "", "", "", "", @@ -337,9 +336,8 @@ "" ], colModel: [ - {name:'id', index:'id', sortable:false, editable: false ,width:40, align:"right"}, - {name:'restart',index:'restart', sortable:false, editable: false, width:60,align:"left"}, - {name:'lessonMark', index:'lessonMark', sortable:false, editable: false, width:50, align:"center" }, + {name:'id', index:'id', sortable:false, editable: false ,width:70, align:"right"}, + {name:'lessonMark', index:'lessonMark', sortable:false, editable: false, width:80, align:"center" }, {name:'status', index:'status', sortable:false, editable:false, width:50, align:"center"}, {name:'timeTaken',index:'timeTaken', sortable:false, editable: false, width:80, align:"center"}, {name:'startDate',index:'startDate', sortable:false, editable:false, search:false, width:85, align:"left"},