diff --git a/src/main/java/org/olat/group/ui/main/EditMembershipController.java b/src/main/java/org/olat/group/ui/main/EditMembershipController.java index 1f5c8cd4f85c9f79c629d28ea0c53454413a32d2..125626549cdd25587a76ec83a81375b0736d8915 100644 --- a/src/main/java/org/olat/group/ui/main/EditMembershipController.java +++ b/src/main/java/org/olat/group/ui/main/EditMembershipController.java @@ -47,6 +47,7 @@ import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFle import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiCellRenderer; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnDef; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiColumnModel; +import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiSortableColumnDef; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableColumnModel; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableComponent; import org.olat.core.gui.components.form.flexible.impl.elements.table.FlexiTableDataModelFactory; @@ -386,6 +387,8 @@ public class EditMembershipController extends FormBasicController { } else { curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.curriculumElement, new CurriculumElementIndentRenderer())); } + + curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.curriculumElementIdentifier)); curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.owner)); curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.coach)); curriculumTableColumnModel.addFlexiColumnModel(new DefaultFlexiColumnModel(CurriculumCols.participant)); @@ -675,11 +678,12 @@ public class EditMembershipController extends FormBasicController { switch(CurriculumCols.values()[col]) { case curriculum: return option.getElement().getCurriculum().getDisplayName(); case curriculumElement: return option.getElement().getDisplayName(); + case curriculumElementIdentifier: return option.getElement().getIdentifier(); case owner: return option.getOwner(); case coach: return option.getCoach(); case participant: return option.getParticipant(); + default: return "ERROR"; } - return null; } @Override @@ -749,9 +753,10 @@ public class EditMembershipController extends FormBasicController { } - public static enum CurriculumCols implements FlexiColumnDef { + public enum CurriculumCols implements FlexiSortableColumnDef { curriculum("table.header.curriculum"), curriculumElement("table.header.curriculum.element"), + curriculumElementIdentifier("table.header.identifier"), owner("table.header.owners"), coach("table.header.tutors"), participant("table.header.participants"); @@ -766,9 +771,19 @@ public class EditMembershipController extends FormBasicController { public String i18nHeaderKey() { return i18n; } + + @Override + public boolean sortable() { + return false; + } + + @Override + public String sortKey() { + return name(); + } } - public static enum GroupCols implements FlexiColumnDef { + public enum GroupCols implements FlexiColumnDef { groupName("table.header.groups"), tutorCount("table.header.tutorsCount"), participantCount("table.header.participantsCount"), diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties index 06806f0a926c9f62b73f8885bba297937bffc69c..ec804267d14038d408aaaefda3f284e0d83cb578 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_de.properties @@ -186,6 +186,7 @@ table.header.graduate=Zulassen tbl_graduate=$:table.header.graduate table.header.firstName=Vorname table.header.lastName=Name +table.header.identifier=Bezeichnung table.header.mail=E-Mail table.header.firstTime=Beitritt table.header.lastTime=Zuletzt besucht diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties index 2d27817cc876d97f7a22a4a294b1bab568379830..32c23ba755c9af8d701c1d7db5886e4e22f898e7 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_en.properties @@ -160,6 +160,7 @@ table.header.freePlaces=Slots table.header.graduate=Admit table.header.group.full=Full table.header.groups=Group +table.header.identifier=Identifier table.header.key=ID table.header.lastName=Lastname table.header.lastTime=Last visit diff --git a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties index 56cedc8bf35ffde6908f3d051e62c6a4442acc6e..977a90c8beb23744199575433ce7e707baa05b06 100644 --- a/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties +++ b/src/main/java/org/olat/group/ui/main/_i18n/LocalStrings_fr.properties @@ -160,6 +160,7 @@ table.header.freePlaces=Places table.header.graduate=Promouvoir table.header.group.full=Plein table.header.groups=Groupes +table.header.identifier=Identifiant table.header.key=ID table.header.lastName=Nom table.header.lastTime=Derni\u00E8re visite diff --git a/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java b/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java index e1986a76dec860869f519da4142d8fa5e1fdde9d..f639b41ec8389e992ce93e825fb02ef56383d946 100644 --- a/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java +++ b/src/main/java/org/olat/modules/lecture/ui/AbstractTeacherOverviewController.java @@ -298,9 +298,6 @@ public abstract class AbstractTeacherOverviewController extends BasicController } else if(searchCtrl == source) { if(event instanceof SearchLecturesBlockEvent) { doSearch((SearchLecturesBlockEvent)event); - } else if(event == Event.CANCELLED_EVENT) { - currentSearchParams = new LecturesBlockSearchParameters(); - loadModel(currentSearchParams); } } super.event(ureq, source, event); diff --git a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java index 8232e1c6766dc319403cbc2b4e2ded8c9ece2414..22876eefaf02be484f1990cb73ab5ea7a2fc9902 100644 --- a/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java +++ b/src/main/java/org/olat/modules/lecture/ui/TeacherOverviewSearchController.java @@ -30,7 +30,6 @@ import org.olat.core.gui.components.form.flexible.elements.TextElement; import org.olat.core.gui.components.form.flexible.impl.FormBasicController; import org.olat.core.gui.components.form.flexible.impl.FormLayoutContainer; import org.olat.core.gui.control.Controller; -import org.olat.core.gui.control.Event; import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.generic.dtabs.Activateable2; import org.olat.core.id.context.ContextEntry; @@ -167,7 +166,7 @@ public class TeacherOverviewSearchController extends FormBasicController impleme searchEl.setValue(null); startEl.setDate(defaultStartDate); endEl.setDate(defaultEndDate); - fireEvent(ureq, Event.CANCELLED_EVENT); + doSearch(ureq); } private void doSearch(UserRequest ureq) {