Merge OpenOLAT 11.5 to OpenOLAT 12.0 with e308ce42c58aac22c3dbf4c38065c29328947df8

src/main/java/org/olat/ims/qti21/ui/editor/interactions/MatchScoreController.java

@@ -38,6 +38,7 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
 import org.olat.core.gui.control.Controller;
 import org.olat.core.gui.control.WindowControl;
 import org.olat.core.util.CodeHelper;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.Util;
 import org.olat.course.assessment.AssessmentHelper;
 import org.olat.ims.qti21.model.xml.AssessmentHtmlBuilder;
@@ -215,9 +216,23 @@ public class MatchScoreController extends AssessmentItemRefEditorController impl
 		allOk &= validateDouble(maxScoreEl);
 
 		if(assessmentModeEl.isOneSelected() && assessmentModeEl.isSelected(1)) {
-			/*for(HotspotChoiceWrapper wrapper:wrappers) {
-				allOk &= validateDouble(wrapper.getPointsEl());
-			}*/
+			for(Map.Entry<DirectedPairValue, MatchScoreWrapper> entry:scoreWrappers.entrySet()) {
+				MatchScoreWrapper scoreWrapper = entry.getValue();
+				TextElement scoreEl = scoreWrapper.getScoreEl();
+				String val = scoreEl.getValue();
+				scoreEl.clearError();
+				if(StringHelper.containsNonWhitespace(val)) {
+					try {
+						Double.parseDouble(val);
+					} catch (NumberFormatException e) {
+						scoreEl.setErrorKey("error.double", null);
+						allOk &= false;
+					}
+				} else {
+					scoreEl.setErrorKey("form.legende.mandatory", null);
+					allOk &= false;
+				}
+			}
 		}
 		
 		return allOk & super.validateFormLogic(ureq);

src/main/java/org/olat/ims/qti21/ui/editor/interactions/_content/match_score.html

@@ -19,6 +19,9 @@
 				#if(${scoreWrapper.isCorrect()})
 					<i class=" o_icon o_icon-lg o_icon_accept"> </i>
 				#end
+				#if($f.hasError("${sourceChoice.getChoiceIdentifier().toString()}-${targetChoice.getChoiceIdentifier().toString()}"))
+					<div>$r.render("${sourceChoice.getChoiceIdentifier().toString()}-${targetChoice.getChoiceIdentifier().toString()}_ERROR")</div>
+				#end
 				</td>
 			#end
 		</tr>

src/main/java/org/olat/modules/portfolio/ui/media/CollectCitationMediaController.java

 /**
+
  * <a href="http://www.openolat.org">
  * OpenOLAT - Online Learning and Training</a><br>
  * <p>
@@ -112,6 +113,10 @@ public class CollectCitationMediaController extends FormBasicController implemen
 		businessPath = media.getBusinessPath();
 		mediaReference = media;
 		
+		if(StringHelper.containsNonWhitespace(mediaReference.getMetadataXml())) {
+			citation = (CitationXml)MetadataXStream.get().fromXML(mediaReference.getMetadataXml());
+		}
+		
 		List<Category> categoryList = portfolioService.getCategories(media);
 		for(Category category:categoryList) {
 			categories.put(category.getName(), category.getName());