Index: lams_central/web/includes/javascript/orgGroup.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/orgGroup.js,v
diff -u -r1.5 -r1.6
--- lams_central/web/includes/javascript/orgGroup.js	5 Dec 2013 12:52:23 -0000	1.5
+++ lams_central/web/includes/javascript/orgGroup.js	16 Jul 2014 20:17:07 -0000	1.6
@@ -1,504 +1,237 @@
-// for user selecting and sorting purposes
-var sortOrderAscending = {};
-var lastSelectedUsers = {};
+var lastSelected = {};
 
 $(document).ready(function(){
-	$('.ui-button').button();
-	// show unassigned users on the left
-	fillGroup(unassignedUsers, $('#unassignedUserCell'));
+	// show all learning libraries on the left
+	fillGroup(learningLibraries, $('#learningLibraryCell'));
 	// add existing groups
-	$.each(grouping.groups, function(){
-		// if a course grouping is being copied as lesson grouping,
-		// do not use group IDs as they will be created when assiging users to created groups
-		var groupId = !lessonMode || skipAssigningWhenCreatingGroup ? this.groupId : null;
-		var group = addGroup(groupId, this.name, this.users);
-		if (this.locked) {
-			markGroupLocked(group);
-		}
+	$.each(groups, function(){
+		var group = addGroup(this);
 	});
-	// after initial group creation, all new groups will be created on server
-	skipAssigningWhenCreatingGroup = false;
 	
-	// initialisation based on mode
-	if (lessonMode) {
-		toggleBackButton();
-	} else {
-		$('#groupingName').val(grouping.name);
-		// move Save button to the titlebar, i.e. outside of this iframe to the enveloping dialog
-		$('div.ui-dialog-titlebar', window.parent.document).prepend($('.customDialogButton'));
-	}
-	
-	if (canEdit) {
-		// allow adding new groups
-		$('#newGroupPlaceholder').click(function(){
-			// the label is "Group X" where X is the top group number
-			addGroup(null, LABELS.GROUP_PREFIX_LABEL + ' ' + $('#groupsTable .groupContainer').length, null);
-		});
-	}
+	$('#newGroupPlaceholder').click(function(){
+		addGroup();
+	});
 });
 
 
 /**
  * Add a group and fills it with given users.
  */
-function addGroup(groupId, name, users) {
+function addGroup(groupData) {
 	var group = $('#groupTemplate').clone()
 					.attr({
 						// remove template's HTML ID
 						'id'      : null,
-						'groupId' : groupId
+						'groupId' : groupData ? groupData.groupId : null
 					})
-					.css('display', null);
+					.css('display', null)
+					.insertBefore('#newGroupPlaceholder');
 	
-	var groupNameFields = $('#groupsTable .groupContainer input');
-	var groupTopIndex = groupNameFields.length;
-	// names can be blank in course groups,
-	// but in lesson groups they have to exist and be unique
-	if (lessonMode && !name) {
-		name = LABELS.GROUP_PREFIX_LABEL + ' ' + groupTopIndex;
-	}
-	var nameIsUnique;
-	do {
-		nameIsUnique = true;
-		groupNameFields.each(function(){
-			if (name == $(this).val()) {
-				nameIsUnique = false;
-				return false;
-			}
-		});
-		if (!nameIsUnique) {
-			groupTopIndex++;
-			name = LABELS.GROUP_PREFIX_LABEL + groupTopIndex;
-		}
-	} while (!nameIsUnique);
+	group.find('input').val(groupData ? groupData.name : LABELS.GROUP_DEFAULT_NAME);
+	fillGroup(groupData ? groupData.learningLibraries : null, group);
 	
-	group.find('input').val(name);
-	
-	var newGroupPlaceholder = $('#newGroupPlaceholder');
-	if (newGroupPlaceholder.length > 0) {
-		group.insertBefore(newGroupPlaceholder);
-	} else {
-		// there is no placeholder in read-only mode
-		$('#groupsCell').append(group);
-	}
-	
-	fillGroup(users, group);
-	
 	return group;
 }
 
 
 /**
- * Makes a list of users and adds drag&drop functionality to them.
+ * Makes a list of learning libraries and adds drag&drop functionality to them.
  */
-function fillGroup(users, container) {
-	// make calls to server or just create users in HTML
-	var createOnServer = lessonMode && !skipAssigningWhenCreatingGroup
-									&& container.attr('id') != 'unassignedUserCell';
-	if (users) {
-		// create user DIVs
-		$.each(users, function(index, userJSON) {
-			var userDiv = $('<div />').attr('userId', userJSON.id)
-				.addClass('draggableUser')
-	    		.text(userJSON.firstName + ' ' + userJSON.lastName 
-	    				  + ' (' + userJSON.login + ')'
-	    			   );
-			
-			// if teacher can not edit, then no drag&drop is available
-			if (canEdit) {
-	    		userDiv.draggable({ 
-							'appendTo'    : 'body',
-							'containment' : '#groupsTable',
-						    'revert'      : 'invalid',
-						    'distance'    : 20,
-						    'scroll'      : false,
-						    'cursor'      : 'move',
-							'helper'      : function(event){
-								// include the user from which dragging started
-								$(this).addClass('draggableUserSelected');
-								
-								// copy selected users
-								var helperContainer = $('<div />');
-								$(this).siblings('.draggableUserSelected').andSelf().each(function(){
-									$(this).clone().appendTo(helperContainer);
-								});
-								return helperContainer;
-							}
-					})
-				
-					.click(function(event){
-						var wasSelected = $(this).hasClass('draggableUserSelected');
-						var parentId = $(this).parent().parent().attr('id');
-						// this is needed for shift+click
-						var lastSelectedUser = lastSelectedUsers[parentId];
-						
-						if (event.shiftKey && lastSelectedUser && lastSelectedUser != this) {
-							// clear current selection
-							$(this).siblings().andSelf().removeClass('draggableUserSelected');
-							
-							// find range of users to select
-							var lastSelectedIndex = $(lastSelectedUser).index();
-							var index = $(this).index();
-							
-							var startingElem = lastSelectedIndex > index ? this : lastSelectedUser;
-							var endingElem = lastSelectedIndex > index ? lastSelectedUser : this;
-							
-							$(startingElem).nextUntil(endingElem).andSelf().add(endingElem)
-								.addClass('draggableUserSelected');
-						} else {
-							if (!event.ctrlKey) {
-								// clear current sleection
-								$(this).siblings().andSelf().removeClass('draggableUserSelected');
-							}
-							
-							if (wasSelected && !event.shiftKey){
-								$(this).removeClass('draggableUserSelected');
-								lastSelectedUsers[parentId] = null;
-							} else {
-								$(this).addClass('draggableUserSelected');
-								lastSelectedUsers[parentId] = this;
-							}
-						}
-					});
-			}
-			
-			if (createOnServer) {
-				// copy course groups as lesson groups, creating new instances
-				if (assignUsersToGroup([userJSON.id], container)) {
-					$('.userContainer', container).append(userDiv);
-				} else {
-					// if it fails, put them in unassigned list
-					$('#unassignedUserCell .userContainer').append(userDiv);
-				}
-			} else {
-				$('.userContainer', container).append(userDiv);
-			}
+function fillGroup(learningLibraries, container) {
+	if (learningLibraries) {
+		// create learning library DIVs
+		$.each(learningLibraries, function(index, learningLibraryJSON) {
+			var learningLibraryDiv = createLearningLibraryDiv(learningLibraryJSON.learningLibraryId, learningLibraryJSON.title);
+			$('.learningLibraryContainer', container).append(learningLibraryDiv);
 		});
 		
-		sortUsers(container);
-	} else if (createOnServer) {
-		// just createa an empty group
-		assignUsersToGroup(null, container);
+		colorDraggableLearningLibraries(container);
 	}
 	
-	$('.sortUsersButton', container).click(function(){
-		sortUsers(container);
+	$(container).droppable({
+	   'activeClass' : 'droppableHighlight',
+	   'tolerance'   : 'pointer',
+	   'drop'        : function (event, ui) {
+		   var draggableLearningLibraryContainer = $(ui.draggable).parent(),
+		   	   thisLearningLibraryContainer = $('.learningLibraryContainer', this);
+		   // do not do anything if it is the same container
+		   // using "accept" feature breaks the layout
+		   if (draggableLearningLibraryContainer[0] !=  thisLearningLibraryContainer[0]) {
+			   transferLearningLibraries(draggableLearningLibraryContainer, thisLearningLibraryContainer);
+		   }
+	   }
 	});
 	
-	if (canEdit) {
-		$(container).droppable({
-		   'activeClass' : 'droppableHighlight',
-		   'tolerance'   : 'pointer',
-		   'drop'        : function (event, ui) {
-			   var draggableUserContainer = $(ui.draggable).parent();
-			   var thisUserContainer = $('.userContainer', this);
-			   // do not do anything if it is the same container
-			   // using "accept" feature breaks the layout
-			   if (draggableUserContainer[0] !=  thisUserContainer[0]) {
-				   var executeDrop = !lessonMode;
-				   if (!executeDrop) {
-					   var transferToLocked = $(this).hasClass('locked');
-					   // make sure user wants to transfer learners to a group which is already in use
-					   executeDrop = !transferToLocked || confirm(LABELS.TRANSFER_LOCKED_LABEL);
-					   if (executeDrop) {
-						   var userIds = [];
-						   $('div.draggableUserSelected', draggableUserContainer).each(function(){
-							   userIds.push($(this).attr('userId'));
-						   });
-						   // execute transfer on server side
-						   executeDrop = assignUsersToGroup(userIds, $(this));
-					   }
-			       }
-				   
-				   if (executeDrop) {
-					   transferUsers(draggableUserContainer, thisUserContainer);
-				   }
-			   }  
-		   }
-		});
-	
+	$('.removeGroupButton', container).click(function(){
+		removeGroup(container);
+	});
+}
+
+
+function createLearningLibraryDiv(learningLibraryId, title) {
+	return $('<div />').attr('learningLibraryId', learningLibraryId)
+	.addClass('draggableLearningLibrary')
+	.text(title)
+	.draggable({
+			'appendTo'    : 'body',
+			'containment' : '#groupsTable',
+		    'revert'      : 'invalid',
+		    'distance'    : 20,
+		    'cursor'      : 'move',
+			'helper'      : function(event){
+				// include the learning library from which dragging started
+				$(this).addClass('draggableLearningLibrarySelected');
+				
+				// copy selected learning libraries
+				var helperContainer = $('<div />');
+				$(this).siblings('.draggableLearningLibrarySelected').andSelf().each(function(){
+					$(this).clone().appendTo(helperContainer);
+				});
+				return helperContainer;
+			}
+	})
+
+	.click(function(event){
+		var wasSelected = $(this).hasClass('draggableLearningLibrarySelected'),
+			parentId = $(this).parent().parent().attr('id'),
+			// this is needed for shift+click
+			lastSelectedLearningLibrary = lastSelected[parentId];
 		
-		$('.removeGroupButton', container).click(function(){
-			removeGroup(container);
-		});
-		
-		if (lessonMode) {
-			$('input', container).blur(function(){
-				renameGroup(container);
-			});
+		if (event.shiftKey && lastSelectedLearningLibrary && lastSelectedLearningLibrary != this) {
+			// clear current selection
+			$(this).siblings().andSelf().removeClass('draggableLearningLibrarySelected');
+			
+			// find range of learning libraries to select
+			var lastSelectedIndex = $(lastSelectedLearningLibrary).index(),
+				index = $(this).index().
+				startingElem = lastSelectedIndex > index ? this : lastSelectedLearningLibrary,
+				endingElem = lastSelectedIndex > index ? lastSelectedLearningLibrary : this;
+			
+			$(startingElem).nextUntil(endingElem).andSelf().add(endingElem)
+				.addClass('draggableLearningLibrarySelected');
+		} else {
+			if (!event.ctrlKey) {
+				// clear current sleection
+				$(this).siblings().andSelf().removeClass('draggableLearningLibrarySelected');
+			}
+			
+			if (wasSelected && !event.shiftKey){
+				$(this).removeClass('draggableLearningLibrarySelected');
+				lastSelected[parentId] = null;
+			} else {
+				$(this).addClass('draggableLearningLibrarySelected');
+				lastSelected[parentId] = this;
+			}
 		}
-	}
+	});
 }
 
+
 /**
- * Move user DIVs from one group to another
+ * Move learning library DIVs from one group to another
  */
-function transferUsers(fromContainer, toContainer) {
-	var selectedUsers =  $('.draggableUserSelected', fromContainer);
-	var locked = toContainer.parent().hasClass('locked');
-	if (selectedUsers.length > 0){   
-	   // move the selected users
-	   selectedUsers.each(function(){	  
-		  $(this).css({'top'  : '0px',
-              		   'left' : '0px',
-          }).removeClass('draggableUserSelected')
-            .appendTo(toContainer);
-		  
-		  if (locked) {
-            $(this).draggable('disable');
-		  }
-	   });
-	   
+function transferLearningLibraries(fromContainer, toContainer) {
+	var selectedLearningLibraries =  $('.draggableLearningLibrarySelected', fromContainer);
+	if (selectedLearningLibraries.length > 0){
+		if (toContainer.parent().attr('id') == 'learningLibraryCell'){
+			selectedLearningLibraries.remove();
+		} else {
+			var filteredLearningLibraries = [],
+				existingLearningLibraries = $('.draggableLearningLibrary', toContainer),
+				isAdd = fromContainer.parent().attr('id') == 'learningLibraryCell';
+			$.each(selectedLearningLibraries, function(){
+				var selectedLearningLibrary = $(this);
+				$.each(existingLearningLibraries, function(){
+					if ($(this).attr('learningLibraryId') == selectedLearningLibrary.attr('learningLibraryId')){
+						selectedLearningLibrary = null;
+						return false;
+					}
+				});
+				if (selectedLearningLibrary) {
+					if (isAdd) {
+						selectedLearningLibrary = createLearningLibraryDiv(selectedLearningLibrary.attr('learningLibraryId'),
+								selectedLearningLibrary.text());
+					}
+					filteredLearningLibraries.push(selectedLearningLibrary);
+				}
+			});
+			
+		   // move the selected learning libraries
+			$.each(filteredLearningLibraries, function(){	  
+				  $(this).css({'top'  : '0px',
+		              		   'left' : '0px',
+		          }).removeClass('draggableLearningLibrarySelected')
+		            .appendTo(toContainer);
+		   });
+		}
 	   // recolour both containers
-	   colorDraggableUsers(toContainer);
-	   colorDraggableUsers(fromContainer);
+	   colorDraggableLearningLibraries(toContainer);
+	   colorDraggableLearningLibraries(fromContainer);
 	}
 }
 
 
-function colorDraggableUsers(container) {
+function colorDraggableLearningLibraries(container) {
 	// every second line is different
-	$(container).find('div.draggableUser').each(function(index, userDiv){
+	$(container).find('div.draggableLearningLibrary').each(function(index, learningLibraryDiv){
 		// exact colour should be defined in CSS, but it's easier this way...
 		$(this).css('background-color', index % 2 ? '#dfeffc' : 'inherit');
 	});
 }
 
 /**
- * Sort users according to their names.
+ * Remove a group from the page.
  */
-function sortUsers(container) {
-	var containerId = container.attr('id');
-	var users = $('div.draggableUser', container);
-	if (users.length > 1) {
-		var sortOrderAsc = sortOrderAscending[containerId];
-		
-		users.each(function(){
-			$(this).detach();
-		}).sort(function(a, b){
-			var keyA = $(a).text().toLowerCase();
-			var keyB = $(b).text().toLowerCase();
-			var result = keyA > keyB ? 1 : keyA < keyB ? -1 : 0;
-			return sortOrderAsc ? -result : result;
-		}).each(function(){
-			$(this).appendTo($('.userContainer', container));
-		});
-		
-		var button = container.find('.sortUsersButton');
-		if (sortOrderAsc) {
-			button.html('▼');
-			sortOrderAscending[containerId] = false;
-		} else {
-			button.html('▲');
-			sortOrderAscending[containerId] = true;
-		}
-		
-		colorDraggableUsers(container);
-	}
-}
-
-/**
- * Remove a group both from the server and the page.
- */
 function removeGroup(container) {
-	// no groupId means this group was just added and it was not persisted in DB yet
-	var groupId = container.attr('groupId');
-	var executeDelete = true;
-	if (groupId) {
-		executeDelete = confirm(LABELS.GROUP_REMOVE_LABEL);
+	if (confirm(LABELS.GROUP_REMOVE_CONFIRM)){
+		container.remove();
 	}
-	if (executeDelete) {
-		executeDelete = !lessonMode;
-		
-		if (lessonMode) {
-			$.ajax({
-				async    : false,
-				cache    : false,
-				dataType : 'json',
-				url : LAMS_URL + 'monitoring/grouping.do',
-				data : {
-					'method'     : 'removeGroupJSON',
-					'activityID' : groupingActivityId,
-					'groupID'    : groupId
-				},
-				type : 'POST',
-				success : function(response) {
-					executeDelete = response.result;
-				}
-			});
-		}
-		
-		if (executeDelete) {
-			$('#unassignedUserCell .userContainer').append($('.userContainer div.draggableUser', container));
-			container.remove();
-			toggleBackButton();
-		}
-	}
 }
 
-/**
- * Change name of a group both on the server and on the page.
- */
-function renameGroup(container) {
-	var groupId = $(container).attr('groupId');
-	var nameInput = $('input', container);
-	var inputEditable = !nameInput.attr('readonly');
-	// only lesson groups which exist on the server need to have their names changed immediatelly
-	if (lessonMode && groupId && inputEditable) {
-		var groupName = nameInput.val();
-		$.ajax({
-			cache    : false,
-			url : LAMS_URL + 'monitoring/grouping.do',
-			data : {
-				'method'     : 'changeGroupNameJSON',
-				'groupID'    : groupId,
-				'name'       : groupName
-			},
-			type : 'POST'
-		});
-	}
-}
 
-/**
- * Save a course grouping.
- */
 function saveGroups(){
-	if (!canEdit || lessonMode) {
-		return false;
-	}
-	$('.errorMessage').hide();
+	var groups = [],
+		result = false;
 	
-	var groupingName = $('#groupingName').val();
-	if (!groupingName) {
-		// course grouping name can not be blank
-		$('#groupingNameBlankError').show();
-		return false;
-	}
-	
-	// ask if removing new, empty groups is OK
-	var acceptEmptyGroups = true;
-	var groupContainers = $('#groupsTable .groupContainer').not('#newGroupPlaceholder');
-	$.each(groupContainers.not('[groupId]'), function(){
-		if ($('div.draggableUser', this).length == 0) {
-			 acceptEmptyGroups = false;
-			 return false;
+	$('#groupsTable .groupContainer').not('#newGroupPlaceholder').each(function(){
+		var learningLibraries = $('div.draggableLearningLibrary', this),
+			learningLibraryIds = [],
+			name =  $('input', this).val();
+		if (!name || name.trim() == '') {
+			alert('A group name can not be blank');
+			groups = null;
+			return false;
 		}
-	});
-	if (!acceptEmptyGroups) {
-		acceptEmptyGroups = confirm(LABELS.EMPTY_GROUP_SAVE_LABEL);
-	}
-	if (!acceptEmptyGroups) {
-		return false;
-	}
-	
-	var groupsSaved = false;
-	var newGrouping = {
-			'groupingId' : grouping.groupingId,
-			'name' : groupingName,
-			'groups' : []
-	};
-	groupContainers.each(function(){
-		var groupId = $(this).attr('groupId');
-		var users = $('div.draggableUser', this);
-		if (!groupId && users.length == 0) {
-			return true;
-		}
-		
-		var userIds = [];
-		$.each(users, function(){
-			userIds.push($(this).attr('userId'));
+		$.each(learningLibraries, function(){
+			learningLibraryIds.push($(this).attr('learningLibraryId'));
 		});
 		
-		// add the group JSON to grouping JSON
-		newGrouping.groups.push({
-			'groupId' : groupId,
-			'name'    : $('input', this).val(),
-			'users'   : userIds
+		// add the group JSON
+		groups.push({
+			'groupId' 			: $(this).attr('groupId'),
+			'name'    			: name,
+			'learningLibraries' : learningLibraryIds
 		});
 	});
 	
-	$.ajax({
-		async : false,
-		cache : false,
-		url : LAMS_URL + 'OrganisationGroup.do',
-		data : {
-			'method' : 'save',
-			'organisationID' : grouping.organisationId,
-			'grouping' : JSON.stringify(newGrouping)
-		},
-		type : 'POST',
-		success : function() {
-			groupsSaved = true;
-		}
-	});
-	
-	return groupsSaved;
-}
-
-/**
- * Transfer learners between groups on the server.
- */
-function assignUsersToGroup(userIds, groupContainer) {
-	// if removing from any groups, set group ID as -1; server understands this
-	var groupId = groupContainer.attr('id') == 'unassignedUserCell' ? -1 : groupContainer.attr('groupId');
-	// name is only needed when creating a new group, i.e. a group which does not have ID yet
-	var groupName = groupId ? null : $('input', groupContainer).val();
-	var result = false;
-	
-	$.ajax({
-		async    : false,
-		cache    : false,
-		dataType : 'json',
-		url : LAMS_URL + 'monitoring/grouping.do',
-		data : {
-			'method'     : 'addMembersJSON',
-			'activityID' : groupingActivityId,
-			'groupID'    : groupId,
-			'name'       : groupName,
-			'members'    : userIds ? userIds.join() : null
-		},
-		type : 'POST',
-		success : function(response) {
-			result = response.result;
-			if (response.groupId) {
-				groupContainer.attr('groupId', response.groupId);
+	if (groups){	
+		$.ajax({
+			'async'   : false,
+			'cache'   : false,
+			'url'     : 'toolcontentlist.do',
+			'data'    : {
+				'action' : 'saveLearningLibraryGroups',
+				'groups' : JSON.stringify(groups)
+			},
+			'type' 	  : 'POST',
+			'success' : function(){
+				result = true;
+			},
+			'error'	  : function(){
+				alert('Error while saving groups');
 			}
-			if (!result && response.locked) {
-				// the server says that the group became in use while teacher was working with this screen
-				markGroupLocked($('div[userId="' + userIds[0] + '"]').parents('.groupContainer'));
-				alert(LABELS.GROUP_LOCK_LABEL);
-			}
-			toggleBackButton();
-		}
-	});
+		});
+	}
 	
 	return result;
-}
-
-/**
- * If there are any existing (not new) groups, forbid going back to grouping list.
- */
-function toggleBackButton() {
-	if (lessonMode) {
-		var backButton = $('#backButton');
-		var disabled = $('.groupContainer[groupId]').length > 0;
-		if (disabled) {
-			backButton.off('click').button('option', 'disabled', true);
-		} else {
-			backButton.click(function(){
-				document.location.href = LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&activityID='
-					+ groupingActivityId + '&organisationID=' + grouping.organisationId;
-			}).button('option', 'disabled', false);
-		}
-	}
-}
-
-/**
- * Makes a group almost immutable as server does not allow changed.
- */
-function markGroupLocked(container) {
-	container.addClass('locked');
-	$('.removeGroupButton', container).remove();
-	// $('input', container).attr('readonly', 'readonly');
-	$('div.draggableUser', container).off('click').draggable('disable');
 }
\ No newline at end of file