OO-3831: add a column identifier in the calendars list

src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_de.properties

@@ -211,6 +211,7 @@ table.add=+
 table.delete=-
 table.header.aggregated.feed=Aggregiert
 table.header.color=Farbe
+table.header.identifier=Kennzeichen
 table.header.name=Name
 table.header.tools=<i class\="o_icon o_icon-lg o_icon_actions"> </i>
 table.header.type=Typ

src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_en.properties

@@ -257,6 +257,7 @@ table.add=+
 table.delete=-
 table.header.aggregated.feed=Aggregated
 table.header.color=Color
+table.header.identifier=Identifier
 table.header.name=Name
 table.header.tools=<i class\="o_icon o_icon-lg o_icon_actions"> </i>
 table.header.type=Type

src/main/java/org/olat/commons/calendar/_i18n/LocalStrings_fr.properties

@@ -211,6 +211,7 @@ table.add=+
 table.delete=-
 table.header.aggregated.feed=Agr\u00E9g\u00E9
 table.header.color=Couleur
+table.header.identifier=Identifiant
 table.header.name=Nom
 table.header.tools=<i class\="o_icon o_icon-lg o_icon_actions"> </i>
 table.header.type=Type

src/main/java/org/olat/commons/calendar/ui/CalendarPersonalConfigurationController.java

@@ -113,16 +113,12 @@ public class CalendarPersonalConfigurationController extends FormBasicController
 		
 		//add the table
 		FlexiTableColumnModel columnsModel = FlexiTableDataModelFactory.createFlexiTableColumnModel();
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.type.i18nKey(), ConfigCols.type.ordinal(),
-				true, ConfigCols.type.name(), new CalendarTypeClassRenderer()));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.cssClass.i18nKey(), ConfigCols.cssClass.ordinal(),
-				true, ConfigCols.cssClass.name()));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.name.i18nKey(), ConfigCols.name.ordinal(),
-				true, ConfigCols.name.name()));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.visible.i18nKey(), ConfigCols.visible.ordinal(),
-				true, ConfigCols.visible.name()));
-		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.aggregated.i18nKey(), ConfigCols.aggregated.ordinal(),
-				true, ConfigCols.aggregated.name()));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.type, new CalendarTypeClassRenderer()));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.cssClass));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.name));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.identifier));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.visible));
+		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.aggregated));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.feed.i18nKey(), ConfigCols.feed.ordinal()));
 		columnsModel.addFlexiColumnModel(new DefaultFlexiColumnModel(ConfigCols.tools.i18nKey(), ConfigCols.tools.ordinal()));
 		

src/main/java/org/olat/commons/calendar/ui/CalendarPersonalConfigurationDataModel.java

@@ -23,6 +23,7 @@ import java.util.List;
 
 import org.olat.core.commons.persistence.SortKey;
 import org.olat.core.gui.components.form.flexible.impl.elements.table.DefaultFlexiTableDataModel;
+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.SortableFlexiTableDataModel;
 
@@ -63,7 +64,8 @@ public class CalendarPersonalConfigurationDataModel extends DefaultFlexiTableDat
 		switch(ConfigCols.values()[col]) {
 			case type: return row.getWrapper();
 			case name: return row.getDisplayName();
-			case cssClass: return row.getColorLink();//.getCssClass();
+			case identifier: return row.getIdentifier();
+			case cssClass: return row.getColorLink();
 			case visible: return row.getVisibleLink();
 			case aggregated: return row.getAggregatedLink();
 			case feed: return row.getFeedLink();
@@ -72,9 +74,10 @@ public class CalendarPersonalConfigurationDataModel extends DefaultFlexiTableDat
 		return null;
 	}
 	
-	public enum ConfigCols {
+	public enum ConfigCols implements FlexiSortableColumnDef {
 		type("table.header.type"),
 		name("table.header.name"),
+		identifier("table.header.identifier"),
 		cssClass("table.header.color"),
 		visible("table.header.visible"),
 		aggregated("table.header.aggregated.feed"),
@@ -90,5 +93,20 @@ public class CalendarPersonalConfigurationDataModel extends DefaultFlexiTableDat
 		public String i18nKey() {
 			return i18nKey;
 		}
+
+		@Override
+		public String i18nHeaderKey() {
+			return i18nKey;
+		}
+
+		@Override
+		public boolean sortable() {
+			return this != tools && this != feed;
+		}
+
+		@Override
+		public String sortKey() {
+			return name();
+		}
 	}
 }

