Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -red8e4fb944665c1f48832c59b95944c5b5875a78 -rd14e2d06385a0962178b89f4d5b8ac51e46e62f2 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision ed8e4fb944665c1f48832c59b95944c5b5875a78) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision d14e2d06385a0962178b89f4d5b8ac51e46e62f2) @@ -1405,8 +1405,12 @@ } row.addCell(getMessage("label.total"), true); row.addCell(getMessage("label.total") + " %", true); + row.addCell(getMessage("label.marks"), true); + row.addCell(getMessage("label.marks") + " %", true); List summaryByTeam = getSummaryByTeam(scratchie, items); + int maxPossibleScore = getMaxPossibleScore(scratchie); + for (GroupSummary summary : summaryByTeam) { row = immediateAnalysisSheet.initRow(); @@ -1435,6 +1439,10 @@ row.addCell(Integer.valueOf(numberOfFirstChoiceEvents)); double percentage = (numberOfItems == 0) ? 0 : (double) numberOfFirstChoiceEvents / numberOfItems; row.addPercentageCell(percentage); + + row.addCell(summary.getMark()); + percentage = (numberOfItems == 0) ? 0 : (double) summary.getMark() / maxPossibleScore; + row.addPercentageCell(percentage); } // ======================================================= For Report by Team TRA page @@ -1487,6 +1495,8 @@ } row.addCell(getMessage("label.total")); row.addCell(getMessage("label.total") + " %"); + row.addCell(getMessage("label.marks")); + row.addCell(getMessage("label.marks") + " %"); row = reportByTeamSheet.initRow(); row.addCell(getMessage("label.correct.answer")); @@ -1521,12 +1531,16 @@ percentages[groupCount - 1] = percentage; groupCount++; + + row.addCell(summary.getMark()); + percentage = (numberOfItems == 0) ? 0 : (double) summary.getMark() / maxPossibleScore; + row.addPercentageCell(percentage); } Arrays.sort(percentages); // avg mean - int sum = 0; + double sum = 0; for (int i = 0; i < percentages.length; i++) { sum += percentages[i]; } @@ -1548,7 +1562,7 @@ row = reportByTeamSheet.initRow(); row.addCell(getMessage("label.median")); row.addEmptyCells(numberOfItems + 1); - row.addCell(median); + row.addPercentageCell(median); row = reportByTeamSheet.initRow(); row.addCell(getMessage("label.legend"));