Index: lams_central/web/gradebook/gradeBookCourseMonitor.jsp =================================================================== diff -u -r2ae6299d000baa190344632f261958349730b440 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_central/web/gradebook/gradeBookCourseMonitor.jsp (.../gradeBookCourseMonitor.jsp) (revision 2ae6299d000baa190344632f261958349730b440) +++ lams_central/web/gradebook/gradeBookCourseMonitor.jsp (.../gradeBookCourseMonitor.jsp) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -48,7 +48,7 @@ subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { var subgrid_table_id; - var lessonID = jQuery("#organisationGrid").getRowData(row_id)["lessonID"]; + var lessonID = jQuery("#organisationGrid").getRowData(row_id)["id"]; subgrid_table_id = subgrid_id+"_t"; jQuery("#"+subgrid_id).html("
"); jQuery("#"+subgrid_table_id).jqGrid({ Index: lams_central/web/gradebook/gradeBookMonitor.jsp =================================================================== diff -u -r2ae6299d000baa190344632f261958349730b440 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_central/web/gradebook/gradeBookMonitor.jsp (.../gradeBookMonitor.jsp) (revision 2ae6299d000baa190344632f261958349730b440) +++ lams_central/web/gradebook/gradeBookMonitor.jsp (.../gradeBookMonitor.jsp) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -51,12 +51,12 @@ subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { var subgrid_table_id; - var userName = jQuery("#userView").getRowData(row_id)["login"]; + var userID = jQuery("#userView").getRowData(row_id)["id"]; subgrid_table_id = subgrid_id+"_t"; jQuery("#"+subgrid_id).html("
"); jQuery("#"+subgrid_table_id).jqGrid({ datatype: "xml", - url: "/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userName, + url: "/gradebook/gradebook.do?dispatch=getActivityGridData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userID, height: "100%", width: 920, cellEdit:true, @@ -65,7 +65,7 @@ pager: subgrid_table_id + "_pager", rowList:[5,10,20,30], rowNum:10, - cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userName, + cellurl: "/gradebook/gradebookMonitoring.do?dispatch=updateUserActivityGradeBookData&lessonID=${lessonDetails.lessonID}&method=userView&login=" + userID, colNames: ['Id','Activity','Progress','Outputs', 'Competences', 'Time Taken', 'Activity FeedBack', 'Mark'], colModel: [ {name:'id', width:10, index:'id', sortable:false, hidden:true, hidedlg:true}, @@ -173,7 +173,7 @@ subGrid: true, subGridRowExpanded: function(subgrid_id, row_id) { var subgrid_table_id; - var activityID = jQuery("#activityView").getRowData(row_id)["activityId"]; + var activityID = jQuery("#activityView").getRowData(row_id)["id"]; subgrid_table_id = subgrid_id+"_t"; jQuery("#"+subgrid_id).html("
"); jQuery("#"+subgrid_table_id).jqGrid({ Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradeBookUserActivity.java =================================================================== diff -u -r7895606feec6effedc08860e4e1bb7f5157109c5 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradeBookUserActivity.java (.../GradeBookUserActivity.java) (revision 7895606feec6effedc08860e4e1bb7f5157109c5) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradeBookUserActivity.java (.../GradeBookUserActivity.java) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -23,7 +23,6 @@ /* $Id$ */ package org.lamsfoundation.lams.gradebook; -import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.usermanagement.User; Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java =================================================================== diff -u -rfc2b6751efa103ff475378442632b752c01c2736 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision fc2b6751efa103ff475378442632b752c01c2736) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java (.../GBActivityGridRowDTO.java) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -29,9 +29,7 @@ public static final String VIEW_USER = "userView"; public static final String VIEW_ACTIVITY = "activityView"; - - long activityId; - String activityTitle; + String competences; //String toolString; @@ -40,12 +38,9 @@ String output; String activityUrl; //double timeTaken; - Double mark; String feedback; - Long timeTaken; // Properties for activity view - Double average; String monitorUrl; public GBActivityGridRowDTO() { @@ -54,14 +49,14 @@ @Override public ArrayList toStringArray(String view) { ArrayList ret = new ArrayList(); - ret.add("" + activityId); + ret.add(id.toString()); if (view.equals(VIEW_USER)) { if (activityUrl != null && activityUrl.length() != 0) { - ret.add("" - + activityTitle + ""); + ret.add("" + + rowName + ""); } else { - ret.add(activityTitle); + ret.add(rowName); } ret.add(status); ret.add(output); @@ -83,48 +78,23 @@ } else if (view.equals(VIEW_ACTIVITY)) { if (monitorUrl != null && monitorUrl.length() != 0) { - ret.add("" - + activityTitle + ""); + ret.add("" + + rowName + ""); } else { - ret.add(activityTitle); + ret.add(rowName); } ret.add(competences); - if (average != null) { - ret.add(average.toString()); + if (mark != null) { + ret.add(mark.toString()); } else { ret.add("-"); } } return ret; } - @Override - public String getRowId() { - return "" + activityId; - } - - public int getId() { - return new Long(activityId).intValue(); - } - - public long getActivityId() { - return activityId; - } - - public void setActivityId(long activityId) { - this.activityId = activityId; - } - - public String getActivityTitle() { - return activityTitle; - } - - public void setActivityTitle(String activityTitle) { - this.activityTitle = activityTitle; - } - public String getStatus() { return status; } @@ -141,14 +111,6 @@ this.output = output; } - public Double getMark() { - return mark; - } - - public void setMark(Double mark) { - this.mark = mark; - } - public String getCompetences() { return competences; } @@ -173,29 +135,11 @@ this.feedback = feedback; } - public Double getAverage() { - return average; - } - - public void setAverage(Double average) { - this.average = average; - } - public String getMonitorUrl() { return monitorUrl; } public void setMonitorUrl(String monitorUrl) { this.monitorUrl = monitorUrl; - } - - public Long getTimeTaken() { - return timeTaken; - } - - public void setTimeTaken(Long timeTaken) { - this.timeTaken = timeTaken; - } - - + } } Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java =================================================================== diff -u -rfc2b6751efa103ff475378442632b752c01c2736 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java (.../GBLessonGridRowDTO.java) (revision fc2b6751efa103ff475378442632b752c01c2736) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java (.../GBLessonGridRowDTO.java) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -30,13 +30,9 @@ public static final String VIEW_MONITOR = "monitorView"; public static final String VIEW_LEARNER = "learnerView"; - Long lessonId; - String lessonName; String lessonDescription; - Double mark; String subGroup; String startDate; - Long averageTime; // Only for monitor view String gradeBookMonitorURL; @@ -49,29 +45,23 @@ } @Override - public String getRowId() { - // TODO Auto-generated method stub - return null; - } - - @Override public ArrayList toStringArray(String view) { ArrayList ret = new ArrayList(); - ret.add(lessonId.toString()); + ret.add(id.toString()); if (view.equals(VIEW_MONITOR)) { if (gradeBookMonitorURL != null && gradeBookMonitorURL.length() != 0) { - ret.add("" + lessonName + ret.add("" + rowName + ""); } else { - ret.add(lessonName); + ret.add(rowName); } ret.add(subGroup); ret.add(startDate); - if (averageTime != null) { - ret.add(convertTimeToString(averageTime)); + if (timeTaken != null) { + ret.add(convertTimeToString(timeTaken)); } else { ret.add("-"); } @@ -84,10 +74,10 @@ } } else if (view.equals(VIEW_LEARNER)) { if (gradeBookLearnerURL != null && gradeBookLearnerURL.length() != 0) { - ret.add("" + lessonName + ret.add("" + rowName + ""); } else { - ret.add(lessonName); + ret.add(rowName); } ret.add(lessonDescription); if (mark != null) { @@ -99,20 +89,12 @@ return ret; } - public Long getLessonId() { - return lessonId; - } - - public void setLessonId(Long lessonId) { - this.lessonId = lessonId; - } - public String getLessonName() { - return lessonName; + return rowName; } - public void setLessonName(String lessonName) { - this.lessonName = lessonName; + public void setLessonName(String rowName) { + this.rowName = rowName; } public String getLessonDescription() { @@ -123,14 +105,6 @@ this.lessonDescription = lessonDescription; } - public Double getMark() { - return mark; - } - - public void setMark(Double mark) { - this.mark = mark; - } - public String getGradeBookMonitorURL() { return gradeBookMonitorURL; } @@ -162,14 +136,5 @@ public void setStartDate(String startDate) { this.startDate = startDate; } - - public Long getAverageTime() { - return averageTime; - } - - public void setAverageTime(Long averageTime) { - this.averageTime = averageTime; - } - } Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java =================================================================== diff -u -rfc2b6751efa103ff475378442632b752c01c2736 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java (.../GBUserGridRowDTO.java) (revision fc2b6751efa103ff475378442632b752c01c2736) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java (.../GBUserGridRowDTO.java) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -31,20 +31,9 @@ public static final String VIEW_ACTIVITY = "activityView"; public static final String VIEW_COURSE_MONITOR = "courseMonitorView"; - String login; - String firstName; - String lastName; String status; String feedback; - // For user view, this represents total lesson mark in the grid - // For activity view, this represents an activity mark - Double mark; - - // For user view and courseMonitor view, this represents the time taken for a lesson - // For activity view this represents time taken for an activity - Long timeTaken; - // For activity view String output; String activityUrl; @@ -57,11 +46,10 @@ public ArrayList toStringArray(String view) { ArrayList ret = new ArrayList(); - String fullName = lastName + " " + firstName; - ret.add(login); + ret.add(id.toString()); if (view.equals(VIEW_USER)) { - ret.add(fullName); + ret.add(rowName); ret.add(status); if (timeTaken != null) { ret.add(convertTimeToString(timeTaken)); @@ -71,17 +59,17 @@ ret.add(feedback); } else if (view.equals(VIEW_ACTIVITY)) { if (activityUrl != null && activityUrl.length() != 0) { - ret.add("" + fullName + ret.add("" + rowName + ""); } else { - ret.add(fullName); + ret.add(rowName); } ret.add(status); ret.add(output); ret.add(feedback); } else if (view.equals(VIEW_COURSE_MONITOR)){ - ret.add(fullName); + ret.add(rowName); ret.add(status); if (timeTaken != null) { ret.add(convertTimeToString(timeTaken)); @@ -100,43 +88,6 @@ return ret; } - @Override - public String getRowId() { - return login; - } - - public Double getMark() { - return mark; - } - - public void setMark(Double mark) { - this.mark = mark; - } - - public String getLogin() { - return login; - } - - public void setLogin(String login) { - this.login = login; - } - - public String getFirstName() { - return firstName; - } - - public void setFirstName(String firstName) { - this.firstName = firstName; - } - - public String getLastName() { - return lastName; - } - - public void setLastName(String lastName) { - this.lastName = lastName; - } - public String getStatus() { return status; } @@ -169,11 +120,4 @@ this.activityUrl = activityUrl; } - public Long getTimeTaken() { - return timeTaken; - } - - public void setTimeTaken(Long timeTaken) { - this.timeTaken = timeTaken; - } } Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java =================================================================== diff -u -rfc2b6751efa103ff475378442632b752c01c2736 -r0e1f26c5dd0feb65f9387191c66811c4ca8aa584 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java (.../GradeBookGridRowDTO.java) (revision fc2b6751efa103ff475378442632b752c01c2736) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java (.../GradeBookGridRowDTO.java) (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -29,7 +29,19 @@ public abstract ArrayList toStringArray(String view); - public abstract String getRowId(); + // The id for a row, might be activityId, userId, lessonID etc + public Long id; + + // The name for the row, every gradebook row has some sort of name + // Be it the user's name, the activity name, the lesson name etc + public String rowName; + + // A unit of time in milliseconds that determines the time taken for the corressponding task + // Be it a lesson or an activity + public Long timeTaken; + + // The mark for the corresponding gradebook grid row task + public Double mark; /** * A shared function to convert milliseconds into a readable string @@ -59,5 +71,37 @@ return null; } } + + public Long getTimeTaken() { + return timeTaken; + } + + public void setTimeTaken(Long timeTaken) { + this.timeTaken = timeTaken; + } + + public Double getMark() { + return mark; + } + + public void setMark(Double mark) { + this.mark = mark; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getRowName() { + return rowName; + } + + public void setRowName(String rowName) { + this.rowName = rowName; + } } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBIDComparator.java (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -0,0 +1,49 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.gradebook.dto.comparators; + +import java.util.Comparator; + +import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO; + +@SuppressWarnings("unchecked") +public class GBIDComparator implements Comparator{ + public int compare(Object gradeBookRow, Object anotherGradeBookRow) { + + if (gradeBookRow instanceof GradeBookGridRowDTO && anotherGradeBookRow instanceof GradeBookGridRowDTO) { + + Long id1 = ((GradeBookGridRowDTO) gradeBookRow).getId(); + Long id2 = ((GradeBookGridRowDTO) anotherGradeBookRow).getId(); + + if (id1 == null || id2 == null) { + return 0; + } + Long ret = id1 - id2; + return ret.intValue(); + } else { + return 0; + } + } +} + \ No newline at end of file Fisheye: Tag 0e1f26c5dd0feb65f9387191c66811c4ca8aa584 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonIDComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0e1f26c5dd0feb65f9387191c66811c4ca8aa584 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonMarkComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0e1f26c5dd0feb65f9387191c66811c4ca8aa584 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBLessonNameComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBMarkComparator.java (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -0,0 +1,47 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.gradebook.dto.comparators; + +import java.util.Comparator; + +import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO; + +@SuppressWarnings("unchecked") +public class GBMarkComparator implements Comparator { + + public int compare(Object gradeBookGridRow, Object anotherGradeBookGridRow) { + + if (gradeBookGridRow instanceof GradeBookGridRowDTO && anotherGradeBookGridRow instanceof GradeBookGridRowDTO) { + + Double mark1 = ((GradeBookGridRowDTO) gradeBookGridRow).getMark(); + Double mark2 = ((GradeBookGridRowDTO) anotherGradeBookGridRow).getMark(); + + mark1 = (mark1 == null) ? 0.0 : mark1; + mark2 = (mark2 == null) ? 0.0 : mark2; + return new Double(mark1 - mark2).intValue(); + } else { + return 0; + } + } +} Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBRowNameComparator.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBRowNameComparator.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBRowNameComparator.java (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -0,0 +1,44 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.gradebook.dto.comparators; + +import java.util.Comparator; + +import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO; + +@SuppressWarnings("unchecked") +public class GBRowNameComparator implements Comparator { + + public int compare(Object gradeBookGridRow, Object anotherGradeBookGridRow) { + if (gradeBookGridRow instanceof GradeBookGridRowDTO && anotherGradeBookGridRow instanceof GradeBookGridRowDTO) { + String name1 = ((GradeBookGridRowDTO) gradeBookGridRow).getRowName().toLowerCase(); + String name2 = ((GradeBookGridRowDTO) anotherGradeBookGridRow).getRowName().toLowerCase(); + int ret = name1.compareTo(name2); + return ret; + } else { + return 0; + } + } +} + \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBTimeTakenComparator.java (revision 0e1f26c5dd0feb65f9387191c66811c4ca8aa584) @@ -0,0 +1,47 @@ +/**************************************************************** + * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.gradebook.dto.comparators; + +import java.util.Comparator; + +import org.lamsfoundation.lams.gradebook.dto.GradeBookGridRowDTO; + +@SuppressWarnings("unchecked") +public class GBTimeTakenComparator implements Comparator{ + public int compare(Object gradeBookGridRow, Object anotherGradeBookGridRow) { + + if (gradeBookGridRow instanceof GradeBookGridRowDTO && anotherGradeBookGridRow instanceof GradeBookGridRowDTO) { + + Long timeTaken1 = ((GradeBookGridRowDTO) gradeBookGridRow).getTimeTaken(); + Long timeTaken2 = ((GradeBookGridRowDTO) anotherGradeBookGridRow).getTimeTaken(); + + timeTaken1 = (timeTaken1 == null) ? 0 : timeTaken1; + timeTaken2 = (timeTaken2 == null) ? 0 : timeTaken2; + return new Double(timeTaken1 - timeTaken2).intValue(); + } else { + return 0; + } + } +} + \ No newline at end of file Fisheye: Tag 0e1f26c5dd0feb65f9387191c66811c4ca8aa584 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserFullNameComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0e1f26c5dd0feb65f9387191c66811c4ca8aa584 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/gradebook/dto/comparators/GBUserMarkComparator.java'. Fisheye: No comparison available. Pass `N' to diff?