From e39530352d4ae4f7675772a7db6da5dec4ff531b Mon Sep 17 00:00:00 2001 From: srosse <none@none> Date: Wed, 31 Jul 2013 09:19:17 +0200 Subject: [PATCH] OO-533: more visual feedbacks after the creation of a new question --- .../qpool/ui/QuestionListController.java | 19 +++++++++++++++---- .../qpool/ui/_i18n/LocalStrings_de.properties | 1 + .../qpool/ui/_i18n/LocalStrings_en.properties | 1 + .../modules/qpool/ui/events/QPoolEvent.java | 1 + 4 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java index 3023f5a8233..bfcc0b76ab8 100644 --- a/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java +++ b/src/main/java/org/olat/modules/qpool/ui/QuestionListController.java @@ -90,6 +90,7 @@ public class QuestionListController extends AbstractItemListController implement private Controller newItemCtrl; private RenameController renameCtrl; private CloseableModalController cmc; + private CloseableModalController cmcNewItem; private DialogBoxController confirmCopyBox; private DialogBoxController confirmDeleteBox; private DialogBoxController confirmRemoveBox; @@ -390,6 +391,12 @@ public class QuestionListController extends AbstractItemListController implement cmc.deactivate(); cleanUp(); } + } else if(source == cmcNewItem) { + showInfo("create.success"); + getItemsTable().reset(); + QPoolEvent qce = new QPoolEvent(QPoolEvent.ITEM_CREATED); + fireEvent(ureq, qce); + cleanUp(); } else if(source == cmc) { cleanUp(); } @@ -398,6 +405,8 @@ public class QuestionListController extends AbstractItemListController implement private void cleanUp() { removeAsListenerAndDispose(cmc); + removeAsListenerAndDispose(cmcNewItem); + removeAsListenerAndDispose(newItemCtrl); removeAsListenerAndDispose(addController); removeAsListenerAndDispose(bulkChangeCtrl); removeAsListenerAndDispose(importItemCtrl); @@ -405,6 +414,8 @@ public class QuestionListController extends AbstractItemListController implement removeAsListenerAndDispose(selectGroupCtrl); removeAsListenerAndDispose(createCollectionCtrl); cmc = null; + cmcNewItem = null; + newItemCtrl = null; addController = null; bulkChangeCtrl = null; importItemCtrl = null; @@ -468,11 +479,11 @@ public class QuestionListController extends AbstractItemListController implement newItemCtrl = factory.getEditor(ureq, getWindowControl(), title); listenTo(newItemCtrl); - removeAsListenerAndDispose(cmc); - cmc = new CloseableModalController(getWindowControl(), translate("close"), + removeAsListenerAndDispose(cmcNewItem); + cmcNewItem = new CloseableModalController(getWindowControl(), translate("close"), newItemCtrl.getInitialComponent(), true, translate("import.repository")); - cmc.activate(); - listenTo(cmc); + cmcNewItem.activate(); + listenTo(cmcNewItem); } private void doOpenImport(UserRequest ureq) { diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties index b058e646e6b..bca8a3779b2 100644 --- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_de.properties @@ -212,6 +212,7 @@ import.repository=Lernressource importieren import.file=Datei importieren import.failed=Frage konnte nicht importiert werden. import.success={0} Frage wurde erfolgreich importiert. +create.success=1 Frage wurde erfolgreich erstellt. error.input.toolong=Leider ist Ihr gerade eingegebener Text mit {1} Zeichen zu lang. Bitte beschr\u00E4nken Sie sich auf maximal {0} Zeichen. share.options=Wollen Sie anderen Personen erlauben diese Frage(n) zu bearbeiten? share.editable=Editieren \ No newline at end of file diff --git a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties index 0ea357f40ea..f6fb1ed8c2e 100644 --- a/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/modules/qpool/ui/_i18n/LocalStrings_en.properties @@ -153,6 +153,7 @@ import.repository=Import learning resource import.file=Import file import.failed=Questions has not been imported. import.success={0} questions has been imported. +create.success=1 question has been created. error.input.toolong=Leider ist Ihr gerade eingegebener Text mit {1} Zeichen zu lang. Bitte beschr\u00E4nken Sie sich auf maximal {0} Zeichen. share.options=Wollen Sie anderen Personen erlauben diese Frage(n) zu bearbeiten? share.editable=Edit \ No newline at end of file diff --git a/src/main/java/org/olat/modules/qpool/ui/events/QPoolEvent.java b/src/main/java/org/olat/modules/qpool/ui/events/QPoolEvent.java index e061562035f..bdc2d13a218 100644 --- a/src/main/java/org/olat/modules/qpool/ui/events/QPoolEvent.java +++ b/src/main/java/org/olat/modules/qpool/ui/events/QPoolEvent.java @@ -33,6 +33,7 @@ public class QPoolEvent extends MultiUserEvent { public static final String ITEM_SHARED = "qpool-item-shared"; public static final String ITEM_MARKED = "qpool-item-marked"; + public static final String ITEM_CREATED = "qpool-item-created"; public static final String ITEM_DELETED = "qpool-item-deleted"; public static final String COLL_CREATED = "qpool-coll-created"; public static final String COLL_DELETED = "qpoll-coll-deleted"; -- GitLab