Index: lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml =================================================================== diff -u -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d) +++ lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml (.../QaContent.hbm.xml) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -118,6 +118,14 @@ column="allow_rate_answers" length="1" /> + + conditions, boolean allowRichEditor, boolean useSelectLeaderToolOuput) { + boolean allowRateAnswers, boolean notifyTeachersOnResponseSubmit, boolean synchInMonitor, + boolean lockWhenFinished, boolean showOtherAnswers, boolean reflect, String reflectionSubject, + Date creationDate, Date updateDate, Set qaQueContents, Set qaSessions, Set conditions, + boolean allowRichEditor, boolean useSelectLeaderToolOuput) { this.qaContentId = qaContentId; this.content = content; this.title = title; @@ -140,6 +143,7 @@ this.questionsSequenced = questionsSequenced; this.usernameVisible = usernameVisible; this.allowRateAnswers = allowRateAnswers; + this.notifyTeachersOnResponseSubmit = notifyTeachersOnResponseSubmit; this.synchInMonitor = synchInMonitor; this.lockWhenFinished = lockWhenFinished; this.showOtherAnswers = showOtherAnswers; @@ -168,10 +172,11 @@ RepositoryCheckedException { QaContent newContent = new QaContent(newContentId, qa.getContent(), qa.getTitle(), qa.getInstructions(), qa.getReportTitle(), qa.getMonitoringReportTitle(), qa.getCreatedBy(), qa.isQuestionsSequenced(), - qa.isUsernameVisible(), qa.isAllowRateAnswers(), qa.isSynchInMonitor(), qa.isLockWhenFinished(), - qa.isShowOtherAnswers(), qa.isReflect(), qa.getReflectionSubject(), qa.getCreationDate(), - qa.getUpdateDate(), new TreeSet(), new TreeSet(), new TreeSet( - new TextSearchConditionComparator()), qa.isAllowRichEditor(), qa.isUseSelectLeaderToolOuput()); + qa.isUsernameVisible(), qa.isAllowRateAnswers(), qa.isNotifyTeachersOnResponseSubmit(), + qa.isSynchInMonitor(), qa.isLockWhenFinished(), qa.isShowOtherAnswers(), qa.isReflect(), + qa.getReflectionSubject(), qa.getCreationDate(), qa.getUpdateDate(), new TreeSet(), new TreeSet(), + new TreeSet(new TextSearchConditionComparator()), qa.isAllowRichEditor(), + qa.isUseSelectLeaderToolOuput()); newContent.setQaQueContents(qa.deepCopyQaQueContent(newContent)); @@ -414,7 +419,18 @@ public void setAllowRateAnswers(boolean allowRateAnswers) { this.allowRateAnswers = allowRateAnswers; } + + /** + * @return + */ + public boolean isNotifyTeachersOnResponseSubmit() { + return notifyTeachersOnResponseSubmit; + } + public void setNotifyTeachersOnResponseSubmit(boolean notifyTeachersOnResponseSubmit) { + this.notifyTeachersOnResponseSubmit = notifyTeachersOnResponseSubmit; + } + /** * @return Returns the questionsSequenced. */ Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java (.../IQaUsrRespDAO.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaUsrRespDAO.java (.../IQaUsrRespDAO.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -23,12 +23,12 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.qa.dao; +import java.util.List; + import org.lamsfoundation.lams.tool.qa.QaUsrResp; /** - * * @author Ozgur Demirtas - * */ public interface IQaUsrRespDAO { @@ -43,4 +43,6 @@ public QaUsrResp getResponseByUserAndQuestion(final Long queUsrId, final Long questionId); int getCountResponsesByQaContent(final Long qaContentId); + + List getResponsesByUserUid(final Long userUid); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java =================================================================== diff -u -r91f0740e75daa643981b757e49d1ed2ed7f0a528 -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision 91f0740e75daa643981b757e49d1ed2ed7f0a528) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java (.../QaUsrRespDAO.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -37,6 +37,8 @@ */ public class QaUsrRespDAO extends HibernateDaoSupport implements IQaUsrRespDAO { private static final String LOAD_ATTEMPT_FOR_USER_AND_QUESTION = "from qaUsrResp in class QaUsrResp where qaUsrResp.qaQueUser.queUsrId=:queUsrId and qaUsrResp.qaQuestion.uid=:questionId"; + + private static final String LOAD_ATTEMPT_FOR_USER = "from qaUsrResp in class QaUsrResp where qaUsrResp.qaQueUser.uid=:userUid order by qaUsrResp.qaQuestion.displayOrder asc"; private static final String GET_COUNT_RESPONSES_BY_QACONTENT = "SELECT COUNT(*) from " + QaUsrResp.class.getName() + " as r where r.qaQuestion.qaContent.qaContentId=?"; @@ -73,6 +75,13 @@ } } + @Override + public List getResponsesByUserUid(final Long userUid) { + List list = getSession().createQuery(LOAD_ATTEMPT_FOR_USER).setLong("userUid", userUid.longValue()) + .list(); + return list; + } + public int getCountResponsesByQaContent(final Long qaContentId) { List list = getHibernateTemplate().find(GET_COUNT_RESPONSES_BY_QACONTENT, new Object[] { qaContentId }); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql =================================================================== diff -u -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql (.../patch20140527.sql) (revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql (.../patch20140527.sql) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -6,6 +6,8 @@ -- LDEV-3236 Ability to change, add, remove Q&A questions even after student have reached it ALTER TABLE tl_laqa11_content DROP COLUMN content_inUse; +ALTER TABLE tl_laqa11_content ADD COLUMN notify_response_submit TINYINT(1) NOT NULL DEFAULT 0; + UPDATE lams_tool SET tool_version='20140527' WHERE tool_signature='laqa11'; ----------------------Put all sql statements above here------------------------- Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml (.../qaApplicationContext.xml) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -89,6 +89,8 @@ + + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java =================================================================== diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java (.../IQaService.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -329,5 +329,12 @@ * @return */ List getReflectList(QaContent content, String userID); + + /** + * notifyTeachersOnResponseSubmit + * + * @param sessionId + */ + void notifyTeachersOnResponseSubmit(Long sessionId); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java =================================================================== diff -u -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java (.../QaServicePOJO.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -42,6 +42,7 @@ import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; +import org.lamsfoundation.lams.events.IEventNotificationService; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException; import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService; @@ -81,11 +82,11 @@ import org.lamsfoundation.lams.tool.qa.dto.ReflectionDTO; import org.lamsfoundation.lams.tool.qa.util.QaApplicationException; import org.lamsfoundation.lams.tool.qa.util.QaSessionComparator; -import org.lamsfoundation.lams.tool.qa.util.QaUtils; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; @@ -132,6 +133,8 @@ private IQaWizardDAO qaWizardDAO; private ICoreNotebookService coreNotebookService; + private IEventNotificationService eventNotificationService; + private MessageService messageService; private Random generator = new Random(); @@ -797,7 +800,33 @@ return reflectionDTOs; } + + @Override + public void notifyTeachersOnResponseSubmit(Long sessionId) { + final String NEW_LINE_CHARACTER = "
"; + + HttpSession ss = SessionManager.getSession(); + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userId = new Long(toolUser.getUserID().longValue()); + QaQueUsr user = getUserByIdAndSession(userId, new Long(sessionId)); + + String fullName = user.getFullname(); + String message = NEW_LINE_CHARACTER + NEW_LINE_CHARACTER + messageService.getMessage("label.user.has.answered.questions", new Object[] { fullName }); + + List responses = qaUsrRespDAO.getResponsesByUserUid(user.getUid()); + for (QaUsrResp response : responses) { + String question = response.getQaQuestion().getQuestion(); + String answer = response.getAnswer(); + + message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER + question + answer; + } + + message += NEW_LINE_CHARACTER + NEW_LINE_CHARACTER; + + eventNotificationService.notifyLessonMonitors(sessionId, message, true); + } + /** * Export the XML fragment for the tool's content, along with any files needed for the content. * @@ -1278,6 +1307,7 @@ toolContentObj.setLockWhenFinished(true); toolContentObj.setShowOtherAnswers(true); toolContentObj.setAllowRateAnswers(false); + toolContentObj.setNotifyTeachersOnResponseSubmit(false); Boolean bool; try { @@ -1341,6 +1371,14 @@ public void setCoreNotebookService(ICoreNotebookService coreNotebookService) { this.coreNotebookService = coreNotebookService; } + + public void setEventNotificationService(IEventNotificationService eventNotificationService) { + this.eventNotificationService = eventNotificationService; + } + + public void setMessageService(MessageService messageService) { + this.messageService = messageService; + } public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java =================================================================== diff -u -rdfbc0a5728344573bc1bcbf0095e4f2778d3ad8d -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java (.../QaUtils.java) (revision dfbc0a5728344573bc1bcbf0095e4f2778d3ad8d) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/util/QaUtils.java (.../QaUtils.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -96,6 +96,9 @@ String allowRateAnswers = request.getParameter(ALLOW_RATE_ANSWERS); qaAuthoringForm.setAllowRateAnswers(allowRateAnswers); qaGeneralAuthoringDTO.setAllowRateAnswers(allowRateAnswers); + + String notifyTeachersOnResponseSubmit = request.getParameter(NOTIFY_TEACHERS_ON_RESPONSE_SUBMIT); + qaAuthoringForm.setNotifyTeachersOnResponseSubmit(notifyTeachersOnResponseSubmit); String showOtherAnswers = request.getParameter("showOtherAnswers"); qaAuthoringForm.setShowOtherAnswers(showOtherAnswers); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java (.../AuthoringUtil.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -296,6 +296,8 @@ String usernameVisible = request.getParameter(QaAppConstants.USERNAME_VISIBLE); String allowRateQuestions = request.getParameter(QaAppConstants.ALLOW_RATE_ANSWERS); + + String notifyTeachersOnResponseSubmit = request.getParameter(QaAppConstants.NOTIFY_TEACHERS_ON_RESPONSE_SUBMIT); String showOtherAnswers = request.getParameter("showOtherAnswers"); @@ -318,6 +320,7 @@ boolean lockWhenFinishedBoolean = false; boolean usernameVisibleBoolean = false; boolean allowRateQuestionsBoolean = false; + boolean notifyTeachersOnResponseSubmitBoolean = false; boolean showOtherAnswersBoolean = false; boolean reflectBoolean = false; boolean allowRichEditorBoolean = false; @@ -342,6 +345,10 @@ if (allowRateQuestions != null && allowRateQuestions.equalsIgnoreCase("1")) { allowRateQuestionsBoolean = true; } + + if (notifyTeachersOnResponseSubmit != null && notifyTeachersOnResponseSubmit.equalsIgnoreCase("1")) { + notifyTeachersOnResponseSubmitBoolean = true; + } if (showOtherAnswers != null && showOtherAnswers.equalsIgnoreCase("1")) { showOtherAnswersBoolean = true; @@ -388,6 +395,7 @@ if (activeModule.equals(QaAppConstants.AUTHORING)) { qaContent.setUsernameVisible(usernameVisibleBoolean); qaContent.setAllowRateAnswers(allowRateQuestionsBoolean); + qaContent.setNotifyTeachersOnResponseSubmit(notifyTeachersOnResponseSubmitBoolean); qaContent.setShowOtherAnswers(showOtherAnswersBoolean); qaContent.setQuestionsSequenced(questionsSequencedBoolean); qaContent.setLockWhenFinished(lockWhenFinishedBoolean); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java =================================================================== diff -u -r6ac8c3a8a953aab157cb5075fba73b09da5e4cf8 -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision 6ac8c3a8a953aab157cb5075fba73b09da5e4cf8) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java (.../QaLearningAction.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -175,15 +175,20 @@ sessionMap.put(QaAppConstants.MAP_ALL_RESULTS_KEY, mapAnswers); request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); qaLearningForm.setHttpSessionID(sessionMap.getSessionID()); + qaLearningForm.resetAll(); generalLearnerFlowDTO.setHttpSessionID(sessionMap.getSessionID()); boolean lockWhenFinished = qaContent.isLockWhenFinished(); generalLearnerFlowDTO.setLockWhenFinished(new Boolean(lockWhenFinished).toString()); generalLearnerFlowDTO.setReflection(new Boolean(qaContent.isReflect()).toString()); request.setAttribute(QaAppConstants.GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); - - qaLearningForm.resetAll(); + + // notify teachers on response submit + if (errors.isEmpty() && qaContent.isNotifyTeachersOnResponseSubmit()) { + qaService.notifyTeachersOnResponseSubmit(new Long(toolSessionID)); + } + return (mapping.findForward(forwardName)); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java =================================================================== diff -u -r9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90 -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision 9fbb7ff85ea238ebc8699e9ec116eb0cd782ff90) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java (.../QaStarterAction.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -340,6 +340,7 @@ qaAuthoringForm.setUsernameVisible(qaContent.isUsernameVisible() ? "1" : "0"); qaAuthoringForm.setAllowRateAnswers(qaContent.isAllowRateAnswers() ? "1" : "0"); + qaAuthoringForm.setNotifyTeachersOnResponseSubmit(qaContent.isNotifyTeachersOnResponseSubmit() ? "1" : "0"); qaAuthoringForm.setShowOtherAnswers(qaContent.isShowOtherAnswers() ? "1" : "0"); qaAuthoringForm.setSynchInMonitor(qaContent.isSynchInMonitor() ? "1" : "0"); qaAuthoringForm.setQuestionsSequenced(qaContent.isQuestionsSequenced() ? "1" : "0"); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java =================================================================== diff -u -rbe07c35c372d904a65581d98660e73f3b13b69db -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java (.../QaAuthoringForm.java) (revision be07c35c372d904a65581d98660e73f3b13b69db) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java (.../QaAuthoringForm.java) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -64,6 +64,7 @@ protected String endLearningMessage; protected String usernameVisible; protected String allowRateAnswers; + protected String notifyTeachersOnResponseSubmit; protected String showOtherAnswers; protected String questionsSequenced; protected String lockWhenFinished; @@ -147,6 +148,7 @@ this.synchInMonitor = OPTION_OFF; this.usernameVisible = OPTION_OFF; this.allowRateAnswers = OPTION_OFF; + this.notifyTeachersOnResponseSubmit = OPTION_OFF; this.questionsSequenced = OPTION_OFF; this.lockWhenFinished = OPTION_OFF; this.reflect = OPTION_OFF; @@ -155,20 +157,6 @@ this.useSelectLeaderToolOuput = false; } - public String toString() { - return new ToStringBuilder(this).append("Listing current QaAuthoringForm properties: ") - .append("toolContentID: ", toolContentID).append("currentTab: ", currentTab) - .append("activeModule: ", activeModule).append("defaultContentIdStr: ", defaultContentIdStr) - .append("title: ", title).append("instructions: ", instructions).append("reportTitle: ", reportTitle) - .append("monitoringReportTitle: ", monitoringReportTitle) - .append("endLearningMessage: ", endLearningMessage) - .append("usernameVisible: ", usernameVisible) - .append("allowRateAnswers: ", allowRateAnswers).append("showOtherAnswers: ", showOtherAnswers) - .append("synchInMonitor: ", synchInMonitor).append("questionsSequenced: ", questionsSequenced) - .append("lockWhenFinished: ", lockWhenFinished).append("reflect: ", reflect) - .append("defineLaterInEditMode: ", defineLaterInEditMode).toString(); - } - /** * @return Returns the isRemoveContent. */ @@ -408,8 +396,23 @@ public void setAllowRateAnswers(String allowRateAnswers) { this.allowRateAnswers = allowRateAnswers; } + + /** + * @return Returns the notifyTeachersOnResponseSubmit. + */ + public String getNotifyTeachersOnResponseSubmit() { + return notifyTeachersOnResponseSubmit; + } /** + * @param notifyTeachersOnResponseSubmit + * The notifyTeachersOnResponseSubmit to set. + */ + public void setNotifyTeachersOnResponseSubmit(String notifyTeachersOnResponseSubmit) { + this.notifyTeachersOnResponseSubmit = notifyTeachersOnResponseSubmit; + } + + /** * @return Returns the submitTabDone. */ public String getSubmitTabDone() { Index: lams_tool_laqa/web/authoring/AdvancedContent.jsp =================================================================== diff -u -r6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 6c5d0c6b8ff17d661580df2c265f2dcabfe7d76c) +++ lams_tool_laqa/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -57,17 +57,15 @@

- + styleClass="noBorder"/>

- + styleClass="noBorder" disabled="${formBean.useSelectLeaderToolOuput}"/> @@ -76,8 +74,7 @@

       - + disabled="${formBean.showOtherAnswers == 0}"/> @@ -86,16 +83,21 @@

       - + disabled="${formBean.showOtherAnswers == 0}"/>

+

+ + +

+

- - + @@ -125,26 +127,23 @@

- + styleClass="noBorder"/>

- + styleClass="noBorder"/>

- + styleClass="noBorder"/> Index: lams_tool_laqa/web/monitoring/AdvanceOptions.jsp =================================================================== diff -u -r55acfa2355b842ad87bac70171e366e088daad3c -rc5457cc74f3986b393bc2947604b17168ba54dfb --- lams_tool_laqa/web/monitoring/AdvanceOptions.jsp (.../AdvanceOptions.jsp) (revision 55acfa2355b842ad87bac70171e366e088daad3c) +++ lams_tool_laqa/web/monitoring/AdvanceOptions.jsp (.../AdvanceOptions.jsp) (revision c5457cc74f3986b393bc2947604b17168ba54dfb) @@ -46,6 +46,22 @@ + + + + + + + + + + + + + + + + @@ -58,7 +74,7 @@ - +