Merge OpenOLAT 9.4 to OpenOLAT default branch with 4a39ff9a984d317d6dca204d57e1d48b44e4f26b

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

@@ -138,9 +138,12 @@ public class FullCalendarMapper implements Mapper {
 	private boolean isInRange(Date from, Date to, KalendarEvent event) {
 		Date end = event.getEnd();
 		Date begin = event.getBegin();
+		System.out.println(begin + " -> " + end);
 		if(begin != null && end != null) {
 			if(from.compareTo(begin) <= 0 && to.compareTo(end) >= 0) {
 				return true;
+			} else if(begin.compareTo(from) <= 0 && end.compareTo(to) >= 0) {
+				return true;
 			} else if(from.compareTo(begin) <= 0 && to.compareTo(begin) >= 0) {
 				return true;
 			} else if(from.compareTo(end) <= 0 && to.compareTo(end) >= 0) {

src/main/java/org/olat/group/manager/BusinessGroupImportExport.java

@@ -304,8 +304,9 @@ public class BusinessGroupImportExport {
 
 				// get memberships
 				List<String> memberships = group.areaRelations;
-				if(memberships != null) {
-					for (String membership : memberships) {
+				if(memberships != null && memberships.size() > 0) {
+					Set<String> uniqueMemberships = new HashSet<>(memberships);
+					for (String membership : uniqueMemberships) {
 						BGArea area = areaManager.findBGArea(membership, re.getOlatResource());
 						if (area == null) {
 							throw new AssertException("Group-Area-Relationship in export, but area was not created during import.");