Merge remote-tracking branch 'origin/OpenOLAT_12.5' into OpenOLAT_13.2

src/main/java/org/olat/course/nodes/iq/IQConfigurationController.java

@@ -70,6 +70,7 @@ import org.olat.ims.qti21.QTI21Service;
 import org.olat.ims.qti21.model.InMemoryOutcomeListener;
 import org.olat.ims.qti21.ui.AssessmentTestDisplayController;
 import org.olat.ims.qti21.ui.QTI21OverrideOptions;
+import org.olat.ims.qti21.ui.event.RestartEvent;
 import org.olat.modules.ModuleConfiguration;
 import org.olat.modules.iq.IQManager;
 import org.olat.modules.iq.IQPreviewSecurityCallback;
@@ -326,6 +327,12 @@ public class IQConfigurationController extends BasicController {
 			if (event == Event.DONE_EVENT || event == Event.CHANGED_EVENT) {
 				fireEvent(urequest, NodeEditController.NODECONFIG_CHANGED_EVENT);
 			}
+		} else if(source == previewQTI21Ctrl) {
+			if(event instanceof RestartEvent) {
+				stackPanel.popContent();
+				cleanUpQti21PreviewSession();
+				doPreview(urequest);
+			}
 		}
 	}
 	
@@ -383,10 +390,10 @@ public class IQConfigurationController extends BasicController {
 	
 	private void doPreview(UserRequest ureq) {
 		removeAsListenerAndDispose(previewLayoutCtr);
+		removeAsListenerAndDispose(previewQTI21Ctrl);
 		
 		RepositoryEntry re = getIQReference();
 		if(re != null) {
-			Controller previewController;
 			if(QTIResourceTypeModule.isOnyxTest(re.getOlatResource())) {
 				showError("error.onyx");
 			} else if(ImsQTI21Resource.TYPE_NAME.equals(re.getOlatResource().getResourceableTypeName())) {
@@ -402,7 +409,7 @@ public class IQConfigurationController extends BasicController {
 				stackPanel.pushController(translate("preview"), previewQTI21Ctrl);
 			} else {
 				long courseResId = course.getResourceableId().longValue();
-				previewController = iqManager.createIQDisplayController(moduleConfiguration, new IQPreviewSecurityCallback(), ureq, getWindowControl(), courseResId, courseNode.getIdent(), null);
+				Controller previewController = iqManager.createIQDisplayController(moduleConfiguration, new IQPreviewSecurityCallback(), ureq, getWindowControl(), courseResId, courseNode.getIdent(), null);
 				previewLayoutCtr = new LayoutMain3ColsController(ureq, getWindowControl(), previewController);
 				stackPanel.pushController(translate("preview"), previewLayoutCtr);
 			}

src/main/java/org/olat/ims/qti21/ui/AssessmentTestDisplayController.java

@@ -1797,6 +1797,7 @@ public class AssessmentTestDisplayController extends BasicController implements
 		private AssessmentTestTimerFormItem timerEl;
 		private ProgressBarItem scoreProgress, questionProgress;
 		private FormLink endTestPartButton, closeTestButton, cancelTestButton, suspendTestButton, closeResultsButton;
+		private FormLink restartTest;
 		
 		private String menuWidth;
 		private boolean resultsVisible = false;
@@ -1866,6 +1867,11 @@ public class AssessmentTestDisplayController extends BasicController implements
 			closeResultsButton.setIconLeftCSS("o_icon o_icon-fw o_icon_qti_close_results");
 			closeResultsButton.setPrimary(true);
 			closeResultsButton.setVisible(false);
+			
+			restartTest = uifactory.addFormLink("restartTest", "assessment.test.restart.test", null, formLayout, Link.BUTTON);
+			restartTest.setTitle("assessment.test.restart.test.explanation");
+			restartTest.setElementCssClass("o_sel_restart_test");
+			restartTest.setVisible(false);
 
 			ResourceLocator fileResourceLocator = new PathResourceLocator(fUnzippedDirRoot.toPath());
 			final ResourceLocator inputResourceLocator = 
@@ -2050,6 +2056,8 @@ public class AssessmentTestDisplayController extends BasicController implements
 		protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
 			if(closeResultsButton == source) {
 				doCloseResults(ureq);
+			} else if(restartTest == source) {
+				restartTest(ureq);
 			} else if(!timeLimitBarrier(ureq)) {
 				if(endTestPartButton == source) {
 					doEndTestPart(ureq);
@@ -2181,7 +2189,6 @@ public class AssessmentTestDisplayController extends BasicController implements
 		 * @return true if the results are visible
 		 */
 		private boolean updateStatusAndResults(UserRequest ureq) {
-			//updateButtons();
 			resultsVisible = false;
 			if(testSessionController.getTestSessionState().isEnded()
 					&& deliveryOptions.isShowAssessmentResultsOnFinish()
@@ -2189,11 +2196,15 @@ public class AssessmentTestDisplayController extends BasicController implements
 					&& !deliveryOptions.getAssessmentResultsOptions().none()) {
 				removeAsListenerAndDispose(resultCtrl);
 				// show results in anonym mode to hide the user info table - user knows who he is (same as on test start page)
+				AssessmentTestSession candidateSession = AssessmentTestDisplayController.this.getCandidateSession();
 				resultCtrl = new AssessmentResultController(ureq, getWindowControl(), assessedIdentity, true,
-						AssessmentTestDisplayController.this.getCandidateSession(),
-						fUnzippedDirRoot, mapperUri, null, deliveryOptions.getAssessmentResultsOptions(), false, true, true);
+						candidateSession, fUnzippedDirRoot, mapperUri, null,
+						deliveryOptions.getAssessmentResultsOptions(), false, true, true);
 				listenTo(resultCtrl);
 				flc.add("qtiResults", resultCtrl.getInitialFormItem());
+				if(candidateSession.isAuthorMode()) {
+					restartTest.setVisible(true);
+				}
 				resultsVisible = true;
 			}
 			

src/main/java/org/olat/ims/qti21/ui/_content/at_run.html

@@ -58,7 +58,11 @@
 		<div id="o_main_center">
 			<a id="o_content"></a>
 			<div id="o_main_center_content" class="clearfix o_scrollblock">
-		       	<div id="o_main_center_content_inner">$r.render("qtiResults")</div>
+		       	<div id="o_main_center_content_inner">$r.render("qtiResults")
+		       	#if($r.visible("restartTest"))
+		       		<div class="o_button_group">$r.render("restartTest")</div>
+		       	#end
+		       	</div>
 			</div>
 		</div>
 	#elseif($r.visible("qtitree"))