OO-5099: add num. of coaches in the group selection

src/main/java/org/olat/course/condition/GroupSelectionController.java

@@ -71,8 +71,6 @@ public class GroupSelectionController extends FormBasicController {
 	private NewBGController groupCreateCntrllr;
 	private CloseableModalController cmc;
 	
-	private String[] groupNames;
-	private String[] groupKeys;
 	private boolean createEnable;
 	
 	private FlexiTableElement groupTableElement;
@@ -111,7 +109,7 @@ public class GroupSelectionController extends FormBasicController {
 		Map<Long, StatisticsBusinessGroupRow> stats = businessGroupService.findBusinessGroupsStatistics(params).stream().collect(Collectors.toMap(StatisticsBusinessGroupRow::getKey, g -> g, (u, v) -> u));
 		
 		groupTableRows = new ArrayList<>();
-		Set<Integer> selectedRows = new HashSet<Integer>();
+		Set<Integer> selectedRows = new HashSet<>();
 		
 		for (BusinessGroup businessGroup : groups) {
 			groupTableRows.add(new ENEditGroupTableContentRow(businessGroup, stats.get(businessGroup.getKey())));
@@ -208,6 +206,11 @@ public class GroupSelectionController extends FormBasicController {
 		descriptionColumn.setAlwaysVisible(true);
 		columnsModel.addFlexiColumnModel(descriptionColumn);
 		
+		DefaultFlexiColumnModel coachesColumn = new DefaultFlexiColumnModel(ENEditGroupTableColumns.coaches);
+		coachesColumn.setDefaultVisible(true);
+		coachesColumn.setAlwaysVisible(true);
+		columnsModel.addFlexiColumnModel(coachesColumn);
+		
 		DefaultFlexiColumnModel participantsColumn = new DefaultFlexiColumnModel(ENEditGroupTableColumns.participants);
 		participantsColumn.setDefaultVisible(true);
 		participantsColumn.setAlwaysVisible(true);

src/main/java/org/olat/course/condition/_i18n/LocalStrings_de.properties

@@ -11,6 +11,7 @@ easy.operator=Operator
 easy.value=Wert
 engroupedit.table.key=ID
 engroupedit.table.up=Hoch
+engroupedit.table.coaches=Betreuer
 engroupedit.table.description=Beschreibung
 engroupedit.table.down=Runter
 engroupedit.table.groupName=Gruppenname
@@ -118,4 +119,5 @@ solution.provideone.nodereference=Hinweis\: Genau eine Kursbaustein-Identifikati
 solution.provideone.username=Hinweis\: Geben Sie genau einen Benutzernamen an. Beachten Sie, dass nicht gepr\u00FCft wird, ob der Benutzer in OLAT bereits existiert.
 solution.providetwo.attrvalue=Hinweis\: Die "{0}"-Funktion braucht einen Attributnamen und einen Attributswert, beide von "" umschlossen.
 solution.takeassessablenode=Hinweis\: Konsultieren Sie die Hilfe f\u00FCr eine Liste von bewertbaren Kursbausteinen.
+table.header.coaches=Betreuer
 xx={0}

src/main/java/org/olat/course/condition/_i18n/LocalStrings_en.properties

@@ -11,6 +11,7 @@ easy.operator=Operator
 easy.value=Value
 engroupedit.table.key=ID
 engroupedit.table.up=Up
+engroupedit.table.coaches=Coaches
 engroupedit.table.description=Description
 engroupedit.table.down=Down
 engroupedit.table.groupName=Groupname

src/main/java/org/olat/course/nodes/en/ENEditGroupAreaFormController.java

@@ -800,23 +800,6 @@ class ENEditGroupAreaFormController extends FormBasicController implements Gener
 		return keyList;
 	}
 
-	private KeysAndNames getGroupKeysAndNames(List<Long> keys) {
-		StringBuilder sb = new StringBuilder();
-		KeysAndNames keysAndNames = new KeysAndNames();
-		keysAndNames.getKeys().addAll(keys);
-
-		List<BusinessGroupShort> groups = businessGroupService.loadShortBusinessGroups(keys);
-		for(BusinessGroupShort group:groups) {
-			if(sb.length() > 0) sb.append("&nbsp;&nbsp;");
-			sb.append("<i class='o_icon o_icon-fw o_icon_group'>&nbsp;</i> ");
-			sb.append(StringHelper.escapeHtml(group.getName()));
-			keysAndNames.getNames().add(group.getName());
-
-		}
-		keysAndNames.setDecoratedNames(sb.toString());
-		return keysAndNames;
-	}
-
 	private KeysAndNames getAreaKeysAndNames(List<Long> keys) {
 		StringBuilder sb = new StringBuilder();
 		List<BGArea> areas = areaManager.loadAreas(keys);

src/main/java/org/olat/course/nodes/en/ENEditGroupTableContentRow.java

@@ -35,6 +35,7 @@ public class ENEditGroupTableContentRow {
 	private final String description;
 	private final int minParticipants;
 	private final int maxParticipants;
+	private final int coaches;
 	private final int participants;
 	private final int onWaitinglist;
 	private final boolean waitinglistEnabled;
@@ -46,6 +47,7 @@ public class ENEditGroupTableContentRow {
 		minParticipants = 0;
 		maxParticipants = 0;
 		participants = 0;
+		coaches = 0;
 		onWaitinglist = 0;
 		waitinglistEnabled = false;
 	}
@@ -59,6 +61,7 @@ public class ENEditGroupTableContentRow {
 		this.waitinglistEnabled = group.getWaitingListEnabled();
 		this.onWaitinglist = enrollment.getNumInWaitingList();
 		this.participants = enrollment.getNumOfParticipants();
+		this.coaches = -1;
 	}
 	
 	public ENEditGroupTableContentRow(BusinessGroup group, StatisticsBusinessGroupRow stats) {
@@ -70,6 +73,7 @@ public class ENEditGroupTableContentRow {
 		this.waitinglistEnabled = group.getWaitingListEnabled();
 		this.onWaitinglist = stats.getNumWaiting();
 		this.participants = stats.getNumOfParticipants();
+		this.coaches = stats.getNumOfCoaches();
 	}
 	
 	
@@ -93,6 +97,10 @@ public class ENEditGroupTableContentRow {
 		return maxParticipants > -1 ? String.valueOf(maxParticipants) : " - ";
 	}
 
+	public int getCoaches() {
+		return coaches;
+	}
+
 	public int getParticipants() {
 		return participants;
 	}

src/main/java/org/olat/course/nodes/en/ENEditGroupTableModel.java

@@ -81,6 +81,8 @@ public class ENEditGroupTableModel extends DefaultFlexiTableDataModel<ENEditGrou
 			return row.isWaitinglistEnabled();
 		case onWaitinglist: 
 			return row.getOnWaitinglist();
+		case coaches:
+			return row.getCoaches();
 		case participants: 
 			return row.getParticipants();
 
@@ -95,7 +97,7 @@ public class ENEditGroupTableModel extends DefaultFlexiTableDataModel<ENEditGrou
 	}
 
 	public List<String> getNames() {
-		List<String> names = new ArrayList<String>();
+		List<String> names = new ArrayList<>();
 
 		for (ENEditGroupTableContentRow row : getObjects()) {
 			names.add(row.getGroupName());
@@ -105,7 +107,7 @@ public class ENEditGroupTableModel extends DefaultFlexiTableDataModel<ENEditGrou
 	}
 
 	public List<Long> getKeys() {
-		List<Long> keys = new ArrayList<Long>();
+		List<Long> keys = new ArrayList<>();
 
 		for (ENEditGroupTableContentRow row : getObjects()) {
 			keys.add(row.getKey());
@@ -123,6 +125,7 @@ public class ENEditGroupTableModel extends DefaultFlexiTableDataModel<ENEditGrou
 		minParticipants("engroupedit.table.minPart"),
 		maxParticipants("engroupedit.table.maxPart"),
 		description("engroupedit.table.description"),
+		coaches("engroupedit.table.coaches"),
 		participants("engroupedit.table.enrolled"),
 		waitinglistEnabled("engroupedit.table.waitinglist"),
 		onWaitinglist("engroupedit.table.waitinglistParticipants"),

src/main/java/org/olat/course/nodes/en/EnrollmentTableModelWithMaxSize.java

@@ -108,7 +108,7 @@ public class EnrollmentTableModelWithMaxSize extends DefaultTableDataModel<Enrol
 				// Waiting-list
 				if (enrollmentRow.isWaitingListEnabled()) {
 					// Waitinglist is enabled => show current size
-					return new Integer(enrollmentRow.getNumInWaitingList());
+					return Integer.valueOf(enrollmentRow.getNumInWaitingList());
 				}
 				return trans.translate("grouplist.table.noWaitingList");
 			case 5: