Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java =================================================================== diff -u -re423418cca5e77a3b54cb3be496b67abe01c4183 -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision e423418cca5e77a3b54cb3be496b67abe01c4183) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java (.../LdTemplateController.java) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -807,6 +807,8 @@ ArrayNode references = JsonNodeFactory.instance.arrayNode(); for (int i = 0; i < questions.size(); i++) { ObjectNode question = (ObjectNode) questions.get(i); + question.put("answerRequired", true); + Integer questionDisplayOrder = question.get(RestTags.DISPLAY_ORDER).asInt(); Integer defaultGrade = JsonUtil.optInt(question, "defaultGrade", 1); references.add(JsonNodeFactory.instance.objectNode().put(RestTags.DISPLAY_ORDER, questionDisplayOrder) @@ -1166,6 +1168,12 @@ if (confidenceLevelsActivityUiid != null) { toolContentJSON.put(RestTags.CONFIDENCE_LEVELS_ACTIVITY_UIID, confidenceLevelsActivityUiid); } + + for (int i = 0; i < questions.size(); i++) { + ObjectNode question = (ObjectNode) questions.get(i); + question.put("answerRequired", true); + } + return createToolContent(user, LdTemplateController.SCRATCHIE_TOOL_SIGNATURE, toolContentJSON); } Index: lams_central/web/authoring/template/tbl/appex.jsp =================================================================== diff -u -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/web/authoring/template/tbl/appex.jsp (.../appex.jsp) (revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a) +++ lams_central/web/authoring/template/tbl/appex.jsp (.../appex.jsp) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -16,9 +16,7 @@ aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapseAppex${appexNumber}" >   - ${appexNumber eq 1 ? "" : ""} Index: lams_central/web/authoring/template/tbl/tbl.jsp =================================================================== diff -u -r1f69c0097a8597daa578812eb72d0bcc20c8ea74 -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision 1f69c0097a8597daa578812eb72d0bcc20c8ea74) +++ lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -233,7 +233,7 @@
- +
Index: lams_central/web/authoring/template/tool/assessmcq.jsp =================================================================== diff -u -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/web/authoring/template/tool/assessmcq.jsp (.../assessmcq.jsp) (revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a) +++ lams_central/web/authoring/template/tool/assessmcq.jsp (.../assessmcq.jsp) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -1,7 +1,6 @@ <%@ include file="/common/taglibs.jsp"%> <%@ page import="org.lamsfoundation.lams.authoring.template.web.LdTemplateController"%> -${questionNumber eq 1 ? "class=\"input required\"" : "class=\"input\""} <%-- Generic MCQ question for assessment. Expects an input of questionNumber, contentFolderID, and creates a text field field question${questionNumber} and three options. Question, and hence question.title and question.text are optional and are only populated if QTI is used to start the questions. ${containingDivName} is set if this is being called from @@ -21,9 +20,7 @@    - ${questionNumber eq 1 ? "" : ""}
Index: lams_central/web/authoring/template/tool/assessment.jsp =================================================================== diff -u -r9f75aff30e9b0b3941d5c719a840b17ad8a7364a -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/web/authoring/template/tool/assessment.jsp (.../assessment.jsp) (revision 9f75aff30e9b0b3941d5c719a840b17ad8a7364a) +++ lams_central/web/authoring/template/tool/assessment.jsp (.../assessment.jsp) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -17,9 +17,7 @@    - ${questionNumber eq 1 ? "" : ""} Index: lams_central/web/authoring/template/tool/mcquestion.jsp =================================================================== diff -u -rc5f1c588cb57eb6b7c14d1ad679d6c2c1925b319 -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_central/web/authoring/template/tool/mcquestion.jsp (.../mcquestion.jsp) (revision c5f1c588cb57eb6b7c14d1ad679d6c2c1925b319) +++ lams_central/web/authoring/template/tool/mcquestion.jsp (.../mcquestion.jsp) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -19,9 +19,7 @@    - ${questionNumber eq 1 ? "" : ""} Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java =================================================================== diff -u -re423418cca5e77a3b54cb3be496b67abe01c4183 -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision e423418cca5e77a3b54cb3be496b67abe01c4183) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java (.../QaService.java) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -1201,7 +1201,7 @@ saveOrUpdate(qbQuestion); QaQueContent question = new QaQueContent(qbQuestion, JsonUtil.optInt(questionData, RestTags.DISPLAY_ORDER), - JsonUtil.optBoolean(questionData, "required", Boolean.FALSE), qa); + JsonUtil.optBoolean(questionData, "answerRequired", Boolean.FALSE), qa); saveOrUpdate(question); } Index: lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java =================================================================== diff -u -re743566518bd5c53d6574987565cfb8581a92c66 -rf0e4b56f3140e3387e9653b56c947132eb87a2a0 --- lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision e743566518bd5c53d6574987565cfb8581a92c66) +++ lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java (.../ScratchieServiceImpl.java) (revision f0e4b56f3140e3387e9653b56c947132eb87a2a0) @@ -2700,6 +2700,7 @@ ScratchieItem item = new ScratchieItem(); item.setDisplayOrder(JsonUtil.optInt(questionData, RestTags.DISPLAY_ORDER)); + item.setAnswerRequired(JsonUtil.optBoolean(questionData, "answerRequired", Boolean.FALSE)); item.setToolContentId(scratchie.getContentId()); QbQuestion qbQuestion = null;