Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
===================================================================
diff -u -rbfa7dfb5557d54767b137652b34dd89c13fb1227 -rc81694871bdf781b0dcaae89d78778857feed346
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision bfa7dfb5557d54767b137652b34dd89c13fb1227)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision c81694871bdf781b0dcaae89d78778857feed346)
@@ -137,8 +137,8 @@
ret.add(rowName);
}
ret.add(status);
- ret.add(timeTaken != null ? DateUtil.convertTimeToString(timeTaken) : CELL_EMPTY);
ret.add(startDate != null ? DateUtil.convertToString(startDate, null) : CELL_EMPTY);
+ ret.add(timeTaken != null ? DateUtil.convertTimeToString(timeTaken) : CELL_EMPTY);
ret.add(finishDate != null ? DateUtil.convertToString(finishDate, null) : CELL_EMPTY);
ret.add(feedback);
ret.add(outcomes != null ? outcomes : CELL_EMPTY);
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java
===================================================================
diff -u -ra9f95a26e562a58b55c99f2c18e253c151ef457a -rc81694871bdf781b0dcaae89d78778857feed346
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision a9f95a26e562a58b55c99f2c18e253c151ef457a)
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision c81694871bdf781b0dcaae89d78778857feed346)
@@ -204,6 +204,8 @@
Collections.sort(gridRows, new GBAverageMarkComparator());
} else if (sortBy.equals(GradebookConstants.PARAM_START_DATE)) {
Collections.sort(gridRows, new GBStartDateComparator());
+ } else if (sortBy.equals(GradebookConstants.PARAM_SEQUENCE)) {
+ // do not sort at all
} else {
Collections.sort(gridRows, new GBRowNameComparator());
}
Index: lams_gradebook/web/gradebookMonitorContent.jsp
===================================================================
diff -u -r35dd47046a83ab2f9e80f76dc22d1521412219b5 -rc81694871bdf781b0dcaae89d78778857feed346
--- lams_gradebook/web/gradebookMonitorContent.jsp (.../gradebookMonitorContent.jsp) (revision 35dd47046a83ab2f9e80f76dc22d1521412219b5)
+++ lams_gradebook/web/gradebookMonitorContent.jsp (.../gradebookMonitorContent.jsp) (revision c81694871bdf781b0dcaae89d78778857feed346)
@@ -179,8 +179,8 @@
'',
"",
"",
- "",
"",
+ "",
"",
"",
"",
@@ -189,16 +189,16 @@
colModel: [
{name:'id', index:'id', sortable:false, hidden:true, hidedlg:true},
{name:'marksAvailable',index:'marksAvailable', sortable:false, editable:false, hidden:true, search:false, hidedlg:true},
- {name:'rowName', index:'rowName', sortable:false, editable: false, width: 140},
+ {name:'rowName', index:'rowName', sortable:true, editable: false, width: 181},
{name:'status', index:'status', sortable:false, editable:false, width:30, align:"center"},
+ {name:'startDate',index:'startDate', width:0, hidden: false, align:"center", width:50},
{name:'timeTaken',index:'timeTaken', sortable:true, editable: false, width:51, title : true, align:"center",
cellattr: function(rowID, val, rawObject, cm, rdata) {
if (rdata.startDate != "-") {
return 'title="' + rdata.startDate + ' - ' + rdata.finishDate + '"';
}
}
},
- {name:'startDate',index:'startDate', width:0, hidden: true},
{name:'finishDate',index:'finishDate', width:0, hidden: true},
{name:'feedback', index:'feedback', sortable:false, editable: true, edittype:'textarea', editoptions:{rows:'4',cols:'20'}, width:200, hidden:true},
{name:'outcome', index:'outcome', sortable:false, editable: false,