Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -rfb0f68987afeb70923fdfb61ed7b83718d378dd2 -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision fb0f68987afeb70923fdfb61ed7b83718d378dd2) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c7b53dd877e2de7f9efc231db3b07ad4379eae87) @@ -849,6 +849,10 @@ authoring.create.mc.question = Add Multiple Choice Question authoring.label.application.exercise.num = Application Exercise {0} authoring.error.application.exercise.num = Application Exercises: Application Exercise {0} may not be blank. +authoring.label.application.exercise.type.assessment = (Assessment) +authoring.label.application.exercise.type.doku = (doKumaran) +authoring.label.application.exercise.doku.description = Description +authoring.label.application.exercise.doku.instructions = Instructions authoring.label.question.num = Question {0} authoring.label.option.num = Option {0} authoring.error.option = Option may not be blank @@ -876,7 +880,8 @@ authoring.error.rat.not.blank = RAT Questions: There must be at least one question. authoring.template.basic.import.qti = Import IMS QTI authoring.tbl.use.noticeboard = Add Noticeboard after AE -authoring.create.application.exercise = Add new Application Exercise +authoring.create.application.exercise.assessment = Add new Assessment Application Exercise +authoring.create.application.exercise.doku = Add new doKumaran Application Exercise authoring.tbl.enable.confidence.tooltip = Asks students in the iRAT how confident they are with their chosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team. authoring.tbl.use.noticeboard.tooltip = After the AE, displays content to students as additional information or as a reflection on the AE topic. authoring.tbl.delete.appex.prompt = Do you want to delete the Application Exercise {0}? Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -rfb0f68987afeb70923fdfb61ed7b83718d378dd2 -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision fb0f68987afeb70923fdfb61ed7b83718d378dd2) +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision c7b53dd877e2de7f9efc231db3b07ad4379eae87) @@ -876,7 +876,8 @@ authoring.error.rat.not.blank = RAT Questions: There must be at least one question. authoring.template.basic.import.qti = Import IMS QTI authoring.tbl.use.noticeboard = Add Noticeboard after AE -authoring.create.application.exercise = Add new Application Exercise +authoring.create.application.exercise.assessment = Add new Assessment Application Exercise +authoring.create.application.exercise.doku = Add new doKumaran Application Exercise authoring.tbl.enable.confidence.tooltip = Asks students in the iRAT how confident they are with their chosen answer. Then the confidence level for each student is displayed in the tRAT to all members of their team. authoring.tbl.use.noticeboard.tooltip = After the AE, displays content to students as additional information or as a reflection on the AE topic. authoring.tbl.delete.appex.prompt = Do you want to delete the Application Exercise {0}? Index: lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java =================================================================== diff -u -r2bfac973532eed9a4d4f1611c920273684af2920 -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 --- lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision 2bfac973532eed9a4d4f1611c920273684af2920) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java (.../TBLTemplateController.java) (revision c7b53dd877e2de7f9efc231db3b07ad4379eae87) @@ -55,6 +55,7 @@ import org.lamsfoundation.lams.web.util.AttributeNames; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.JsonNodeFactory; @@ -787,9 +788,8 @@ // Create the application exercise form on the screen. Not in LdTemplateController as this is specific to TBL // and hence the jsp is in the tbl template folder, not the tool template folder @RequestMapping("/createApplicationExercise") - public String createApplicationExercise(HttpServletRequest request) { - request.setAttribute("appexNumber", WebUtil.readIntParam(request, "appexNumber")); - return "/authoring/template/tbl/appex"; + public String createApplicationExercise(@RequestParam String type) { + return "/authoring/template/tbl/appex" + (type.equals("doku") ? "Doku" : "Assessment"); } } Index: lams_central/web/authoring/template/tbl/appexAssessment.jsp =================================================================== diff -u -r395204f7decd3315a0c88b89f38e307289ea33f9 -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 --- lams_central/web/authoring/template/tbl/appexAssessment.jsp (.../appexAssessment.jsp) (revision 395204f7decd3315a0c88b89f38e307289ea33f9) +++ lams_central/web/authoring/template/tbl/appexAssessment.jsp (.../appexAssessment.jsp) (revision c7b53dd877e2de7f9efc231db3b07ad4379eae87) @@ -5,20 +5,22 @@ <%-- The title needs to look like an ordinary panel title, but be editable via the X-editable javascript. But that will not be returned to the server in the form data, so copy what appears in the displayed span to a hidden input field. --%> + + + divappex${appexNumber}TitleDisplay divappex${appexNumber}Title +
- - - - - - + + + +   +
+<%-- Application Exercise based on Dokumaran --%> + +<%-- The title needs to look like an ordinary panel title, but be editable via the X-editable javascript. + But that will not be returned to the server in the form data, so copy what appears in the displayed span to a hidden input field. --%> + + + + +divappex${param.appexNumber}TitleDisplay +divappex${param.appexNumber}Title + + +
+
+ + + + + + +    + + + + + +   + + + +
+ +
+
+ + +
+ +
+ + +
+ +
+
+ +
+
+ +
+
+
+ + + +
+ Index: lams_central/web/authoring/template/tbl/tbl.jsp =================================================================== diff -u -rdc69795e72d0acac1d536c7bec9c0c816b71d283 -rc7b53dd877e2de7f9efc231db3b07ad4379eae87 --- lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision dc69795e72d0acac1d536c7bec9c0c816b71d283) +++ lams_central/web/authoring/template/tbl/tbl.jsp (.../tbl.jsp) (revision c7b53dd877e2de7f9efc231db3b07ad4379eae87) @@ -77,14 +77,15 @@ initializeWizard(validator); }); - function createApplicationExercise() { - var numAppex = $('#numAppEx'); - var currNum = numAppex.val(); - var nextNum = +currNum + 1; - var newDiv = document.createElement("div"); + function createApplicationExercise(type) { + var numAppex = $('#numAppEx'), + currNum = numAppex.val(), + nextNum = +currNum + 1, + newDiv = document.createElement("div"); + newDiv.id = 'divappex'+nextNum; newDiv.className = 'panel panel-default'; - var url=getSubmissionURL()+"/createApplicationExercise.do?appexNumber="+nextNum; + var url=getSubmissionURL()+"/createApplicationExercise.do?appexNumber=" + nextNum + "&type=" + type + "&contentFolderID=${contentFolderID}"; $('#accordianAppEx').append(newDiv); $.ajaxSetup({ cache: true }); $(newDiv).load(url, function( response, status, xhr ) { @@ -315,10 +316,15 @@
1 - <%@ include file="appex.jsp" %> + <%@ include file="appexAssessment.jsp" %>
- + + + + + +