From c138742fbbf6cdee84c96bfad95874ad9626e530 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Mon, 11 Jul 2016 18:24:09 +0200
Subject: [PATCH] OO-2101 improve error messages in assessment mode
---
.../assessment/ui/AssessmentModeGuardController.java | 7 ++++++-
.../course/assessment/ui/_i18n/LocalStrings_de.properties | 2 ++
.../course/assessment/ui/_i18n/LocalStrings_en.properties | 2 ++
3 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/course/assessment/ui/AssessmentModeGuardController.java b/src/main/java/org/olat/course/assessment/ui/AssessmentModeGuardController.java
index a07ad78fc63..06151d92d69 100644
--- a/src/main/java/org/olat/course/assessment/ui/AssessmentModeGuardController.java
+++ b/src/main/java/org/olat/course/assessment/ui/AssessmentModeGuardController.java
@@ -172,15 +172,20 @@ public class AssessmentModeGuardController extends BasicController implements Ge
if(mode.getIpList() != null) {
boolean ipInRange = assessmentModeMgr.isIpAllowed(mode.getIpList(), address);
if(!ipInRange) {
+ sb.append("<h4><i class='o_icon o_icon_warn o_icon-fw'> </i>");
sb.append(translate("error.ip.range"));
+ sb.append("</h4>");
+ sb.append(translate("error.ip.range.desc", address));
}
allowed &= ipInRange;
}
if(mode.getSafeExamBrowserKey() != null) {
boolean safeExamCheck = assessmentModeMgr.isSafelyAllowed(ureq.getHttpReq(), mode.getSafeExamBrowserKey());
if(!safeExamCheck) {
- if(sb.length() > 0) sb.append("<br />");
+ sb.append("<h4><i class='o_icon o_icon_warn o_icon-fw'> </i>");
sb.append(translate("error.safe.exam"));
+ sb.append("</h4>");
+ sb.append(translate("error.safe.exam.desc"));
}
allowed &= safeExamCheck;
}
diff --git a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_de.properties
index 07bfaaedb1f..ed9d2ec1706 100644
--- a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_de.properties
@@ -46,7 +46,9 @@ error.atleastone=Bitte w\u00E4hlen Sie mindestens ein Pr\u00FCfungskonfiguration
error.course.element.mandatory=Bitte w\u00E4hlen Sie die entsprechenden Kurselemente.
error.in.assessment=Sie d\u00FCrfen kein Pr\u00FCfungen l\u00F6schen die gerade gestartet sind.
error.ip.range=Sie sind nicht im richtigen Netzwerk.
+error.ip.range.desc=Diese Pr\u00FCfung kann nur in den daf\u00FCr vorgesehenen Netzwerken durchgef\u00FChrt werden, bitte kontaktieren Sie Ihren Pr\u00FCfungsverantwortlichen. Ihre IP-Adresse lautet: {0}
error.safe.exam=Bitte benutzen Sie den Safe Exam Browser.
+error.safe.exam.desc=Sie verwenden entweder nicht den <a href="http://safeexambrowser.org" target="_blank">Safe Exam Browser</a> oder eine falsche Safe Exam Browser Konfigurationsdatei. Bitte verwenden Sie ausschliesslich die von Ihrem Pr\u00FCfungsverantwortlichen bereitgestellte Safe Exam Browser Konfigurationsdatei f\u00FCr Ihr Betriebssystem.
error.begin.after.end=Das Beginn-Datum muss vor dem Ende-Datum liegen.
error.group.missing=Sie m\u00FCssen mindestens eine Gruppe ausw\u00E4hlen.
form.mode.description=Erstellen Sie eine neue Pr\u00FCfungskonfiguration, um diesen Kurs oder Elemente aus diesem Kurs in einem gesch\u00FCtzten Modus mit eingeschr\u00E4nken M\u00F6glichkeiten zu betreiben.
diff --git a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
index b22711dcafd..d5b54d7ed5d 100644
--- a/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/assessment/ui/_i18n/LocalStrings_en.properties
@@ -48,7 +48,9 @@ error.course.element.mandatory=Please select the relevant course elements.
error.group.missing=You must choose at least one group.
error.in.assessment=You cannot delete an assessment which is running.
error.ip.range=You are not in the right network.
+error.ip.range.desc=The exam can only be taken in the registered networks, please contact your exam manager. Your IP address is: {0}
error.safe.exam=Please, use the Safe Exam Browser.
+error.safe.exam.desc=You are either not using the <a href="http://safeexambrowser.org" target="_blank">Safe Exam Browser</a> or a wrong Safe Exam Browser configuration file. Please use the configuration file specific to your operating system that was made available by your exam manager.
form.mode.description=Create a new exam setting in order to run this course or a single course elements in a safe mode with restricted options.
form.mode.title=Exam setting {0}
form.mode.title.add=Exam setting
--
GitLab