Merge OpenOLAT 11.3 to OpenOLAT default branch with 4feece062067a39e51f424683739a4ba71d7ddc9

src/main/java/org/olat/core/commons/modules/bc/FolderManager.java

@@ -36,6 +36,7 @@ import org.olat.core.commons.modules.bc.meta.MetaInfoFactory;
 import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
 import org.olat.core.helpers.Settings;
 import org.olat.core.manager.BasicManager;
+import org.olat.core.util.WebappHelper;
 import org.olat.core.util.vfs.OlatRelPathImpl;
 import org.olat.core.util.vfs.VFSItem;
 import org.olat.core.util.vfs.VFSLeaf;
@@ -53,14 +54,14 @@ public class FolderManager  extends BasicManager {
 	 */
 	public static String getWebDAVHttp() {
 		if(Settings.isInsecurePortAvailable()) {
-			return Settings.getInsecureServerContextPathURI() + "/webdav";
+			return Settings.getInsecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
 		}
 		return null;
 	}
 	
 	public static String getWebDAVHttps() {
 		if(Settings.isSecurePortAvailable()) {
-			return Settings.getSecureServerContextPathURI() + "/webdav";
+			return Settings.getSecureServerContextPathURI() + WebappHelper.getServletContextPath() + "/webdav";
 		}
 		return null;
 	}

src/main/java/org/olat/core/util/openxml/OpenXMLWorksheet.java

@@ -194,7 +194,7 @@ public class OpenXMLWorksheet {
 			//header rows
 			if(getHeaderRows() > 0) {
 				writer.writeStartElement("pane");
-				writer.writeAttribute("topLeftCell", "A1");
+				writer.writeAttribute("topLeftCell", "A" + (getHeaderRows() + 1));
 				writer.writeAttribute("xSplit", "0");
 				writer.writeAttribute("ySplit", Integer.toString(getHeaderRows()));
 				writer.writeAttribute("activePane", "bottomLeft");

src/main/java/org/olat/course/archiver/ScoreAccountingHelper.java

@@ -92,6 +92,8 @@ public class ScoreAccountingHelper {
 	public static void createCourseResultsOverviewXMLTable(List<Identity> identities, List<AssessableCourseNode> myNodes, ICourse course, Locale locale, OutputStream bos) {
 		OpenXMLWorkbook workbook = new OpenXMLWorkbook(bos, 1);
 		OpenXMLWorksheet sheet = workbook.nextWorksheet();
+		sheet.setHeaderRows(2);
+		
 		int headerColCnt = 0;
 		Translator t = Util.createPackageTranslator(ScoreAccountingArchiveController.class, locale);
 
@@ -111,8 +113,6 @@ public class ScoreAccountingHelper {
 		String no = t.translate("column.field.no");
 		String submitted = t.translate("column.field.submitted");
 
-
-		
 		Row headerRow1 = sheet.newRow();
 		headerRow1.addCell(headerColCnt++, sequentialNumber);
 		headerRow1.addCell(headerColCnt++, login);
@@ -176,7 +176,6 @@ public class ScoreAccountingHelper {
 			}
 		}
 		
-		sheet.setHeaderRows(2);
 
 		// preload user properties cache
 		CourseEnvironment courseEnvironment = course.getCourseEnvironment();