Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java,v
diff -u -r1.2 -r1.3
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java 15 Apr 2009 05:48:34 -0000 1.2
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java 15 Apr 2009 07:42:51 -0000 1.3
@@ -24,6 +24,7 @@
package org.lamsfoundation.lams.gradebook.dto;
import java.util.ArrayList;
+import java.util.Date;
import org.lamsfoundation.lams.gradebook.util.GBGridView;
@@ -41,6 +42,7 @@
String activityUrl;
//double timeTaken;
String feedback;
+ Date startDate;
// Properties for activity view
String monitorUrl;
@@ -139,5 +141,13 @@
public void setMonitorUrl(String monitorUrl) {
this.monitorUrl = monitorUrl;
+ }
+
+ public Date getStartDate() {
+ return startDate;
+ }
+
+ public void setStartDate(Date startDate) {
+ this.startDate = startDate;
}
}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBStartDateComparator.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.4 -r1.5
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 15 Apr 2009 05:48:34 -0000 1.4
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java 15 Apr 2009 07:42:51 -0000 1.5
@@ -557,6 +557,12 @@
+ 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 {
+ gactivityDTO.setStartDate(learnerProgress.getCompletedActivities().get(activity).getStartDate());
+ }
}
}
@@ -665,7 +671,6 @@
}
}
toolOutputsStr += "";
-
}
}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java,v
diff -u -r1.1 -r1.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java 9 Apr 2009 04:55:55 -0000 1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java 15 Apr 2009 07:42:51 -0000 1.2
@@ -52,6 +52,7 @@
public static final String PARAM_AVG_TIME_TAKEN = "avgTimeTaken";
public static final String PARAM_AVG_MARK = "avgMark";
public static final String PARAM_VIEW = "view";
+ public static final String PARAM_START_DATE = "startDate";
// Sort
public static final String SORT_DESC = "desc";
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java,v
diff -u -r1.1 -r1.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java 9 Apr 2009 04:55:55 -0000 1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java 15 Apr 2009 07:42:51 -0000 1.2
@@ -45,6 +45,7 @@
import org.lamsfoundation.lams.gradebook.dto.comparators.GBIDComparator;
import org.lamsfoundation.lams.gradebook.dto.comparators.GBMarkComparator;
import org.lamsfoundation.lams.gradebook.dto.comparators.GBRowNameComparator;
+import org.lamsfoundation.lams.gradebook.dto.comparators.GBStartDateComparator;
import org.lamsfoundation.lams.gradebook.dto.comparators.GBTimeTakenComparator;
import org.lamsfoundation.lams.util.WebUtil;
import org.w3c.dom.Document;
@@ -212,6 +213,8 @@
Collections.sort(gridRows, new GBAverageTimeTakenComparator());
} else if (sortBy.equals(GradebookConstants.PARAM_AVG_MARK)) {
Collections.sort(gridRows, new GBAverageMarkComparator());
+ } else if (sortBy.equals(GradebookConstants.PARAM_START_DATE)) {
+ Collections.sort(gridRows, new GBStartDateComparator());
} else {
Collections.sort(gridRows, new GBRowNameComparator());
}
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java,v
diff -u -r1.1 -r1.2
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java 9 Apr 2009 04:55:56 -0000 1.1
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java 15 Apr 2009 07:42:51 -0000 1.2
@@ -155,8 +155,8 @@
gradebookActivityDTOs = gradebookService.getGBActivityRowsForLesson(lesson);
}
- if (sortBy == null) {
- sortBy = GradebookConstants.PARAM_ID;
+ if (sortBy == null || sortBy.equals("")) {
+ sortBy = GradebookConstants.PARAM_START_DATE;
}
String ret = GradebookUtil.toGridXML(gradebookActivityDTOs, view, sortBy, isSearch, searchField,
Index: lams_gradebook/web/gradebookCourseLearner.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookCourseLearner.jsp,v
diff -u -r1.3 -r1.4
--- lams_gradebook/web/gradebookCourseLearner.jsp 15 Apr 2009 05:48:34 -0000 1.3
+++ lams_gradebook/web/gradebookCourseLearner.jsp 15 Apr 2009 07:42:51 -0000 1.4
@@ -71,7 +71,6 @@
url: "/gradebook/gradebook.do?dispatch=getActivityGridData&view=lrnActivity&lessonID=" + lessonID,
height: "100%",
width: 550,
- sortname: "id",
imgpath: 'includes/javascript/jqgrid/themes/basic/images',
pager: subgrid_table_id + "_pager",
rowList:[5,10,20,30],
Index: lams_gradebook/web/gradebookMonitor.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/gradebookMonitor.jsp,v
diff -u -r1.2 -r1.3
--- lams_gradebook/web/gradebookMonitor.jsp 14 Apr 2009 05:04:59 -0000 1.2
+++ lams_gradebook/web/gradebookMonitor.jsp 15 Apr 2009 07:42:51 -0000 1.3
@@ -64,7 +64,6 @@
height: "100%",
width: 650,
cellEdit:true,
- sortname: "id",
imgpath: 'includes/javascript/jqgrid/themes/basic/images',
pager: subgrid_table_id + "_pager",
rowList:[5,10,20,30],