Merge remote-tracking branch 'origin/OpenOLAT_12.5'

src/main/java/org/olat/core/commons/modules/bc/commands/CmdUnzip.java

@@ -48,6 +48,7 @@ import org.olat.core.gui.translator.Translator;
 import org.olat.core.id.Identity;
 import org.olat.core.id.Roles;
 import org.olat.core.logging.AssertException;
+import org.olat.core.util.StringHelper;
 import org.olat.core.util.ZipUtil;
 import org.olat.core.util.vfs.Quota;
 import org.olat.core.util.vfs.VFSConstants;
@@ -68,11 +69,12 @@ public class CmdUnzip extends BasicController implements FolderCommand {
 		super(ureq, wControl);
 	}
 	
+	@Override
 	public Controller execute(FolderComponent folderComponent, UserRequest ureq, WindowControl wContr, Translator trans) {
 		this.translator = trans;
 		FileSelection selection = new FileSelection(ureq, folderComponent.getCurrentContainerPath());
 		VFSContainer currentContainer = folderComponent.getCurrentContainer();
-		if (!(currentContainer.canWrite() == VFSConstants.YES))
+		if (currentContainer.canWrite() != VFSConstants.YES)
 			throw new AssertException("Cannot unzip to folder. Writing denied.");
 			
 	  //check if command is executed on a file containing invalid filenames or paths - checks if the resulting folder has a valid name
@@ -81,7 +83,7 @@ public class CmdUnzip extends BasicController implements FolderCommand {
 			return null;
 		}		
 		
-		List<String> lockedFiles = new ArrayList<String>();
+		List<String> lockedFiles = new ArrayList<>();
 		for (String sItem:selection.getFiles()) {
 			VFSItem vfsItem = currentContainer.resolve(sItem);
 			if (vfsItem instanceof VFSLeaf) {
@@ -181,7 +183,19 @@ public class CmdUnzip extends BasicController implements FolderCommand {
 		VFSContainer zipContainer = currentContainer.createChildContainer(sZipContainer);
 		if (zipContainer == null) {
 			if(versioning) {
-				zipContainer =(VFSContainer)currentContainer.resolve(sZipContainer);
+				VFSItem resolvedItem = currentContainer.resolve(sZipContainer);
+				if(resolvedItem instanceof VFSContainer) {
+					zipContainer = (VFSContainer)resolvedItem;
+				} else {
+					String numberedFilename = findContainerName(currentContainer, sZipContainer);
+					if(StringHelper.containsNonWhitespace(numberedFilename)) {
+						zipContainer = currentContainer.createChildContainer(numberedFilename);
+					}
+					if(zipContainer == null) {// we try our best
+						wControl.setError(translator.translate("unzip.alreadyexists", new String[] {sZipContainer}));
+						return false;
+					}
+				}
 			} else {
 				// folder already exists... issue warning
 				wControl.setError(translator.translate("unzip.alreadyexists", new String[] {sZipContainer}));
@@ -212,6 +226,19 @@ public class CmdUnzip extends BasicController implements FolderCommand {
 		}
 		return true;
 	}
+	
+	private String findContainerName(VFSContainer container, String filename) {
+		String newName = filename;
+		VFSItem newFile = container.resolve(newName);
+		for(int count=1; newFile != null && count < 999 ; count++) {
+			newName = filename + "_" + count;
+		    newFile = container.resolve(newName);
+		}
+		if(newFile == null) {
+			return newName;
+		}
+		return null;
+	}
 
 	@Override
 	public int getStatus() {

src/main/java/org/olat/core/gui/components/form/flexible/elements/DateChooser.java

@@ -73,5 +73,12 @@ public interface DateChooser extends TextElement {
 	 * @param dateChooser A date chooser
 	 */
 	public void setDefaultValue(DateChooser dateChooser);
+	
+	/**
+	 * This will set the default time to 23:59 instead of 00:00
+	 * 
+	 * @param endOfDay
+	 */
+	public void setDefaultTimeAtEndOfDay(boolean endOfDay);
 
 }
\ No newline at end of file

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/JSDateChooser.java

@@ -61,6 +61,7 @@ public class JSDateChooser extends TextElementImpl implements DateChooser {
 
 	private Locale locale;
 	private boolean dateChooserTimeEnabled;
+	private boolean defaultTimeAtEndOfDay;
 	private String forValidDateErrorKey;
 	private boolean checkForValidDate;
 	private int minute;
@@ -238,6 +239,15 @@ public class JSDateChooser extends TextElementImpl implements DateChooser {
 		this.dateChooserTimeEnabled = dateChooserTimeEnabled;
 	}
 
+	public boolean isDefaultTimeAtEndOfDay() {
+		return defaultTimeAtEndOfDay;
+	}
+
+	@Override
+	public void setDefaultTimeAtEndOfDay(boolean defaultTimeAtEndOfDay) {
+		this.defaultTimeAtEndOfDay = defaultTimeAtEndOfDay;
+	}
+
 	/* (non-Javadoc)
 	 * @see org.olat.core.gui.components.form.flexible.impl.elements.DateChooser#getDateChooserDateFormat()
 	 */

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/JSDateChooserComponent.java

@@ -93,6 +93,10 @@ class JSDateChooserComponent extends FormBaseComponentImpl {
 	public boolean isDateChooserTimeEnabled() {
 		return element.isDateChooserTimeEnabled();
 	}
+	
+	public boolean isDefaultTimeAtEndOfDay() {
+		return element.isDefaultTimeAtEndOfDay();
+	}
 
 	public Translator getElementTranslator() {
 		return element.getTranslator();

src/main/java/org/olat/core/gui/components/form/flexible/impl/elements/JSDateChooserRenderer.java

@@ -132,7 +132,12 @@ class JSDateChooserRenderer extends DefaultComponentRenderer {
 				int hour, minute;
 				Date currentDate = jsdcc.getDate();
 				if(currentDate == null) {
-					hour = minute = 0;
+					if(jsdcc.isDefaultTimeAtEndOfDay()) {
+						hour = 23;
+						minute = 59;
+					} else {
+						hour = minute = 0;
+					}
 				} else {
 					Calendar cal = Calendar.getInstance();
 					cal.setTime(currentDate);

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

@@ -247,6 +247,7 @@ public class ConditionConfigEasyController extends FormBasicController implement
 		toDate.setExampleKey("form.easy.example.edate", null);
 		toDate.setDateChooserTimeEnabled(true);
 		toDate.setDisplaySize(toDate.getExampleDateString().length());
+		toDate.setDefaultTimeAtEndOfDay(true);
 		dateSubContainer.add(toDate);
 
 		dateSwitch = uifactory.addCheckboxesHorizontal("dateSwitch", null, formLayout, new String[] { "ison" }, new String[] { translate("form.easy.dateSwitch") });

src/main/java/org/olat/ims/qti21/ui/components/_content/matchInteraction_truefalse.html

@@ -46,7 +46,8 @@
 				formDispatchFieldId: '$r.formDispatchFieldId',
 				maxAssociations: $interaction.maxAssociations,
 				leftData: {#foreach($choice1 in $orderedSet1) #if($foreach.count > 1),#end $choice1.identifier:$choice1.matchMax #end},
-				rightData: {#foreach($choice2 in $orderedSet2) #if($foreach.count > 1),#end $choice2.identifier:$choice2.matchMax #end}
+				rightData: {#foreach($choice2 in $orderedSet2) #if($foreach.count > 1),#end $choice2.identifier:$choice2.matchMax #end},
+				unansweredColumn: 'o_match_true_false_unanswered'
 			});
 		});
         </script>

src/main/webapp/static/js/jquery/qti/jquery.match.js

 (function ($) {
 	$.fn.matchInteraction = function(options) {
+		"use strict";
 		var settings = $.extend({
 			responseIdentifier: null,
 			formDispatchFieldId: null,
 			maxAssociations: 1,
+			unansweredColumn: null,
 			leftData: {},
 			rightData: {},
 			leftMap: {},
@@ -38,11 +40,11 @@
         });
         recalculate(settings);
         updateDisabledStates(settings);
-    };
+    }
     
     function queryInputElements(responseIdentifier) {
         return jQuery('input[name=qtiworks_response_' + responseIdentifier + ']');
-    };
+    }
 
 	function withCheckbox(settings, inputElement, callback) {
 		var directedPair = inputElement.value;
@@ -50,7 +52,7 @@
 		var left = settings.leftMap[splitPair[0]];
 		var right = settings.rightMap[splitPair[1]];
         callback(inputElement, directedPair, left, right);
-    };
+    }
 
     /**
      * Left -> source (set 0)
@@ -76,7 +78,7 @@
                 }
             });
         });
-    };
+    }
 
     /**
      * Left -> source (set 0)
@@ -102,7 +104,7 @@
                 }
             });
         });
-    };
+    }
 
 	function checkMatch(settings, inputElement) {
 		withCheckbox(settings, inputElement, function(inputElement, directedPair, left, right) {
@@ -153,6 +155,35 @@
                 right.matchCount--;
             }
             updateDisabledStates(settings);
+            if(!inputElement.checked && settings.unansweredColumn != null) {
+            	checkUnanswered(settings, inputElement);
+            }
         });
     }
+	
+	function checkUnanswered(settings, inputElement) {
+		var jInputElement = jQuery(inputElement);
+		var inputRightId = jInputElement.attr('value').split(" ")[0];
+		
+		var numOfSelectedBox = 0;
+		var unansweredCheckbox = null;
+		queryInputElements(settings.responseIdentifier).each(function() {
+			withCheckbox(settings, this, function(element, directedPair, left, right) {
+				var jElement = jQuery(element);
+				var elementRightId = jElement.attr('value').split(" ")[0];
+				if(inputRightId === elementRightId) {
+					if(element.checked) {
+						numOfSelectedBox++;
+					} else if(jElement.closest("." + settings.unansweredColumn).length == 1) {
+						unansweredCheckbox = element;
+					}
+				} 
+			});
+		});
+		
+		if(numOfSelectedBox == 0 && unansweredCheckbox != null) {
+			unansweredCheckbox.checked = true;
+		}
+	}
+	
 }( jQuery ));
\ No newline at end of file