From 013883a3cd3ccc2532d9a85f210b9e9a0d8a6273 Mon Sep 17 00:00:00 2001
From: gnaegi <none@none>
Date: Mon, 15 Jun 2015 16:22:09 +0200
Subject: [PATCH] OO-991 i18n for task, show submit buttons only when there is
something to submit.
---
.../gta/ui/GTACoachRevisionAndCorrectionsController.java | 3 +++
.../course/nodes/gta/ui/GTAParticipantController.java | 3 +++
.../GTAParticipantRevisionAndCorrectionsController.java | 4 +++-
.../course/nodes/gta/ui/SubmitDocumentsController.java | 9 ++++++++-
.../org/olat/course/nodes/gta/ui/_content/coach.html | 8 ++++++--
.../course/nodes/gta/ui/_i18n/LocalStrings_de.properties | 9 ++++++---
.../course/nodes/gta/ui/_i18n/LocalStrings_en.properties | 7 +++++--
7 files changed, 34 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java
index a3428ca28dd..1c43c7d47c6 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTACoachRevisionAndCorrectionsController.java
@@ -191,6 +191,7 @@ public class GTACoachRevisionAndCorrectionsController extends BasicController {
returnToRevisionsButton.setCustomEnabledLinkCSS("btn btn-primary");
returnToRevisionsButton.setIconLeftCSS("o_icon o_icon o_icon_submit");
returnToRevisionsButton.setElementCssClass("o_sel_course_gta_return_revision");
+ returnToRevisionsButton.setVisible(uploadCorrectionsCtrl.hasUploadDocuments());
closeRevisionsButton = LinkFactory.createCustomLink("coach.close.revision.button", "close", "coach.close.revision.button", Link.BUTTON, mainVC, this);
closeRevisionsButton.setCustomEnabledLinkCSS("btn btn-primary");
@@ -205,6 +206,8 @@ public class GTACoachRevisionAndCorrectionsController extends BasicController {
Task aTask = uploadCorrectionsCtrl.getAssignedTask();
gtaManager.log("Corrections", (SubmitEvent)event, aTask, getIdentity(), assessedIdentity, assessedGroup, courseEnv, gtaNode);
}
+ returnToRevisionsButton.setVisible(uploadCorrectionsCtrl.hasUploadDocuments());
+
}
super.event(ureq, source, event);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
index a8b6d133e6c..2ea123dbf61 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantController.java
@@ -256,6 +256,8 @@ public class GTAParticipantController extends GTAAbstractController {
submitButton.setElementCssClass("o_sel_course_gta_submit_docs");
submitButton.setCustomEnabledLinkCSS("btn btn-primary");
submitButton.setIconLeftCSS("o_icon o_icon_submit");
+ submitButton.setVisible(submitDocCtrl.hasUploadDocuments());
+
}
private void setSubmittedDocumentsController(UserRequest ureq) {
@@ -610,6 +612,7 @@ public class GTAParticipantController extends GTAAbstractController {
Task assignedTask = submitDocCtrl.getAssignedTask();
gtaManager.log("Submit", (SubmitEvent)event, assignedTask, getIdentity(), assessedIdentity, assessedGroup, courseEnv, gtaNode);
}
+ submitButton.setVisible(submitDocCtrl.hasUploadDocuments());
}
super.event(ureq, source, event);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
index 54b21edeed4..54a0f009dfb 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/GTAParticipantRevisionAndCorrectionsController.java
@@ -160,6 +160,7 @@ public class GTAParticipantRevisionAndCorrectionsController extends BasicControl
submitRevisionButton.setCustomEnabledLinkCSS("btn btn-primary");
submitRevisionButton.setIconLeftCSS("o_icon o_icon o_icon_submit");
submitRevisionButton.setElementCssClass("o_sel_course_gta_submit_revisions");
+ submitRevisionButton.setVisible(uploadRevisionsCtrl.hasUploadDocuments());
}
private boolean setRevision(UserRequest ureq, String cmpName, int iteration) {
@@ -207,8 +208,9 @@ public class GTAParticipantRevisionAndCorrectionsController extends BasicControl
if(uploadRevisionsCtrl == source) {
if(event instanceof SubmitEvent) {
Task aTask = uploadRevisionsCtrl.getAssignedTask();
- gtaManager.log("Revision", (SubmitEvent)event, aTask, getIdentity(), getIdentity(), assessedGroup, courseEnv, gtaNode);
+ gtaManager.log("Revision", (SubmitEvent)event, aTask, getIdentity(), getIdentity(), assessedGroup, courseEnv, gtaNode);
}
+ submitRevisionButton.setVisible(uploadRevisionsCtrl.hasUploadDocuments());
}
super.event(ureq, source, event);
}
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java b/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
index f9c9ed1942b..16e840ea2b1 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
+++ b/src/main/java/org/olat/course/nodes/gta/ui/SubmitDocumentsController.java
@@ -111,6 +111,12 @@ class SubmitDocumentsController extends FormBasicController {
public Task getAssignedTask() {
return assignedTask;
}
+
+
+ public boolean hasUploadDocuments() {
+ return (model.getRowCount() > 0);
+ }
+
@Override
protected void initForm(FormItemContainer formLayout, Controller listener, UserRequest ureq) {
@@ -123,6 +129,7 @@ class SubmitDocumentsController extends FormBasicController {
createDocButton = uifactory.addFormLink("open.editor", formLayout, Link.BUTTON);
createDocButton.setIconLeftCSS("o_icon o_icon_edit");
createDocButton.setElementCssClass("o_sel_course_gta_create_doc");
+ createDocButton.setI18nKey(docI18nKey + ".open.editor");
}
FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
@@ -180,7 +187,7 @@ class SubmitDocumentsController extends FormBasicController {
flc.contextPut("maxDocsWarning", Boolean.FALSE);
}
- flc.contextPut("hasDocuments", Boolean.valueOf((documents.length > 0)));
+ flc.contextPut("hasDocuments", Boolean.valueOf(hasUploadDocuments()));
}
@Override
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html b/src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html
index 3c08086fb78..54e83220f66 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_content/coach.html
@@ -18,7 +18,9 @@ $r.render("contextualSubscription")
#if($r.available("assignedTask"))
$r.render("assignedTask")
#else
- $r.translate("coach.waiting.assignment")
+ <b>$r.translate("coach.waiting.assignment")</b>
+ <br />
+ $r.translate("coach.waiting.assignment.description")
#end
</div>
</div>
@@ -42,7 +44,9 @@ $r.render("contextualSubscription")
#if($r.available("submittedDocs"))
$r.render("submittedDocs")
#else
- $r.translate("coach.waiting.submitted.documents")
+ <b>$r.translate("coach.waiting.submitted.documents")</b>
+ <br />
+ $r.translate("coach.waiting.submitted.documents.description")
#end
</div>
</div>
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
index 001c7aa0049..6b6bf031b6b 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_de.properties
@@ -27,7 +27,9 @@ coach.submit.corrections.to.revision.button=Korrekturen absenden
coach.submitted.documents.description=Diese Dokumente wurden abgegeben.
coach.task.assigned.description=Die folgende Aufgabe wurde zugewiesen
coach.waiting.assignment=Warten auf Zuweisung
-coach.waiting.submitted.documents=Warten auf die Dokumente
+coach.waiting.assignment.description=Die Aufgabe wurde noch nicht zugewiesen. Die Abgabe und Korrektur kann erst begonnen wenn eine Aufgabe zugewiesen wurde.
+coach.waiting.submitted.documents=Warten auf Abgabe L\u00F6sung
+coach.waiting.submitted.documents.description=Es wurden noch keine Dokumente abgegeben. Die Korrektur und R\u00FCckgabe kann erst beginnen wenn die gel\u00F6ste Aufgabe abgegeben wurde.
comment=Kommentar
condition.accessibility.title=Zugang
confirm.delete.solution.description=Wollen Sie wirklich die L\u00F6sung "{0}" l\u00F6schen?
@@ -85,7 +87,8 @@ notifications.revision.individual=Neue \u00DCberarbeitungen "{0}" von "{1}"
notifications.solution=Neue Musterl\u00F6sung "{0}"
notifications.submission.group=Neue abgegebene Dokumente "{0}" von "{2}" f\u00FCr Gruppe "{1}" hochgeladen
notifications.submission.individual=Neue abgegebene Dokumente "{0}" von "{1}"
-open.editor=L\u00F6sung erstellen
+document.open.editor=L\u00F6sung erstellen
+coach.document.open.editor=Korrektur erstellen
open.group=Gruppe \u00F6ffnen
pane.tab.accessibility=Zugang
pane.tab.assignment=Zuweisung
@@ -138,7 +141,7 @@ run.solution.available.date={0}
run.solutions.description=Hier finden Sie die von Ihrem Betreuer zur Verf\u00FCgung gestellten Musterl\u00F6sungen.
run.submit=Abgabe
run.submit.button=Endg\u00FCltige Abgabe
-run.submit.confirm=Die Abgabe der Aufgabe ist endg\u00FCltig.
+run.submit.confirm=Bitte bestätigen Sie die Abgabe der Aufgabe. Die Abgabe der Aufgabe ist endg\u00FCltig und kann nicht zurückgezogen werden.
run.submit.confirm.group=$\:run.submit.confirm<br/>Dies ist eine Gruppenaufgabe\! Die hier getroffene Auswahl ist f\u00FCr alle Mitglieder der Gruppe "{0}" g\u00FCltig\!
run.submit.due.date=Abgabe Termin\: {0}
run.submit.individual.description.all=Geben Sie Ihre L\u00F6sung ab indem Sie entweder ein Dokument hochladen oder den hier verf\u00FCgbaren Editor benutzen.
diff --git a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
index 2b6244f8e20..c6b7c8452ed 100644
--- a/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
+++ b/src/main/java/org/olat/course/nodes/gta/ui/_i18n/LocalStrings_en.properties
@@ -26,7 +26,9 @@ coach.submit.corrections.to.revision.button=Send revisions
coach.submitted.documents.description=These documents have been submitted
coach.task.assigned.description=The following task has been assigned
coach.waiting.assignment=Waiting for assignment
+coach.waiting.assignment.description=The has not been assigned yet. The submission and reviewing process can only be started when the task has been assigned first.
coach.waiting.submitted.documents=Waiting for documents
+coach.waiting.submitted.documents.description=No documents have been submitted so far. The reviewing can only be started when a final submission has been made.
condition.accessibility.title=Access
confirm.delete.solution.description=Do you want to delete the solution "{0}"?
confirm.delete.solution.title=Delete submitted solution
@@ -81,7 +83,8 @@ notifications.revision.individual=New revisions "{0}" of "{1}"
notifications.solution=New sample solutions "{0}"
notifications.submission.group=New documents "{0}" von "{2}" submitted for group "{1}"
notifications.submission.individual=New submitted documents "{0}" of "{1}"
-open.editor=Open solution editor
+document.open.editor=Open solution editor
+coach.document.open.editor=Open review editor
open.group=Open group
pane.tab.accessibility=Access
pane.tab.assignment=Assignment
@@ -132,7 +135,7 @@ run.solution.available.date={0}
run.solutions.description=The following sample solutions are available for download\:
run.submit=Submit
run.submit.button=Final task submission
-run.submit.confirm=The submission of the task is final.
+run.submit.confirm=Please confirm the submission for this task. The submission of the task is final and can not be undone.
run.submit.confirm.group=$\:run.submit.confirm<br/>This is a group task! The submitted document is valid for all members of the group "{0}"\!
run.submit.due.date=Due date\: {0}
run.submit.individual.description.all=Submit your solution by either uploading a document you created on your computer or use the editor to write your solution right here.
--
GitLab