Changes to add new test functionality with export

Author: Naidile-P-N

src/main/java/de/imi/mopat/controller/SurveyController.java

@@ -1186,6 +1186,7 @@ public String showQuestionnaireScheduled(
     @ResponseBody
     public void finishQuestionnaire(
         @RequestParam(value = "questionnaireId", required = true) final Long questionnaireId,
+        @RequestParam(value = "performExportTest", required = false, defaultValue = "false") final Boolean performExportTest,
         @RequestBody final EncounterDTO encounterDTO) {
         if (!encounterDTO.getIsTest()) {
 

src/main/webapp/WEB-INF/bundle/list.html

@@ -146,6 +146,19 @@
 										>
 										</i>
 									</a>
+									<th:block sec:authorize="hasRole('ROLE_ADMIN')">
+										<a
+												class="link"
+												th:href="@{/mobile/survey/test(id=${item.id},performExportTest=${true})}"
+												th:if="${item.isPublished == false && item.getBundleQuestionnaires().isEmpty() == false}"
+										>
+											<i
+													class="bi-play-fill"
+													th:title="${messages.get(#locale, 'bundle.button.test', 'Test Bundle')}"
+											>
+											</i>
+										</a>
+									</th:block>
 									<a
 										th:if="${item.isPublished == true && item.isModifiable() == true}"
 										class="link"
@@ -201,7 +214,14 @@
 												th:href="@{fill?id=__${item.id}__}"
 												th:text="${messages.get(#locale, 'bundle.button.edit', 'Edit')}"
 											></a>
-
+											<th:block sec:authorize="hasRole('ROLE_ADMIN')">
+											<a
+													th:if="${item.isPublished == false && item.getBundleQuestionnaires().isEmpty() == false}"
+													class="link"
+													th:href="@{/mobile/survey/test(id=${item.id},performExportTest=${true})}"
+													th:text="${messages.get(#locale, 'bundle.button.test', 'Test Bundle')}"
+											></a>
+											</th:block>
 											<a
 												th:if="${item.isPublished == true && item.isModifiable() == true}"
 												class="link"

src/main/webapp/WEB-INF/mobile/survey/bundleTest.html

@@ -19,6 +19,11 @@
 					name="bundleId"
 					th:value="${encounter?.getBundle()?.getId()}"
 				/>
+				<input
+						type="hidden"
+						name="performExportTest"
+						th:value="${performExportTest}"
+				/>
 				<addVar
 					layout:replace="~{helper/var :: add(
                         key='hasActiveQuestionnaire', 

src/main/webapp/WEB-INF/mobile/survey/questionnaire.html

@@ -218,6 +218,11 @@
 		var defaultLanguage =
 			/*[[${configurationDao?.defaultLanguage != null} ? ${configurationDao.defaultLanguage} : 'en_GB']]*/ "en_GB";
 
+		/*[- Get the performExportTest flag. Variable is used in survey.js -]*/
+		var performExportTest =
+				/*[[${performExportTest != null ? performExportTest : false}]]*/ false;
+
+
 		/*[- Merge the JSON String into the Encounter object, and perform a deep copy (first parameter). -]*/
 		var encounter = $.extend(
 			true,

src/main/webapp/js/mobile/survey/survey.js

@@ -934,7 +934,7 @@ function getIncompleteQuestionsCountFromQuestionnaire(questionnaire) {
  * to redirect to the start page. If it is <code>false</code>, nothing will happen.
  */
 function postEncounter(encounter, finalSubmit) {
-    if (encounter.isTest === true) {
+    if (encounter.isTest === true && performExportTest === true) {
         if (finalSubmit) {
             var data = ["bundle"];
             $.ajax({
@@ -1059,7 +1059,7 @@ function exportEncounter(encounter, questionnaireId) {
     }
 
     $.ajax({
-        url: "finishQuestionnaire?questionnaireId=" + questionnaireId,
+        url: "finishQuestionnaire?questionnaireId=" + questionnaireId + "&performExportTest="+performExportTest,
         type: "POST",
         contentType: "application/json; charset=utf-8",
         // Exclude the bundle object