Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java =================================================================== diff -u -ra949c337adc53b2df9207aa1de6e500281de7c20 -r67e969ea1140cc5d811e298485cadf091af73b19 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java (.../GradebookGridRowDTO.java) (revision a949c337adc53b2df9207aa1de6e500281de7c20) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java (.../GradebookGridRowDTO.java) (revision 67e969ea1140cc5d811e298485cadf091af73b19) @@ -20,11 +20,9 @@ * **************************************************************** */ - package org.lamsfoundation.lams.gradebook.dto; import java.text.DateFormat; -import java.text.DecimalFormat; import java.util.ArrayList; import java.util.Date; @@ -69,9 +67,8 @@ protected String status; protected String feedback; - + protected boolean displayMarkAsPercent = false; - /** * A shared function to convert milliseconds into a readable string @@ -127,38 +124,6 @@ return null; } - protected String markToString() { - if (mark != null) { - String markStr = new DecimalFormat("##0.00").format(mark); - if (marksAvailable != null) { - return "" + markStr + "/" + marksAvailable.toString() + ""; - } else { - return markStr; - } - } else { - if (marksAvailable != null) { - return "" + CELL_EMPTY + "/" + marksAvailable.toString() + ""; - } else { - - } - return CELL_EMPTY; - - } - } - - protected String averageMarkToString() { - if (averageMark != null) { - String avgStr = new DecimalFormat("##0.00").format(averageMark); - if (marksAvailable != null) { - return avgStr + "/" + marksAvailable.toString(); - } else { - return avgStr; - } - } else { - return CELL_EMPTY; - } - } - protected String toItalic(String string) { return "" + string + ""; } @@ -250,7 +215,7 @@ public void setFeedback(String feedback) { this.feedback = feedback; } - + public Date getStartDate() { return startDate; } @@ -268,12 +233,11 @@ } public boolean getDisplayMarkAsPercent() { - return displayMarkAsPercent; - } + return displayMarkAsPercent; + } - public void setDisplayMarkAsPercent(boolean displayMarkAsPercent) { - this.displayMarkAsPercent = displayMarkAsPercent; - } + public void setDisplayMarkAsPercent(boolean displayMarkAsPercent) { + this.displayMarkAsPercent = displayMarkAsPercent; + } - }