Skip to content
Snippets Groups Projects
Commit 8e46d8f5 authored by srosse's avatar srosse
Browse files

OO-2259: save the abstract settings (attempts), validate max score...

parent 7b511bec
No related branches found
No related tags found
No related merge requests found
...@@ -77,10 +77,21 @@ public class MinimalScoreController extends AssessmentItemRefEditorController { ...@@ -77,10 +77,21 @@ public class MinimalScoreController extends AssessmentItemRefEditorController {
uifactory.addFormSubmitButton("submit", buttonsContainer); uifactory.addFormSubmitButton("submit", buttonsContainer);
} }
@Override
protected boolean validateFormLogic(UserRequest ureq) {
boolean allOk = true;
allOk &= validateDouble(maxScoreEl);
return allOk & super.validateFormLogic(ureq);
}
@Override @Override
protected void formOK(UserRequest ureq) { protected void formOK(UserRequest ureq) {
if(restrictedEdit) return; if(restrictedEdit) return;
super.formOK(ureq);
String maxScoreValue = maxScoreEl.getValue(); String maxScoreValue = maxScoreEl.getValue();
Double maxScore = Double.parseDouble(maxScoreValue); Double maxScore = Double.parseDouble(maxScoreValue);
itemBuilder.setMaxScore(maxScore); itemBuilder.setMaxScore(maxScore);
......
...@@ -105,6 +105,30 @@ public abstract class AssessmentItemRefEditorController extends FormBasicControl ...@@ -105,6 +105,30 @@ public abstract class AssessmentItemRefEditorController extends FormBasicControl
return allOk & super.validateFormLogic(ureq); return allOk & super.validateFormLogic(ureq);
} }
/**
* This validate a mandatory double
* @param el
* @return
*/
protected boolean validateDouble(TextElement el) {
boolean allOk = true;
String value = el.getValue();
el.clearError();
if(!StringHelper.containsNonWhitespace(value)) {
el.setErrorKey("form.legende.mandatory", null);
allOk &= false;
} else {
try {
Double.parseDouble(value);
} catch (NumberFormatException e) {
el.setErrorKey("error.double", null);
allOk &= false;
}
}
return allOk;
}
@Override @Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) { protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
if(limitAttemptsEl == source) { if(limitAttemptsEl == source) {
......
...@@ -33,7 +33,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer; ...@@ -33,7 +33,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller; import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.Formatter; import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util; import org.olat.core.util.Util;
import org.olat.core.util.filter.FilterFactory; import org.olat.core.util.filter.FilterFactory;
import org.olat.ims.qti21.model.xml.AssessmentHtmlBuilder; import org.olat.ims.qti21.model.xml.AssessmentHtmlBuilder;
...@@ -184,24 +183,6 @@ public class ChoiceScoreController extends AssessmentItemRefEditorController imp ...@@ -184,24 +183,6 @@ public class ChoiceScoreController extends AssessmentItemRefEditorController imp
return allOk & super.validateFormLogic(ureq); return allOk & super.validateFormLogic(ureq);
} }
private boolean validateDouble(TextElement el) {
boolean allOk = true;
String value = el.getValue();
if(!StringHelper.containsNonWhitespace(value)) {
el.setErrorKey("form.legende.mandatory", null);
allOk &= false;
} else {
try {
Double.parseDouble(value);
} catch (NumberFormatException e) {
el.setErrorKey("error.double", null);
allOk &= false;
}
}
return allOk;
}
@Override @Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) { protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
......
...@@ -32,7 +32,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent; ...@@ -32,7 +32,6 @@ import org.olat.core.gui.components.form.flexible.impl.FormEvent;
import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer; import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer;
import org.olat.core.gui.control.Controller; import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util; import org.olat.core.util.Util;
import org.olat.ims.qti21.model.xml.AssessmentItemBuilder; import org.olat.ims.qti21.model.xml.AssessmentItemBuilder;
import org.olat.ims.qti21.model.xml.ScoreBuilder; import org.olat.ims.qti21.model.xml.ScoreBuilder;
...@@ -177,24 +176,6 @@ public class FIBScoreController extends AssessmentItemRefEditorController implem ...@@ -177,24 +176,6 @@ public class FIBScoreController extends AssessmentItemRefEditorController implem
return allOk & super.validateFormLogic(ureq); return allOk & super.validateFormLogic(ureq);
} }
private boolean validateDouble(TextElement el) {
boolean allOk = true;
String value = el.getValue();
if(!StringHelper.containsNonWhitespace(value)) {
el.setErrorKey("form.legende.mandatory", null);
allOk &= false;
} else {
try {
Double.parseDouble(value);
} catch (NumberFormatException e) {
el.setErrorKey("error.double", null);
allOk &= false;
}
}
return allOk;
}
@Override @Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) { protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
...@@ -208,6 +189,7 @@ public class FIBScoreController extends AssessmentItemRefEditorController implem ...@@ -208,6 +189,7 @@ public class FIBScoreController extends AssessmentItemRefEditorController implem
protected void formOK(UserRequest ureq) { protected void formOK(UserRequest ureq) {
if(restrictedEdit) return; if(restrictedEdit) return;
super.formOK(ureq);
String maxScoreValue = maxScoreEl.getValue(); String maxScoreValue = maxScoreEl.getValue();
Double maxScore = Double.parseDouble(maxScoreValue); Double maxScore = Double.parseDouble(maxScoreValue);
itemBuilder.setMaxScore(maxScore); itemBuilder.setMaxScore(maxScore);
......
...@@ -255,24 +255,6 @@ public class HotspotChoiceScoreController extends AssessmentItemRefEditorControl ...@@ -255,24 +255,6 @@ public class HotspotChoiceScoreController extends AssessmentItemRefEditorControl
return allOk & super.validateFormLogic(ureq); return allOk & super.validateFormLogic(ureq);
} }
private boolean validateDouble(TextElement el) {
boolean allOk = true;
String value = el.getValue();
if(!StringHelper.containsNonWhitespace(value)) {
el.setErrorKey("form.legende.mandatory", null);
allOk &= false;
} else {
try {
Double.parseDouble(value);
} catch (NumberFormatException e) {
el.setErrorKey("error.double", null);
allOk &= false;
}
}
return allOk;
}
@Override @Override
protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) { protected void formInnerEvent(UserRequest ureq, FormItem source, FormEvent event) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment