Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java =================================================================== diff -u -r7c8332d32bfb95927b393aa310c9cf214c6bc49b -r2ef2360b201af371fa415d8a4c3953fec1d38c57 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 7c8332d32bfb95927b393aa310c9cf214c6bc49b) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java (.../LearningController.java) (revision 2ef2360b201af371fa415d8a4c3953fec1d38c57) @@ -199,7 +199,8 @@ } } - storeItemsToSessionMap(toolSessionID, scratchie, sessionMap, mode.isTeacher()); + Collection items = storeItemsToSessionMap(toolSessionID, scratchie, sessionMap, + mode.isTeacher()); sessionMap.put(ScratchieConstants.ATTR_SCRATCHIE, scratchie); // calculate max score @@ -272,6 +273,15 @@ } } + if (mode.isTeacher()) { + scratchieService.populateScratchieItemsWithMarks(scratchie, items, toolSessionID); + // get updated score from ScratchieSession + int score = toolSession.getMark(); + request.setAttribute(ScratchieConstants.ATTR_SCORE, score); + int percentage = (maxScore == 0) ? 0 : ((score * 100) / maxScore); + request.setAttribute(ScratchieConstants.ATTR_SCORE_PERCENTAGE, percentage); + } + sessionMap.put(ScratchieConstants.ATTR_IS_SCRATCHING_FINISHED, isScratchingFinished); // make non-leaders wait for notebook to be submitted, if required sessionMap.put(ScratchieConstants.ATTR_IS_WAITING_FOR_LEADER_TO_SUBMIT_NOTEBOOK, Index: lams_tool_scratchie/web/includes/css/scratchie-learning.scss =================================================================== diff -u -r4f8d2a6c0dba8057f24e88b943099de10947985a -r2ef2360b201af371fa415d8a4c3953fec1d38c57 --- lams_tool_scratchie/web/includes/css/scratchie-learning.scss (.../scratchie-learning.scss) (revision 4f8d2a6c0dba8057f24e88b943099de10947985a) +++ lams_tool_scratchie/web/includes/css/scratchie-learning.scss (.../scratchie-learning.scss) (revision 2ef2360b201af371fa415d8a4c3953fec1d38c57) @@ -85,4 +85,8 @@ border: none; color:black; box-shadow:none; +} + +.item-score { + font-weight: bold; } \ No newline at end of file Index: lams_tool_scratchie/web/pages/learning/learning.jsp =================================================================== diff -u -r29ae6c439419f020f771d3cd37ffb714ffb577fa -r2ef2360b201af371fa415d8a4c3953fec1d38c57 --- lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 29ae6c439419f020f771d3cd37ffb714ffb577fa) +++ lams_tool_scratchie/web/pages/learning/learning.jsp (.../learning.jsp) (revision 2ef2360b201af371fa415d8a4c3953fec1d38c57) @@ -227,6 +227,17 @@ + +
+ + + ${score} + ${scorePercentage} + + +
+
+
Index: lams_tool_scratchie/web/pages/learning/scratchies.jsp =================================================================== diff -u -r7c8332d32bfb95927b393aa310c9cf214c6bc49b -r2ef2360b201af371fa415d8a4c3953fec1d38c57 --- lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 7c8332d32bfb95927b393aa310c9cf214c6bc49b) +++ lams_tool_scratchie/web/pages/learning/scratchies.jsp (.../scratchies.jsp) (revision 2ef2360b201af371fa415d8a4c3953fec1d38c57) @@ -83,11 +83,13 @@ + + +

+  ${item.mark} +

+
-

-  ${item.mark} -

- <%-- show burning questions --%>