Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r9f491bfb157944ee893c52fa819fad27de872f51 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java (.../GradebookConstants.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java (.../GradebookConstants.java) (revision 9f491bfb157944ee893c52fa819fad27de872f51) @@ -49,6 +49,7 @@ public static final String PARAM_VIEW = "view"; public static final String PARAM_START_DATE = "startDate"; public static final String PARAM_GROUP_ID = "groupId"; + public static final String PARAM_SEQUENCE = "sequence"; // Sort public static final String SORT_DESC = "desc"; Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r9f491bfb157944ee893c52fa819fad27de872f51 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java (.../GradebookUtil.java) (revision 9f491bfb157944ee893c52fa819fad27de872f51) @@ -20,7 +20,6 @@ * **************************************************************** */ - package org.lamsfoundation.lams.gradebook.util; import java.io.StringWriter; @@ -140,7 +139,7 @@ rowElement.setAttribute(CommonConstants.ELEMENT_ID, gridRow.getId().toString()); // Work out which grid we want to put the data into - ArrayList gridRowStringArray = new ArrayList(); + ArrayList gridRowStringArray = new ArrayList<>(); gridRowStringArray = gridRow.toStringArray(view); @@ -177,31 +176,34 @@ public static String niceFormatting(Double mark, boolean displayAsPercentage) { String markStr = new DecimalFormat("##0.00").format(mark); - if ( displayAsPercentage ) + if (displayAsPercentage) { markStr += "%"; + } return markStr; } public static ExcelCell createPercentageCell(Double mark, boolean markConversionNeeded) { - return createPercentageCell(mark, markConversionNeeded, false, 0); + return GradebookUtil.createPercentageCell(mark, markConversionNeeded, false, 0); } // public static ExcelCell createPercentageCell(Double mark, boolean markConversionNeeded, Boolean isBold) { // return createPercentageCell(mark, markConversionNeeded, isBold, 0); // } - + // if markConversionNeeded is true then mark is divided by 100. Otherwise assumes already a percentage. - public static ExcelCell createPercentageCell(Double mark, boolean markConversionNeeded, Boolean isBold, int borderStyle) { + public static ExcelCell createPercentageCell(Double mark, boolean markConversionNeeded, Boolean isBold, + int borderStyle) { Double convertedMark = null; - if ( mark != null ) + if (mark != null) { convertedMark = markConversionNeeded ? mark / 100.0 : mark; - + } + ExcelCell userMarkCell = new ExcelCell(convertedMark, isBold, borderStyle); userMarkCell.setIsPercentage(true); return userMarkCell; } - + private static Document getDocument() throws ParserConfigurationException { DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); DocumentBuilder builder = factory.newDocumentBuilder(); @@ -254,6 +256,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()); } @@ -287,7 +291,7 @@ @SuppressWarnings("unchecked") private static List doRowNameSearch(List gradebookRows, String searchField, String searchOper, String searchString) { - List ret = new ArrayList(); + List ret = new ArrayList<>(); if (searchField.equals(GradebookConstants.PARAM_ROW_NAME)) { Iterator it = gradebookRows.iterator(); Index: lams_gradebook/web/gradebookMonitor.jsp =================================================================== diff -u -r37e4336ccde76c85d841bd369623213dd741e51c -r9f491bfb157944ee893c52fa819fad27de872f51 --- lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 37e4336ccde76c85d841bd369623213dd741e51c) +++ lams_gradebook/web/gradebookMonitor.jsp (.../gradebookMonitor.jsp) (revision 9f491bfb157944ee893c52fa819fad27de872f51) @@ -195,6 +195,8 @@ pager: subgrid_table_id + "_pager", rowList:[10,20,30,40,50,100], rowNum:10, + sortorder: "asc", + sortname: "sequence", cellurl: "gradebook/gradebookMonitoring/updateUserActivityGradebookData.do?lessonID=${lessonDetails.lessonID}&view=monUserView&userID=" + userID, colNames: [ '', @@ -389,6 +391,8 @@ height: "100%", cmTemplate: { title: false }, cellEdit:false, + sortorder: "asc", + sortname: "sequence", pager: false, colNames: [ "", @@ -447,7 +451,7 @@ rowList:[10,20,30,40,50,100], rowNum:10, sortorder: "asc", - sortname: "activityId", + sortname: "sequence", colNames:[ '', '', @@ -618,6 +622,8 @@ autowidth:true, cellEdit:false, pager: false, + sortorder: "asc", + sortname: "sequence", colNames: [ "", "",