src/main/java/org/olat/commons/calendar/ui/CalendarPersonalConfigurationRow.java

@@ -64,6 +64,10 @@ public class CalendarPersonalConfigurationRow {
 	public String getDisplayName() {
 		return wrapper.getDisplayName();
 	}
+	
+	public String getIdentifier() {
+		return wrapper.getIdentifier();
+	}
 
 	public String getCssClass() {
 		return wrapper.getCssClass();

src/main/java/org/olat/commons/calendar/ui/components/KalendarRenderWrapper.java

@@ -55,6 +55,7 @@ public class KalendarRenderWrapper {
 	public static final int ACCESS_READ_ONLY = 1;
 	
 	private String displayName;
+	private String identifier;
 	
 	private Kalendar kalendar;
 	private LinkProvider linkProvider;
@@ -76,15 +77,14 @@ public class KalendarRenderWrapper {
 	 * @param calendarColor
 	 * @param access
 	 */
-	public KalendarRenderWrapper(Kalendar kalendar, String displayName) {
-		this.kalendar = kalendar;
-		this.displayName = displayName;
-		setConfiguration(null);
+	public KalendarRenderWrapper(Kalendar kalendar, String displayName, String identifier) {
+		this(kalendar, null, displayName, identifier);
 	}
 	
-	public KalendarRenderWrapper(Kalendar kalendar, CalendarUserConfiguration config, String displayName) {
+	public KalendarRenderWrapper(Kalendar kalendar, CalendarUserConfiguration config, String displayName, String identifier) {
 		this.kalendar = kalendar;
 		this.displayName = displayName;
+		this.identifier = identifier;
 		setConfiguration(config);
 	}
 	
@@ -115,6 +115,14 @@ public class KalendarRenderWrapper {
 		this.displayName = displayName;
 	}
 
+	public String getIdentifier() {
+		return identifier;
+	}
+
+	public void setIdentifier(String identifier) {
+		this.identifier = identifier;
+	}
+
 	public int getAccess() {
 		return access;
 	}

src/main/java/org/olat/group/BusinessGroup.java

@@ -45,7 +45,7 @@ public interface BusinessGroup extends BusinessGroupShort, Persistable, CreateIn
 
 	/** regular expression to check for valid group names */
 	// commas are not allowed. name is used in course conditions for weak binding
-	public final static String VALID_GROUPNAME_REGEXP = "^[^,\"]*$";
+	public static final String VALID_GROUPNAME_REGEXP = "^[^,\"]*$";
 	
 	/** the max length for the group name.*/
 	public static final int MAX_GROUP_NAME_LENGTH = 255;

src/test/java/org/olat/commons/calendar/manager/ICalFileCalendarManagerTest.java

@@ -52,7 +52,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.FileUtils;
-import org.infinispan.manager.EmbeddedCacheManager;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
@@ -89,8 +88,7 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
 	private final void emptyCalendarCache() {
 		CoordinatorManager coordinator = CoreSpringFactory.getImpl(CoordinatorManager.class);
 		Cacher cacher = coordinator.getCoordinator().getCacher();
-		EmbeddedCacheManager cm = cacher.getCacheContainer();
-		cm.getCache("CalendarManager@calendar").clear();
+		cacher.getCacheContainer().getCache("CalendarManager@calendar").clear();
 	}
 	
 	@Test
@@ -328,6 +326,8 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
 		File newCalendarFile = new File(calendarFile.getParentFile(), calendarFile.getName());
 		InputStream in = CalendarImportTest.class.getResourceAsStream("cal_without_dtend.ics");
 		FileUtils.copyInputStreamToFile(in, newCalendarFile);
+		in.close();
+		
 		//to be sure
 		emptyCalendarCache();
 		//load the calendar
@@ -474,6 +474,8 @@ public class ICalFileCalendarManagerTest extends OlatTestCase {
 		File newCalendarFile = new File(calendarFile.getParentFile(), calendarFile.getName());
 		InputStream in = CalendarImportTest.class.getResourceAsStream("cal_without_dtend.ics");
 		FileUtils.copyInputStreamToFile(in, newCalendarFile);
+		in.close();
+		
 		//to be sure
 		emptyCalendarCache();
 		//load the calendar