Index: lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -re9f3814b6b6ca31db204710d2eed84d6339807da -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e9f3814b6b6ca31db204710d2eed84d6339807da) +++ lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -272,6 +272,11 @@ label.authoring.basic.import.questions =Import questions label.authoring.basic.export.questions =Export questions label.authoring.advance.display.summary =Display all questions and answers once the student finishes. +advanced.reflectOnActivity =Add Notebook at end of Assessment with the following instructions: +monitor.summary.td.addNotebook =Add Notebook at end of Assessment +monitor.summary.td.notebookInstructions =Notebook instructions +label.export.reflection =Notebook Entries +label.continue =Continue +label.edit =Edit - #======= End labels: Exported 266 labels for en AU ===== Index: lams_tool_assessment/conf/xdoclet/struts-actions.xml =================================================================== diff -u -ra43256ee6435f1cd14f46c235e4d507957a86a5b -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision a43256ee6435f1cd14f46c235e4d507957a86a5b) +++ lams_tool_assessment/conf/xdoclet/struts-actions.xml (.../struts-actions.xml) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -250,7 +250,27 @@ type="org.lamsfoundation.lams.tool.assessment.web.action.LearningAction" parameter="downOption"> - + + + + + + + + + getAssessmentQuestionsBySessionId(Long sessionId) { AssessmentSession session = assessmentSessionDao.getSessionBySessionId(sessionId); if (session == null) { @@ -316,6 +330,7 @@ return questions; } + @Override public Assessment getAssessmentBySessionId(Long sessionId) { AssessmentSession session = assessmentSessionDao.getSessionBySessionId(sessionId); // to skip CGLib problem @@ -324,14 +339,17 @@ return res; } + @Override public AssessmentSession getAssessmentSessionBySessionId(Long sessionId) { return assessmentSessionDao.getSessionBySessionId(sessionId); } + @Override public void saveOrUpdateAssessmentSession(AssessmentSession resSession) { assessmentSessionDao.saveObject(resSession); } + @Override public void setAttemptStarted(Assessment assessment, AssessmentUser assessmentUser, Long toolSessionId) { AssessmentResult result = new AssessmentResult(); result.setAssessment(assessment); @@ -341,6 +359,7 @@ assessmentResultDao.saveObject(result); } + @Override public void processUserAnswers(Long assessmentUid, Long userId, ArrayList> pagedQuestions) { SortedSet questionResultList = new TreeSet( @@ -499,23 +518,79 @@ return questionResult; } + @Override public AssessmentResult getLastAssessmentResult(Long assessmentUid, Long userId) { return assessmentResultDao.getLastAssessmentResult(assessmentUid, userId); } + @Override public AssessmentResult getLastFinishedAssessmentResult(Long assessmentUid, Long userId) { return assessmentResultDao.getLastFinishedAssessmentResult(assessmentUid, userId); } + @Override public int getAssessmentResultCount(Long assessmentUid, Long userId) { return assessmentResultDao.getAssessmentResultCount(assessmentUid, userId); } + @Override public List getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid) { return assessmentQuestionResultDao.getAssessmentQuestionResultList(assessmentUid, userId, questionUid); } + + @Override + public Long createNotebookEntry(Long sessionId, Integer userId, String entryText) { + return coreNotebookService.createNotebookEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + AssessmentConstants.TOOL_SIGNATURE, userId, "", entryText); + } + @Override + public NotebookEntry getEntry(Long sessionId, Integer userId) { + List list = coreNotebookService.getEntry(sessionId, CoreNotebookConstants.NOTEBOOK_TOOL, + AssessmentConstants.TOOL_SIGNATURE, userId); + if (list == null || list.isEmpty()) { + return null; + } else { + return list.get(0); + } + } + + @Override + public void updateEntry(NotebookEntry notebookEntry) { + coreNotebookService.updateEntry(notebookEntry); + } + + @Override + public Map> getReflectList(Long contentId) { + Map> map = new HashMap>(); + + List sessionList = assessmentSessionDao.getByContentId(contentId); + for (AssessmentSession session : sessionList) { + Long sessionId = session.getSessionId(); + boolean hasRefection = session.getAssessment().isReflectOnActivity(); + Set list = new TreeSet(new ReflectDTOComparator()); + // get all users in this session + List users = assessmentUserDao.getBySessionID(sessionId); + for (AssessmentUser user : users) { + ReflectDTO ref = new ReflectDTO(user); + + NotebookEntry entry = getEntry(sessionId, user.getUserId().intValue()); + if (entry != null) { + ref.setReflect(entry.getEntry()); + } + + ref.setHasRefection(hasRefection); + list.add(ref); + } + map.put(sessionId, list); + } + + return map; + } + + + @Override public String finishToolSession(Long toolSessionId, Long userId) throws AssessmentApplicationException { AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, toolSessionId); user.setSessionFinished(true); @@ -532,10 +607,12 @@ return nextUrl; } + @Override public AssessmentQuestion getAssessmentQuestionByUid(Long questionUid) { return assessmentQuestionDao.getByUid(questionUid); } + @Override public List getSummaryList(Long contentId) { List summaryList = new ArrayList(); @@ -570,6 +647,7 @@ return summaryList; } + @Override public AssessmentResult getUserMasterDetail(Long sessionId, Long userId) { AssessmentResult lastFinishedResult = assessmentResultDao.getLastFinishedAssessmentResultBySessionId(sessionId, userId); @@ -583,6 +661,7 @@ return lastFinishedResult; } + @Override public UserSummary getUserSummary(Long contentId, Long userId, Long sessionId) { UserSummary userSummary = new UserSummary(); AssessmentUser user = assessmentUserDao.getUserByUserIDAndSessionID(userId, sessionId); @@ -631,6 +710,7 @@ return userSummary; } + @Override public QuestionSummary getQuestionSummary(Long contentId, Long questionUid) { QuestionSummary questionSummary = new QuestionSummary(); AssessmentQuestion question = assessmentQuestionDao.getByUid(questionUid); @@ -688,6 +768,7 @@ return questionSummary; } + @Override public void changeQuestionResultMark(Long questionResultUid, float newMark) { AssessmentQuestionResult questionResult = assessmentQuestionResultDao .getAssessmentQuestionResultByUid(questionResultUid); @@ -700,6 +781,7 @@ assessmentResultDao.saveObject(result); } + @Override public AssessmentUser getUser(Long uid) { return (AssessmentUser) assessmentUserDao.getObject(AssessmentUser.class, uid); } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java =================================================================== diff -u -rd209a8f4bb44ac8c149c57f6aff431a0cab8f2b6 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision d209a8f4bb44ac8c149c57f6aff431a0cab8f2b6) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java (.../IAssessmentService.java) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -26,10 +26,14 @@ import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; +import java.util.Map; +import java.util.Set; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.events.IEventNotificationService; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary; +import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO; import org.lamsfoundation.lams.tool.assessment.dto.Summary; import org.lamsfoundation.lams.tool.assessment.dto.UserSummary; import org.lamsfoundation.lams.tool.assessment.model.Assessment; @@ -184,6 +188,14 @@ int getAssessmentResultCount(Long assessmentUid, Long userId); List getAssessmentQuestionResultList(Long assessmentUid, Long userId, Long questionUid); + + Long createNotebookEntry(Long sessionId, Integer userId, String entryText); + + NotebookEntry getEntry(Long sessionId, Integer userId); + + void updateEntry(NotebookEntry notebookEntry); + + Map> getReflectList(Long contentId); /** * If success return next activity's url, otherwise return null. Fisheye: Tag d4022a5f15973e49528bcc3872b6ef4038dc4181 refers to a dead (removed) revision in file `lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/ReflectDTOComparator.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java =================================================================== diff -u -rf91a13ebf9fee21e228d82128ed50511ef8b4169 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision f91a13ebf9fee21e228d82128ed50511ef8b4169) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java (.../LearningAction.java) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -52,6 +52,7 @@ import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.events.DeliveryMethodMail; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.assessment.AssessmentConstants; import org.lamsfoundation.lams.tool.assessment.model.Assessment; @@ -67,6 +68,7 @@ import org.lamsfoundation.lams.tool.assessment.service.AssessmentApplicationException; import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService; import org.lamsfoundation.lams.tool.assessment.util.SequencableComparator; +import org.lamsfoundation.lams.tool.assessment.web.form.ReflectionForm; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.DateUtil; @@ -110,7 +112,14 @@ } if (param.equals("downOption")) { return downOption(mapping, form, request, response); - } + } + // ================ Reflection ======================= + if (param.equals("newReflection")) { + return newReflection(mapping, form, request, response); + } + if (param.equals("submitReflection")) { + return submitReflection(mapping, form, request, response); + } return mapping.findForward(AssessmentConstants.ERROR); } @@ -188,16 +197,30 @@ || finishedLockForMonitor || ((attemptsAllowed <= dbResultCount) && (attemptsAllowed != 0)); + // get notebook entry + String entryText = new String(); + if (assessmentUser != null) { + NotebookEntry notebookEntry = service.getEntry(toolSessionId, assessmentUser.getUserId().intValue()); + if (notebookEntry != null) { + entryText = notebookEntry.getEntry(); + } + } + // basic information sessionMap.put(AssessmentConstants.ATTR_TITLE, assessment.getTitle()); sessionMap.put(AssessmentConstants.ATTR_INSTRUCTIONS, assessment.getInstructions()); sessionMap.put(AssessmentConstants.ATTR_IS_RESUBMIT_ALLOWED, false); sessionMap.put(AssessmentConstants.ATTR_FINISHED_LOCK, finishedLock); + sessionMap.put(AssessmentConstants.ATTR_USER_FINISHED, assessmentUser != null && assessmentUser.isSessionFinished()); sessionMap.put(AssessmentConstants.PARAM_RUN_OFFLINE, assessment.getRunOffline()); sessionMap.put(AttributeNames.PARAM_TOOL_SESSION_ID, toolSessionId); sessionMap.put(AssessmentConstants.ATTR_USER, assessmentUser); sessionMap.put(AttributeNames.ATTR_MODE, mode); + // reflection information + sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ON, assessment.isReflectOnActivity()); + sessionMap.put(AssessmentConstants.ATTR_REFLECTION_INSTRUCTION, assessment.getReflectInstructions()); + sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, entryText); // add define later support if (assessment.isDefineLater()) { @@ -506,8 +529,80 @@ request.setAttribute(AssessmentConstants.ATTR_QUESTION_FOR_ORDERING, question); request.setAttribute(AssessmentConstants.ATTR_SESSION_MAP_ID, sessionMapID); return mapping.findForward(AssessmentConstants.SUCCESS); - } + } + + /** + * Display empty reflection form. + * + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + private ActionForward newReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + // get session value + String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID); + + ReflectionForm refForm = (ReflectionForm) form; + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + + refForm.setUserID(user.getUserID()); + refForm.setSessionMapID(sessionMapID); + + // get the existing reflection entry + IAssessmentService service = getAssessmentService(); + + SessionMap map = (SessionMap) request.getSession().getAttribute(sessionMapID); + Long toolSessionID = (Long) map.get(AttributeNames.PARAM_TOOL_SESSION_ID); + NotebookEntry entry = service.getEntry(toolSessionID, user.getUserID()); + + if (entry != null) { + refForm.setEntryText(entry.getEntry()); + } + + return mapping.findForward(AssessmentConstants.SUCCESS); + } + + /** + * Submit reflection form input database. + * + * @param mapping + * @param form + * @param request + * @param response + * @return + */ + private ActionForward submitReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, + HttpServletResponse response) { + ReflectionForm refForm = (ReflectionForm) form; + Integer userId = refForm.getUserID(); + + String sessionMapID = WebUtil.readStrParam(request, AssessmentConstants.ATTR_SESSION_MAP_ID); + SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); + + IAssessmentService service = getAssessmentService(); + + // check for existing notebook entry + NotebookEntry entry = service.getEntry(sessionId, userId); + + if (entry == null) { + // create new entry + service.createNotebookEntry(sessionId, userId, refForm.getEntryText()); + } else { + // update existing entry + entry.setEntry(refForm.getEntryText()); + entry.setLastModified(new Date()); + service.updateEntry(entry); + } + + return finish(mapping, form, request, response); + } + // ************************************************************************************* // Private method // ************************************************************************************* Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java =================================================================== diff -u -rc7ffb298078fad531d8a90d4bc12e588b16db93b -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision c7ffb298078fad531d8a90d4bc12e588b16db93b) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentForm.java (.../AssessmentForm.java) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -82,6 +82,7 @@ assessment.setShuffled(false); assessment.setRunOffline(false); assessment.setDisplaySummary(false); + assessment.setReflectOnActivity(false); } } Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java =================================================================== diff -u -r6a20c448cdfdc7895e72dda22c5359be1234cf47 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 6a20c448cdfdc7895e72dda22c5359be1234cf47) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/servlet/ExportServlet.java (.../ExportServlet.java) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -28,7 +28,9 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.Map; import java.util.Set; +import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.Cookie; @@ -37,9 +39,12 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.assessment.AssessmentConstants; import org.lamsfoundation.lams.tool.assessment.dto.QuestionSummary; +import org.lamsfoundation.lams.tool.assessment.dto.ReflectDTO; import org.lamsfoundation.lams.tool.assessment.dto.Summary; import org.lamsfoundation.lams.tool.assessment.dto.UserSummary; import org.lamsfoundation.lams.tool.assessment.model.Assessment; @@ -51,6 +56,7 @@ import org.lamsfoundation.lams.tool.assessment.service.IAssessmentService; import org.lamsfoundation.lams.tool.assessment.util.AssessmentBundler; import org.lamsfoundation.lams.tool.assessment.util.AssessmentToolContentHandler; +import org.lamsfoundation.lams.tool.assessment.util.ReflectDTOComparator; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; @@ -100,7 +106,7 @@ String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath(); - + // Attempting to export required js and image files try { AssessmentBundler imageBundler = new AssessmentBundler(); @@ -109,7 +115,7 @@ logger.error( "Could not export spreadsheet javascript files, some files may be missing in export portfolio", e); } - + writeResponseToFile(basePath + "/pages/export/exportportfolio.jsp?sessionMapID=" + sessionMap.getSessionID(), directoryName, FILENAME, cookies); @@ -161,7 +167,7 @@ logger.error(error); throw new AssessmentApplicationException(error); } - + AssessmentSession session = service.getAssessmentSessionBySessionId(toolSessionID); if (session == null) { String error = "Failed get AssessmentSession by ID [" + toolSessionID + "]"; @@ -173,6 +179,14 @@ sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, content); sessionMap.put(AssessmentConstants.ATTR_USER_SUMMARY, userSummary); + + // Create reflectList if reflection is enabled. + if (content.isReflectOnActivity()) { + + // Add reflectList to sessionMap + sessionMap.put(AssessmentConstants.ATTR_REFLECTION_ENTRY, getReflectionEntry(learner)); + } + } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, @@ -192,9 +206,9 @@ logger.error(error); throw new AssessmentApplicationException(error); } - + List summaryList = service.getSummaryList(toolContentID); - + ArrayList questionSummaryList = new ArrayList(); Set questions = content.getQuestions(); for (AssessmentQuestion question : questions) { @@ -203,17 +217,29 @@ } // cache into sessionMap - sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, content); + sessionMap.put(AssessmentConstants.ATTR_ASSESSMENT, content); sessionMap.put(AssessmentConstants.ATTR_SUMMARY_LIST, summaryList); sessionMap.put(AssessmentConstants.ATTR_QUESTION_SUMMARY_LIST, questionSummaryList); + + // Create reflectList if reflection is enabled. + if (content.isReflectOnActivity()) { + Map> reflectList = service.getReflectList(content.getContentId()); + // Add reflectList to sessionMap + sessionMap.put(AssessmentConstants.ATTR_REFLECT_LIST, reflectList); + } + } - private AssessmentToolContentHandler getToolContentHandler() { - if (handler == null) { - WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(this - .getServletContext()); - handler = (AssessmentToolContentHandler) wac.getBean(AssessmentConstants.TOOL_CONTENT_HANDLER_NAME); + private ReflectDTO getReflectionEntry(AssessmentUser user) { + ReflectDTO reflectDTO = new ReflectDTO(user); + NotebookEntry notebookEntry = service.getEntry(user.getSession().getSessionId(), user.getUserId().intValue()); + + // check notebookEntry is not null + if (notebookEntry != null) { + reflectDTO.setReflect(notebookEntry.getEntry()); + logger.debug("Could not find notebookEntry for ResourceUser: " + user.getUid()); } - return handler; + return reflectDTO; } + } Index: lams_tool_assessment/web/pages/authoring/advance.jsp =================================================================== diff -u -rbcbb7535afbed8b0c8bef17e309fd431ae77ec08 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision bcbb7535afbed8b0c8bef17e309fd431ae77ec08) +++ lams_tool_assessment/web/pages/authoring/advance.jsp (.../advance.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -151,6 +151,17 @@

+

+ + +

+ +

+ +

+

@@ -159,3 +170,23 @@ style="width:650px;height:100px;border:0px;display:block;" frameborder="no" scrolling="no" src="?sessionMapID=${formBean.sessionMapID}">

+ + + Index: lams_tool_assessment/web/pages/export/parts/exportlearner.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/web/pages/export/parts/exportlearner.jsp (.../exportlearner.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_assessment/web/pages/export/parts/exportlearner.jsp (.../exportlearner.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -144,7 +144,18 @@
- + + + <%-- Display reflection entries --%> + +

+ +

+ +

+ +

+ Index: lams_tool_assessment/web/pages/export/parts/exportteacher.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/web/pages/export/parts/exportteacher.jsp (.../exportteacher.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_assessment/web/pages/export/parts/exportteacher.jsp (.../exportteacher.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -220,6 +220,29 @@




+ + <%-- Display reflection entries --%> + +

+ +

+ + +
+ ${summary.sessionName} +
+ + + +

+ ${reflectDTO.fullName} +

+

+ +

+ + + Index: lams_tool_assessment/web/pages/learning/learning.jsp =================================================================== diff -u -r35a0e719d061c08b52e705135bb2f2126079ed21 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 35a0e719d061c08b52e705135bb2f2126079ed21) +++ lams_tool_assessment/web/pages/learning/learning.jsp (.../learning.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -98,6 +98,9 @@ document.location.href =''; return false; } + function continueReflect(){ + document.location.href=''; + } function nextPage(pageNumber){ var secondsLeft = 0; if (${not finishedLock && assessment.timeLimit > 0}) { @@ -194,7 +197,35 @@ <%@ include file="parts/allquestions.jsp"%> + + <%-- Reflection entry --%> + +
+

+ ${sessionMap.reflectInstructions} +

+ + +

+ +

+ + +

+ +

+ + + + + + + + +
+ +
@@ -209,10 +240,22 @@ - - - - + + + + + + + + + + + + + + + + Fisheye: Tag 95a8036ef190595474c3bac650ecd8e004434fd2 refers to a dead (removed) revision in file `lams_tool_assessment/web/pages/learning/notebook.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp =================================================================== diff -u -rf91a13ebf9fee21e228d82128ed50511ef8b4169 -r65e3365a66b2977b268fafdd0b9fe2e5eae732a4 --- lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp (.../advanceoptions.jsp) (revision f91a13ebf9fee21e228d82128ed50511ef8b4169) +++ lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp (.../advanceoptions.jsp) (revision 65e3365a66b2977b268fafdd0b9fe2e5eae732a4) @@ -184,5 +184,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + ${assessment.reflectInstructions} + + + + +
\ No newline at end of file