Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re044a561b88b3eb68dc50846451a30d258108e0f -r943ef2ac69e4ce13ac802a4264ed9bb6864507f0 --- lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e044a561b88b3eb68dc50846451a30d258108e0f) +++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 943ef2ac69e4ce13ac802a4264ed9bb6864507f0) @@ -54,10 +54,10 @@ label.learning.not.available =Not Available label.monitoring.summary.learner =Learner label.monitoring.summary.marked =Marked? -label.monitoring.summary.lock.when.finished =Lock when finished: {0} -label.monitoring.summary.individual.spreadsheets =Learners are allowed to submit individual spreadsheets: {0} -label.monitoring.summary.marking.enabled =Spreadsheet marking is enabled: {0} -label.monitoring.summary.notebook.reflection =Notebook Reflection: {0} +label.monitoring.summary.lock.when.finished =Lock when finished +label.monitoring.summary.individual.spreadsheets =Learners are allowed to submit individual spreadsheets +label.monitoring.summary.marking.enabled =Spreadsheet marking is enabled +label.monitoring.summary.notebook.reflection =Notebook Reflection label.monitoring.summary.overall.summary =Overall Summary label.monitoring.summary.confirm.completion =Confirm Completion label.monitoring.summary.title.reflection =Notebook Entry @@ -167,7 +167,7 @@ label.authoring.save.button =Save monitoring.label.access.time =Access time label.authoring.advance.lock.on.finished =Lock when finished -label.authoring.heading.advance =Advanced +label.authoring.heading.advance =Advanced Settings message.step.of =Step {0} of {1} label.up =Move Up label.down =Move down Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java =================================================================== diff -u -re044a561b88b3eb68dc50846451a30d258108e0f -r943ef2ac69e4ce13ac802a4264ed9bb6864507f0 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision e044a561b88b3eb68dc50846451a30d258108e0f) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 943ef2ac69e4ce13ac802a4264ed9bb6864507f0) @@ -333,41 +333,7 @@ public ActionForward saveMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { MarkForm markForm = (MarkForm)form; - -// ActionMessages errors = new ActionMessages(); -// //check whether the mark is validate -// String markStr = request.getParameter("marks"); -// Long marks = null; -// try { -// marks = Long.parseLong(markStr); -// } catch (Exception e) { -// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.mark.invalid.number")); -// } -// -// String comments = WebUtil.readStrParam(request,"comments",true); -// if(!errors.isEmpty()){ -// submitFilesService = getSubmitFilesService(); -// List report = new ArrayList(); -// FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID); -// //echo back the input, even they are wrong. -// fileDetail.setComments(comments); -// fileDetail.setMarks(markStr); -// report.add(fileDetail); -// -// request.setAttribute("report",report); -// request.setAttribute("updateMode", updateMode); -// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID); -// -// -// saveErrors(request,errors); -// return mapping.findForward("updateMark"); -// } - - - - ActionErrors errors = validateSpreadsheetMark(markForm); - if(!errors.isEmpty()){ this.addErrors(request,errors); return mapping.findForward("editMark"); Index: lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp =================================================================== diff -u -r56d116683b7554e8ad3677cd0e12866ac3feb834 -r943ef2ac69e4ce13ac802a4264ed9bb6864507f0 --- lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp (.../summarylist.jsp) (revision 56d116683b7554e8ad3677cd0e12866ac3feb834) +++ lams_tool_spreadsheet/web/pages/monitoring/parts/summarylist.jsp (.../summarylist.jsp) (revision 943ef2ac69e4ce13ac802a4264ed9bb6864507f0) @@ -146,7 +146,7 @@ <%-- This script will works when a new resoruce Condition submit in order to refresh "TaskList List" panel. --%> - + -

-<%-- Overall TaskList information --%> -
+

- - - - - - - - - - -
+ - - - - - - - - - - -
- - - - - - - - - - - -
- - - - - - - - - - - + + + +

+
+ +<%-- Overall TaskList information --%> + <%-- Summary list --%>