Merge OpenOLAT 12.4 to OpenOLAT default branch with 6f2f3e4bf130a11ae714f14a7808587de0215860

src/main/java/org/olat/NewControllerFactory.java

@@ -108,7 +108,7 @@ public class NewControllerFactory {
 		ContextEntryControllerCreator oldCreator = contextEntryControllerCreators.get(key);
 		contextEntryControllerCreators.put(key, controllerCreator);
 		// Add config logging to console
-		log.info("Adding context entry controller creator for key::" + key + " and value::" + controllerCreator.getClass().getCanonicalName() 
+		log.debug("Adding context entry controller creator for key::" + key + " and value::" + controllerCreator.getClass().getCanonicalName() 
 				+ (oldCreator == null ? "" : " replaceing existing controller creator ::" + oldCreator.getClass().getCanonicalName()), null);
 	}
 

src/main/java/org/olat/_spring/extensionContext.xml

@@ -87,7 +87,7 @@
 	<!-- The e-Assessment parent node -->
 	<bean class="org.olat.core.extensions.action.GenericActionExtension"  init-method="initExtensionPoints">
 		<property name="order" value="7420" />
-		<property name="navigationKey" value="modules" />
+		<property name="navigationKey" value="eassessment" />
 		<property name="nodeIdentifierIfParent" value="eAssessmentParent" />
 		<property name="translationPackage" value="org.olat.admin" />
 		<property name="i18nActionKey" value="menu.eassessment" />

src/main/java/org/olat/core/configuration/AbstractSpringModule.java

@@ -28,6 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import org.olat.core.gui.control.Event;
 import org.olat.core.logging.OLog;
 import org.olat.core.logging.Tracing;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.coordinate.CoordinatorManager;
 import org.olat.core.util.event.GenericEventListener;
 import org.springframework.beans.factory.DisposableBean;
@@ -99,6 +100,9 @@ public abstract class AbstractSpringModule implements GenericEventListener, Init
 
 	@Override
 	public void afterPropertiesSet()  {
+		if (!StringHelper.containsNonWhitespace(userDataDirectory)) {
+			userDataDirectory = System.getProperty("java.io.tmpdir") + "/olatdata";
+		}
 		moduleConfigProperties.setUserDataDirectory(userDataDirectory);
 		moduleConfigProperties.init();
 		initDefaultProperties();

src/main/java/org/olat/core/extensions/ExtManager.java

@@ -162,7 +162,7 @@ public class ExtManager extends LogDelegator {
 		for (Extension extension : extensionValues) {
 			if (!extension.isEnabled()) {
 				count_disabled++;
-				logInfo("* Disabled Extension got loaded :: " + extension + ".  Check that you don't use it or that extension returns null for getExtensionFor() when disabled, resp. overwrite isEnabled().",null);
+				logDebug("* Disabled Extension got loaded :: " + extension + ".  Check that you don't use it or that extension returns null for getExtensionFor() when disabled, resp. overwrite isEnabled().",null);
 			}
 			int orderKey = extension.getOrder();
 			

src/main/java/org/olat/course/assessment/ui/tool/ElementToReviewCellRenderer.java

@@ -54,7 +54,7 @@ public class ElementToReviewCellRenderer implements FlexiCellRenderer {
 			List<String> elements = rowToReview.getSubIndents();
 			if(elements.size() == 1) {
 				String msg = nodeIdentToNodeShortTitles.get(elements.get(0));
-				target.append(msg);
+				target.append(msg != null ? msg : "");
 			} else {
 				String msg = translator.translate("elements.to.review", new String[]{ Integer.toString(elements.size()) });
 				target.append("<i class='o_icon o_icon_important'> </i> ");

src/main/java/org/olat/ims/qti/qpool/QTI12ItemFactory.java

@@ -44,6 +44,11 @@ public class QTI12ItemFactory implements QItemFactory {
 	public QTI12ItemFactory(Type type) {
 		this.type = type;
 	}
+	
+	@Override
+	public String getType() {
+		return "qti12_".concat(type.name());
+	}
 
 	@Override
 	public String getLabel(Locale locale) {
@@ -61,8 +66,7 @@ public class QTI12ItemFactory implements QItemFactory {
 	@Override
 	public QuestionItem createItem(Identity owner, String title, Locale locale) {
 		QTIQPoolServiceProvider spi = CoreSpringFactory.getImpl(QTIQPoolServiceProvider.class);
-		QuestionItem newItem = spi.createItem(owner, type, title, locale);
-		return newItem;
+		return spi.createItem(owner, type, title, locale);
 	}
 	
 	public enum Type {

src/main/java/org/olat/ims/qti21/pool/QTI21AssessmentItemFactory.java

@@ -43,6 +43,11 @@ public class QTI21AssessmentItemFactory implements QItemFactory {
 	public QTI21AssessmentItemFactory(QTI21QuestionType type) {
 		this.type = type;
 	}
+	
+	@Override
+	public String getType() {
+		return "qti21_".concat(type.name());
+	}
 
 	@Override
 	public String getLabel(Locale locale) {

src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityAssessmentItemController.java

@@ -159,6 +159,13 @@ public class CorrectionIdentityAssessmentItemController extends FormBasicControl
 	protected void doDispose() {
 		//
 	}
+	
+	@Override
+	protected boolean validateFormLogic(UserRequest ureq) {
+		boolean allOk = super.validateFormLogic(ureq);
+		allOk &= identityInteractionsCtrl.validateFormLogic(ureq);
+		return allOk;
+	}
 
 	@Override
 	protected void formOK(UserRequest ureq) {
@@ -175,13 +182,17 @@ public class CorrectionIdentityAssessmentItemController extends FormBasicControl
 	@Override
 	protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
 		if(saveNextQuestionButton == source) {
-			doSave();
-			fireEvent(ureq, Event.CHANGED_EVENT);
-			fireEvent(ureq, new NextAssessmentItemEvent());
+			if(identityInteractionsCtrl.validateFormLogic(ureq)) {
+				doSave();
+				fireEvent(ureq, Event.CHANGED_EVENT);
+				fireEvent(ureq, new NextAssessmentItemEvent());
+			}
 		} else if(saveBackOverviewButton == source) {
-			doSave();
-			fireEvent(ureq, Event.CHANGED_EVENT);
-			fireEvent(ureq, Event.BACK_EVENT);
+			if(identityInteractionsCtrl.validateFormLogic(ureq)) {
+				doSave();
+				fireEvent(ureq, Event.CHANGED_EVENT);
+				fireEvent(ureq, Event.BACK_EVENT);
+			}
 		} else {
 			super.formInnerEvent(ureq, source, event);
 		}

src/main/java/org/olat/ims/qti21/ui/assessment/CorrectionIdentityInteractionsController.java

@@ -419,10 +419,13 @@ public class CorrectionIdentityInteractionsController extends FormBasicControlle
 		
 		el.clearError();
 		if(StringHelper.containsNonWhitespace(el.getValue())) {
-			Double minScore = QtiNodesExtractor.extractMinScore(assessmentItem);
-			Double maxScore = QtiNodesExtractor.extractMaxScore(assessmentItem);
-			
 			try {
+				// check with the parse algorithm of BigDecimal first
+				new BigDecimal(el.getValue()).doubleValue();
+
+				Double minScore = QtiNodesExtractor.extractMinScore(assessmentItem);
+				Double maxScore = QtiNodesExtractor.extractMaxScore(assessmentItem);
+					
 				double score = parseDouble(el);
 				boolean boundariesOk = true;
 				if(minScore != null && score < minScore.doubleValue()) {
@@ -439,6 +442,7 @@ public class CorrectionIdentityInteractionsController extends FormBasicControlle
 				}
 				allOk &= boundariesOk;
 			} catch (NumberFormatException e) {
+				logWarn("Cannot parse the score: " + el.getValue(), null);
 				el.setErrorKey("error.double.format", null);
 				allOk &= false;
 			}

src/main/java/org/olat/modules/portfolio/ui/TableOfContentController.java

@@ -171,7 +171,9 @@ public class TableOfContentController extends BasicController implements TooledC
 	}
 	
 	void updateSummaryView(UserRequest ureq) {
-		summaryCtrl.reload(ureq);
+		if(summaryCtrl != null) {
+			summaryCtrl.reload(ureq);
+		}
 	}
 	
 	private String getGuiPrefsKey(OLATResourceable binderOres) {

src/main/java/org/olat/modules/qpool/QItemFactory.java

@@ -31,6 +31,8 @@ import org.olat.core.id.Identity;
  */
 public interface QItemFactory {
 	
+	public String getType();
+	
 	public String getLabel(Locale locale);
 	
 	public QuestionItem createItem(Identity owner, String title, Locale locale);

src/main/java/org/olat/modules/qpool/site/QuestionPoolSite.java

@@ -67,8 +67,7 @@ public class QuestionPoolSite extends AbstractSiteInstance {
 		OLATResourceable ores = OresHelper.createOLATResourceableInstance("QPool", 0l);
 		ThreadLocalUserActivityLogger.addLoggingResourceInfo(LoggingResourceable.wrapBusinessPath(ores));
 		WindowControl bwControl = BusinessControlFactory.getInstance().createBusinessWindowControl(ureq, ores, new StateSite(this), wControl, true);
-		MainLayoutController c = new QuestionPoolSiteMainController(ureq, bwControl);
-		return c;
+		return new QuestionPoolSiteMainController(ureq, bwControl);
 	}
 	
 	@Override

src/main/java/org/olat/modules/qpool/ui/NewItemOptionsController.java

@@ -85,8 +85,10 @@ public class NewItemOptionsController extends FormBasicController {
 	
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_new_item_form");
 		//title
 		titleEl = uifactory.addTextElement("general.title", "general.title", 128, "", formLayout);
+		titleEl.setElementCssClass("o_sel_item_title");
 
 		//type
 		List<QItemFactory> factories = new ArrayList<>();
@@ -100,7 +102,7 @@ public class NewItemOptionsController extends FormBasicController {
 		String[] typeKeys = new String[factories.size()];
 		String[] valueKeys = new String[factories.size()];
 		for(QItemFactory factory:factories) {
-			String typeKey = "item.type." + count;
+			String typeKey = factory.getType();
 			typeKeys[count] = typeKey;
 			keyToFactoryMap.put(typeKey, factory);
 			valueKeys[count] = factory.getLabel(getLocale());
@@ -108,6 +110,7 @@ public class NewItemOptionsController extends FormBasicController {
 		}
 
 		typeEl = uifactory.addDropdownSingleselect("question.type", "menu.admin.types", formLayout, typeKeys, valueKeys, null);
+		typeEl.setElementCssClass("o_sel_item_type");
 		
 		//subject
 		taxonomyLevelEl = uifactory.addDropdownSingleselect("process.start.review.taxonomy.level", formLayout,
@@ -121,6 +124,7 @@ public class NewItemOptionsController extends FormBasicController {
 			}
 		}
 		taxonomyLevelEl.setVisible(qPoolSecurityCallback.canUseTaxonomy());
+		taxonomyLevelEl.setElementCssClass("o_sel_item_taxonomy_level");
 		
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		buttonLayout.setRootForm(mainForm);

src/main/java/org/olat/modules/qpool/ui/QuestionPoolMainEditorController.java

@@ -117,6 +117,7 @@ public class QuestionPoolMainEditorController extends BasicController implements
 		
 		content = new Panel("list");
 		columnLayoutCtr = new LayoutMain3ColsController(ureq, getWindowControl(), menuTree, content, "qpool");
+		columnLayoutCtr.addCssClassToMain("o_qpool");
 		
 		doSelectControllerTreeNode(ureq, treeModel.getMyNode(), null, null);
 		putInitialPanel(columnLayoutCtr.getInitialComponent());

src/main/java/org/olat/modules/qpool/ui/ReviewController.java

@@ -56,6 +56,7 @@ public class ReviewController extends FormBasicController {
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		setFormDescription("process.rating.description");
+		formLayout.setElementCssClass("o_sel_qpool_review_form");
 		
 		ratingEl = uifactory.addRatingItem("process.rating", "process.rating", 0f, 5, true, formLayout);
 		

src/main/java/org/olat/modules/qpool/ui/ReviewStartController.java

@@ -66,6 +66,7 @@ public class ReviewStartController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_confirm_start_form");
 		setFormDescription("process.start.review.description", new String[] {item.getTitle()});
 		
 		qpoolTaxonomyTreeBuilder.loadTaxonomyLevelsSelection(getIdentity(), false, ignoreCompetences);

src/main/java/org/olat/modules/qpool/ui/admin/QuestionPoolAdminConfigurationController.java

@@ -103,6 +103,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
 		FormLayoutContainer moduleCont = FormLayoutContainer.createDefaultFormLayout("module", getTranslator());
+		moduleCont.setElementCssClass("o_sel_qpool_configuration");
 		moduleCont.setFormTitle(translate("admin.configuration.title"));
 		moduleCont.setRootForm(mainForm);
 		formLayout.add("module", moduleCont);
@@ -110,6 +111,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 		String[] onValues = new String[] { translate("on") };
 		reviewProcessEnabledEl = uifactory.addCheckboxesHorizontal("review.process.enabled", moduleCont, onKeys, onValues);
 		reviewProcessEnabledEl.addActionListener(FormEvent.ONCHANGE);
+		reviewProcessEnabledEl.setElementCssClass("o_sel_qpool_review_process");
 		if (qpoolModule.isReviewProcessEnabled()) {
 			reviewProcessEnabledEl.select(onKeys[0], true);
 		}
@@ -196,6 +198,7 @@ public class QuestionPoolAdminConfigurationController extends FormBasicControlle
 		poolManagerRightsEl.select(POOL_MANAGER_EDUCATIONAL_CONTEXT, qpoolModule.isPoolAdminAllowedToConfigEducationalContext());
 		
 		FormLayoutContainer buttonsWrapperCont = FormLayoutContainer.createDefaultFormLayout("global", getTranslator());
+		buttonsWrapperCont.setElementCssClass("o_sel_qpool_buttons");
 		buttonsWrapperCont.setRootForm(mainForm);
 		formLayout.add("buttonsWrapper", buttonsWrapperCont);
 		FormLayoutContainer buttonsCont = FormLayoutContainer.createButtonLayout("buttons", getTranslator());

src/main/java/org/olat/modules/qpool/ui/admin/ReviewProcessActivationController.java

@@ -51,10 +51,12 @@ public class ReviewProcessActivationController extends FormBasicController {
 	
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_reset_status_form");
 		uifactory.addStaticTextElement("description", "", translate("review.process.confirm.enable.description"), formLayout);
 		
 		String[] resetValues = new String[] { translate("reset.status") };
 		resetStatusaEl = uifactory.addCheckboxesHorizontal("reset.status", "", formLayout, resetKeys, resetValues);
+		resetStatusaEl.setElementCssClass("o_sel_qpool_reset_status");
 		
 		FormLayoutContainer buttonLayout = FormLayoutContainer.createButtonLayout("buttons", getTranslator());
 		formLayout.add("buttons", buttonLayout);

src/main/java/org/olat/modules/qpool/ui/admin/ReviewProcessAdminController.java

@@ -67,6 +67,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 
 	@Override
 	protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
+		formLayout.setElementCssClass("o_sel_qpool_review_process_admin");
 		setFormTitle("admin.review.process.title");
 		
 		// decision provider
@@ -98,6 +99,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 		
 		String numberOfRatings = Integer.toString(qpoolModule.getReviewDecisionNumberOfRatings());
 		numberOfRatingsEl = uifactory.addTextElement("number.of.ratings", 5, numberOfRatings, formLayout);
+		numberOfRatingsEl.setElementCssClass("o_sel_qpool_num_of_reviews");
 		numberOfRatingsEl.setMandatory(true);
 		numberOfRatingsEl.setDisplaySize(5);
 
@@ -112,6 +114,7 @@ public class ReviewProcessAdminController extends FormBasicController {
 				translate(FINAL_VISIBILITY_MANAGER),
 				translate(FINAL_VISIBILITY_MANAGER_TEACHER)};
 		finalVisibilityEl = uifactory.addDropdownSingleselect("final.visibility", formLayout, finalVisibilityKeys, finalVisibilityValues);
+		finalVisibilityEl.setElementCssClass("o_sel_qpool_final_visibility");
 		String selectedKey = qpoolModule.isFinalVisibleTeach()? FINAL_VISIBILITY_MANAGER_TEACHER: FINAL_VISIBILITY_MANAGER;
 		finalVisibilityEl.select(selectedKey, true);
 

src/main/java/org/olat/modules/qpool/ui/tree/QuestionPoolMenuTreeModel.java

@@ -295,6 +295,7 @@ public class QuestionPoolMenuTreeModel extends GenericTreeModel implements DnDTr
 		if(!taxonomyLevels.isEmpty()) {
 			reviewNode = new GenericTreeNode(translator.translate("menu.review"));
 			reviewNode.setTitle(translator.translate("menu.review"));
+			reviewNode.setCssClass("o_sel_qpool_review_taxonomy_levels");
 			rootNode.addChild(reviewNode);
 			
 			for(TaxonomyLevel taxonomyLevel:taxonomyLevels) {