Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java =================================================================== diff -u -rea79f29aed5c764a223234e456442bc1e49fcf85 -r326536a361492c004c6747e17e096fd1dcff5254 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision ea79f29aed5c764a223234e456442bc1e49fcf85) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision 326536a361492c004c6747e17e096fd1dcff5254) @@ -75,9 +75,10 @@ ret.add(rowName); } ret.add(status); - ret.add((output != null) ? output.toString() : CELL_EMPTY); + ret.add(output != null ? output.toString() : CELL_EMPTY); ret.add(competences); - ret.add((timeTaken != null) ? convertTimeToString(timeTaken) : CELL_EMPTY); + ret.add(startDate != null ? convertDateToString(startDate, DEFAULT_DATE_FORMAT) : CELL_EMPTY); + ret.add(timeTaken != null ? convertTimeToString(timeTaken) : CELL_EMPTY); ret.add(feedback); ret.add(markToString()); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r1aed494b3b9aeb79f7837c12b15cd1330b3020fa -r326536a361492c004c6747e17e096fd1dcff5254 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 1aed494b3b9aeb79f7837c12b15cd1330b3020fa) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 326536a361492c004c6747e17e096fd1dcff5254) @@ -1067,6 +1067,7 @@ } // Setting status + gactivityDTO.setStartDate(getActivityStartDate(learnerProgress, activity)); gactivityDTO.setTimeTaken(getActivityDuration(learnerProgress, activity)); gactivityDTO.setStatus(getActivityStatusStr(learnerProgress, activity)); @@ -1100,14 +1101,6 @@ + activity.getTool().getLearnerProgressUrl() + "&userID=" + learner.getUserId() + "&toolSessionID=" + toolSession.getToolSessionId().toString()); gactivityDTO.setOutput(this.getToolOutputsStr(activity, toolSession, learner)); - - if (activityState == LearnerProgress.ACTIVITY_ATTEMPTED) { - gactivityDTO.setStartDate(learnerProgress.getAttemptedActivities().get(activity)); - } else { - if (learnerProgress.getCompletedActivities() != null && learnerProgress.getCompletedActivities().get(activity) != null) { - gactivityDTO.setStartDate(learnerProgress.getCompletedActivities().get(activity).getStartDate()); - } - } } } @@ -1126,7 +1119,9 @@ startDate = learnerProgress.getAttemptedActivities().get(activity); if (startDate == null) { CompletedActivityProgress compProg = learnerProgress.getCompletedActivities().get(activity); - startDate = compProg.getStartDate(); + if (compProg != null) { + startDate = compProg.getStartDate(); + } } } return startDate; Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r1aed494b3b9aeb79f7837c12b15cd1330b3020fa -r326536a361492c004c6747e17e096fd1dcff5254 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 1aed494b3b9aeb79f7837c12b15cd1330b3020fa) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 326536a361492c004c6747e17e096fd1dcff5254) @@ -133,7 +133,8 @@ "", "", "", - "", + "", + "", "", "", "" @@ -145,6 +146,7 @@ {name:'status', index:'status', sortable:false, editable:false, width:50, align:"center"}, {name:'output', index:'output', sortable:false, editable: false, width:200, hidden:true}, {name:'competences', index:'competences', sortable:false, editable: false, hidden:true}, + {name:'startDate', index:'startDate', sortable:true, editable: false, hidden:true, width:60, align:"center"}, {name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:80, align:"center"}, {name:'feedback', index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200, hidden:true}, {name:'mark', index:'mark', sortable:true, editable: true, editrules:{number:true}, width:50, align:"center" }