Skip to content
Snippets Groups Projects
Commit 60e2a3d2 authored by srosse's avatar srosse
Browse files

Merge with f3307d1cacb590f755e99e8dd0df9909a590bc4e

parents 6e38ace5 3955ee26
No related branches found
No related tags found
No related merge requests found
...@@ -131,7 +131,9 @@ public class AssessmentItemDisplayController extends BasicController implements ...@@ -131,7 +131,9 @@ public class AssessmentItemDisplayController extends BasicController implements
itemSessionController = enterSession(ureq); itemSessionController = enterSession(ureq);
if (itemSessionController.getItemSessionState().isEnded()) { if(itemSessionController == null) {
mainVC = createVelocityContainer("error");
} else if (itemSessionController.getItemSessionState().isEnded()) {
mainVC = createVelocityContainer("end"); mainVC = createVelocityContainer("end");
} else { } else {
mainVC = createVelocityContainer("run"); mainVC = createVelocityContainer("run");
...@@ -156,7 +158,9 @@ public class AssessmentItemDisplayController extends BasicController implements ...@@ -156,7 +158,9 @@ public class AssessmentItemDisplayController extends BasicController implements
itemSessionController = enterSession(ureq); itemSessionController = enterSession(ureq);
if (itemSessionController.getItemSessionState().isEnded()) { if(itemSessionController == null) {
mainVC = createVelocityContainer("error");
} else if (itemSessionController.getItemSessionState().isEnded()) {
mainVC = createVelocityContainer("end"); mainVC = createVelocityContainer("end");
} else { } else {
mainVC = createVelocityContainer("run"); mainVC = createVelocityContainer("run");
......
<div class="o_error">$r.translate("error.assessment.item")</div>
\ No newline at end of file
...@@ -60,6 +60,7 @@ debug.outcomes=Output Daten ...@@ -60,6 +60,7 @@ debug.outcomes=Output Daten
debug.responses=Antworten Daten debug.responses=Antworten Daten
error.as.directed=Bitte f\u00FCllen Sie diese Frage wie verwiesen. error.as.directed=Bitte f\u00FCllen Sie diese Frage wie verwiesen.
error.as.directed.kprim=Bitte f\u00FCllen Sie diese Frage wie verwiesen. error.as.directed.kprim=Bitte f\u00FCllen Sie diese Frage wie verwiesen.
error.assessment.item=Die Datei konnte nicht gelesen werden. Sie ist entweder korrupt oder mit dem falschen Format gespeichert.
error.choice=Sie m\u00FCssen ein von den folgenden Optionen w\u00E4hlen. error.choice=Sie m\u00FCssen ein von den folgenden Optionen w\u00E4hlen.
error.double=Falsches Zahlenformat. Beispiele\: 15.0, 5.5, 10 error.double=Falsches Zahlenformat. Beispiele\: 15.0, 5.5, 10
error.input.choice.max=W\u00E4hlen Sie die {0} zutreffenden Antworten. error.input.choice.max=W\u00E4hlen Sie die {0} zutreffenden Antworten.
......
...@@ -60,6 +60,7 @@ debug.outcomes=Output data ...@@ -60,6 +60,7 @@ debug.outcomes=Output data
debug.responses=Responses data debug.responses=Responses data
error.as.directed=Please complete this interaction as directed. error.as.directed=Please complete this interaction as directed.
error.as.directed.kprim=Please complete this interaction as directed. error.as.directed.kprim=Please complete this interaction as directed.
error.assessment.item=The file cannot be interpreted. It seems corrupted or with the wrong format.
error.choice=You must select one of the following options error.choice=You must select one of the following options
error.double=Need to be a double error.double=Need to be a double
error.input.choice.max=You must select at the most {0} choices. error.input.choice.max=You must select at the most {0} choices.
......
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