OLAT-6169 improve form validation

--HG--
branch : uzhFixes711

olat3/webapp/WEB-INF/src/org/olat/portfolio/model/restriction/CollectRestriction.java

@@ -21,6 +21,7 @@
 package org.olat.portfolio.model.restriction;
 
 import org.olat.core.commons.persistence.PersistentObject;
+import org.olat.core.util.StringHelper;
 
 /** 
  * Description:<br>
@@ -129,4 +130,19 @@ public class CollectRestriction extends PersistentObject {
 		}
 		return false;
 	}
+
+	/**
+	 * @see org.olat.core.commons.persistence.PersistentObject#toString()
+	 */
+	@Override
+	public String toString() {
+		return "key: " + getKey() + " Restriction: " + getRestriction() + " amount: " + getAmount() + " of type: " + getArtefactType();
+	}
+	
+	// basic check for validity. do not save invalid restrictions!
+	public boolean isValid(){
+		if (StringHelper.containsNonWhitespace(getRestriction()) && StringHelper.containsNonWhitespace(getArtefactType()) && getAmount() > 0) return true; 
+		return false;
+	}
+	
 }

olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/edit/EPStructureDetailsController.java

@@ -253,14 +253,16 @@ public class EPStructureDetailsController extends FormBasicController {
 				}				
 				usedTypes.add(restriction.getArtefactType());
 				
-				if (!(StringHelper.containsNonWhitespace(restriction.getRestriction())
-						&& StringHelper.containsNonWhitespace(restriction.getArtefactType()) && restriction.getAmount() > 0)) {
+				boolean hasRestriction = StringHelper.containsNonWhitespace(restriction.getRestriction());
+				boolean hasArtType = StringHelper.containsNonWhitespace(restriction.getArtefactType());
+				boolean hasAmount = restriction.getAmount() > 0;
+				boolean isValid = restriction.isValid();
+				if (!isValid && (hasRestriction || hasArtType || hasAmount)) {
 					StaticTextElement thisErrorEl = errorElements.get(i);
 					thisErrorEl.setVisible(true);
 					thisErrorEl.setValue(translate("collect.restriction.incomplete"));
 					hasError = true;
 				}
-
 				i++;
 			}
 			return !hasError;			
@@ -290,10 +292,7 @@ public class EPStructureDetailsController extends FormBasicController {
 			setCollectRestrictions();
 			for(SingleSelection restrictionElement:restrictionElements) {
 				CollectRestriction restriction = (CollectRestriction)restrictionElement.getUserObject();
-				if(StringHelper.containsNonWhitespace(restriction.getRestriction()) &&
-					 StringHelper.containsNonWhitespace(restriction.getArtefactType()) &&
-					 restriction.getAmount() >= 0) {
-					
+				if(restriction.isValid()) {					
 					CollectRestriction cr = new CollectRestriction(restriction);
 					editStructure.getCollectRestrictions().add(cr);
 				}
@@ -324,32 +323,25 @@ public class EPStructureDetailsController extends FormBasicController {
 	}
 	
 	protected void setCollectRestrictions() {
-		if(restrictionElements == null || restrictionElements.isEmpty()) {
-			return;
-		}
-		
-		for(int i=0; i<restrictionElements.size(); i++) {
+		if (restrictionElements == null || restrictionElements.isEmpty()) { return; }
+
+		for (int i = 0; i < restrictionElements.size(); i++) {
 			SingleSelection restrictionElement = restrictionElements.get(i);
 			SingleSelection restrictToArtefactElement = restrictToArtefactElements.get(i);
+			TextElement amountElement = amountElements.get(i);
 			
-			if(restrictionElement.getSelected() > 0 || restrictToArtefactElement.getSelected() > 0) {
-				TextElement amountElement = amountElements.get(i);
-				CollectRestriction cr = (CollectRestriction)restrictionElement.getUserObject();
-				String restriction = restrictionElement.getSelectedKey();
-				String artefactType = restrictToArtefactElement.getSelectedKey();
-				String amount = amountElement.getValue();
-				if(StringHelper.containsNonWhitespace(restriction)) {
-					cr.setRestriction(restriction);
-				}
-				if(StringHelper.containsNonWhitespace(artefactType)) {
-					cr.setArtefactType(artefactType);
-				}
-				if(StringHelper.containsNonWhitespace(amount)) {
-					try {
-						cr.setAmount(Integer.parseInt(amount));
-					} catch (NumberFormatException e) {
-						logWarn("Wrong format for number", e);
-					}
+			CollectRestriction cr = (CollectRestriction) restrictionElement.getUserObject();
+			String restriction = restrictionElement.getSelectedKey();
+			String artefactType = restrictToArtefactElement.getSelectedKey();
+			String amount = amountElement.getValue();
+			
+			cr.setRestriction(restriction);
+			cr.setArtefactType(artefactType);			
+			if (StringHelper.containsNonWhitespace(amount)) {
+				try {
+					cr.setAmount(Integer.parseInt(amount));
+				} catch (NumberFormatException e) {
+					logWarn("Wrong format for number", e);
 				}
 			}
 		}