Index: lams_monitoring/web/branching/chosenSelection.jsp
===================================================================
diff -u -r7f65c5834b2d8aaee5e26b1f49a1c634c1c6cb15 -re1683b7e5ac777deb10d15b0bf41182587ca8373
--- lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision 7f65c5834b2d8aaee5e26b1f49a1c634c1c6cb15)
+++ lams_monitoring/web/branching/chosenSelection.jsp	(.../chosenSelection.jsp)	(revision e1683b7e5ac777deb10d15b0bf41182587ca8373)
@@ -32,34 +32,18 @@
        <html:base/>
 	   <lams:css/>
       <title><c:out value="${title}"/></title>
-	<c:if test="${empty maxNumberOfGroups}">
-		<c:set var="maxNumberOfGroups" value="99"/>
-	</c:if>
 
 	<script type="text/javascript">
 	<!-- 
 		function init(){
-			getGroupsAndNonmembers();
+			getBranchesAndNonmembers();
 		}
 
-		function ajustButtonStatus(){
-			// if the maximum number of groups reached, disable the add group fields
-			if(document.getElementById("groups").length >= <c:out value="${maxNumberOfGroups}"/> ){
-				document.getElementById("newgroupname").disabled=true;
-				document.getElementById("groupadd").disabled=true;
-			} else {
-				document.getElementById("newgroupname").disabled=false;
-				document.getElementById("groupadd").disabled=false;
-			}
-
-			if(document.getElementById("groups").selectedIndex==-1){
-				document.getElementById("groupremove").disabled=true;
+		function adjustButtonStatus(){
+			if(document.getElementById("branches").selectedIndex==-1){
 				document.getElementById("nonmembersadd").disabled=true;
 				document.getElementById("membersremove").disabled=true;
 			}else{
-				if ( <c:out value="${mayDelete}"/> ) {
-					document.getElementById("groupremove").disabled=false;
-				}
 				if(document.getElementById("nonmembers[]").selectedIndex==-1){
 					document.getElementById("nonmembersadd").disabled=true;
 				}else{
@@ -73,59 +57,59 @@
 			}
 		}
 
-		function getGroupsAndNonmembers(){
-			getGroups();
+		function getBranchesAndNonmembers(){
+			getBranches();
 			getNonmembers();
 			document.getElementById("members[]").options.length = 0;
-			ajustButtonStatus();
+			adjustButtonStatus();
 		}
 
-		function getGroups(){
+		function getBranches(){
 			displayLoadingMessage();
-			url="<lams:WebAppURL/>/grouping.do?method=getGroups&activityID=<c:out value="${activityID}"/>";
+			url="<lams:WebAppURL/>/branching.do?method=getBranches&activityID=<c:out value="${activityID}"/>";
 			if (window.XMLHttpRequest) { // Non-IE browsers
-				groupRequest = new XMLHttpRequest();
-				groupRequest.onreadystatechange = updateGroups;
+				branchRequest = new XMLHttpRequest();
+				branchRequest.onreadystatechange = updateBranches;
 				try {
-						groupRequest.open("GET", url, true);
+						branchRequest.open("GET", url, true);
 				} catch (e) {
 						alert(e);
 				}
-				groupRequest.send(null);
+				branchRequest.send(null);
 			} else if (window.ActiveXObject) { // IE
-				groupRequest = new ActiveXObject("Microsoft.XMLHTTP");
-				if (groupRequest) {
-						groupRequest.onreadystatechange = updateGroups;
-						groupRequest.open("GET", url, true);
-						groupRequest.send();
+				branchRequest = new ActiveXObject("Microsoft.XMLHTTP");
+				if (branchRequest) {
+						branchRequest.onreadystatechange = updateBranches;
+						branchRequest.open("GET", url, true);
+						branchRequest.send();
 				}
 			}
 		}
 
-		function updateGroups(){
-			if (groupRequest.readyState == 4) { // Complete
+		function updateBranches(){
+			if (branchRequest.readyState == 4) { // Complete
 				clearMessage();
-				if (groupRequest.status == 200) { // OK response
-					var grpSelectObj = document.getElementById("groups");
-					grpSelectObj.options.length = 0;
-					var res = groupRequest.responseText.replace(/^\s*|\s*$/g,"");
+				if (branchRequest.status == 200) { // OK response
+					var branchSelectObj = document.getElementById("branches");
+					branchSelectObj.options.length = 0;
+					var res = branchRequest.responseText.replace(/^\s*|\s*$/g,"");
 					if(res.length>0){
-						var groups = res.split(";");
-						for (i=0; i<groups.length; i++){
-							var group = groups[i].split(",");
-							grpSelectObj.options[grpSelectObj.length] = new Option(group[1]+" ("+group[2]+")",group[0]);
+						var branches = res.split(";");
+						for (i=0; i<branches.length; i++){
+							var branch = branches[i].split(",");
+							branchSelectObj.options[branchSelectObj.length] = new Option(branch[1]+" ("+branch[2]+")",branch[0]);
 						}
 					}
 				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+groupRequest.status+".");
+					alert("<fmt:message key="error.grouping.data"/>"+" "+branchRequest.status+".");
 				}
-				ajustButtonStatus();
+				adjustButtonStatus();
 			}
 		}
 
 		function getNonmembers(){
 			displayLoadingMessage();
-			url="<lams:WebAppURL/>/grouping.do?method=getClassMembersNotGrouped&lessonID=<c:out value="${lessonID}"/>&activityID=<c:out value="${activityID}"/>";
+			url="<lams:WebAppURL/>/branching.do?method=getClassMembersNotGrouped&lessonID=<c:out value="${lessonID}"/>&activityID=<c:out value="${activityID}"/>";
 			if (window.XMLHttpRequest) { // Non-IE browsers
 				nonmembersRequest = new XMLHttpRequest();
 				nonmembersRequest.onreadystatechange = updateNonmembers;
@@ -160,15 +144,15 @@
 						}
 					}
 				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+groupRequest.status+".");
+					alert("<fmt:message key="error.grouping.data"/>"+" "+branchRequest.status+".");
 				}
-				ajustButtonStatus();
+				adjustButtonStatus();
 			}
 		}
 
-		function getMembers(group){
+		function getMembers(branch){
 			displayLoadingMessage();
-			url="<lams:WebAppURL/>/grouping.do?method=getGroupMembers&activityID=<c:out value="${activityID}"/>&groupID="+group.value;
+			url="<lams:WebAppURL/>/branching.do?method=getBranchMembers&branchID="+branch.value;
 			if (window.XMLHttpRequest) { // Non-IE browsers
 				memberRequest = new XMLHttpRequest();
 				memberRequest.onreadystatechange = updateMembers;
@@ -205,92 +189,14 @@
 				}else{
 					alert("<fmt:message key="error.grouping.data"/>"+" "+memberRequest.status);
 				}
-				ajustButtonStatus();
+				adjustButtonStatus();
 			}
 		}
 
 		
-		function addGroup(){
-			if(document.getElementById("newgroupname").value.replace(/^\s*|\s*$/g,"").length==0){
-				alert("<fmt:message key="error.grouping.add.group"/>");
-				document.getElementById("newgroupname").focus();
-			}else{
-				url="<lams:WebAppURL/>/grouping.do?method=addGroup&activityID=<c:out value="${activityID}"/>&name="+document.getElementById("newgroupname").value;
-				if (window.XMLHttpRequest) { // Non-IE browsers
-						addgrpRequest = new XMLHttpRequest();
-						addgrpRequest.onreadystatechange = grpAdded;
-						try {
-								addgrpRequest.open("GET", url, true);
-						} catch (e) {
-								alert(e);
-						}
-						addgrpRequest.send(null);
-				} else if (window.ActiveXObject) { // IE
-						addgrpRequest = new ActiveXObject("Microsoft.XMLHTTP");
-						if (addgrpRequest) {
-								addgrpRequest.onreadystatechange = grpAdded;
-								addgrpRequest.open("GET", url, true);
-								addgrpRequest.send();
-						}
-				}
-			}
-		}
-
-		function grpAdded(){
-			if (addgrpRequest.readyState == 4) { // Complete
-				if (addgrpRequest.status == 200) { // OK response
-					getGroups();
-					document.getElementById("newgroupname").value = "";
-					document.getElementById("members[]").options.length=0;
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+addgrpRequest.status);
-				}
-				ajustButtonStatus();
-			}
-		}
-
-		function removeGroup(){
-			if(document.getElementById("groups").selectedIndex == -1){
-				alert("<fmt:message key="${error.grouping.remove.group}"/>");
-			}else{
-				url="<lams:WebAppURL/>/grouping.do?method=removeGroup&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value;
-				if (window.XMLHttpRequest) { // Non-IE browsers
-						rmgrpRequest = new XMLHttpRequest();
-						rmgrpRequest.onreadystatechange = grpRemoved;
-						try {
-								rmgrpRequest.open("GET", url, true);
-						} catch (e) {
-								alert(e);
-						}
-						rmgrpRequest.send(null);
-				} else if (window.ActiveXObject) { // IE
-						rmgrpRequest = new ActiveXObject("Microsoft.XMLHTTP");
-						if (rmgrpRequest) {
-								rmgrpRequest.onreadystatechange = grpRemoved;
-								rmgrpRequest.open("GET", url, true);
-								rmgrpRequest.send();
-						}
-				}
-			}
-		}
-
-		function grpRemoved(){
-			if (rmgrpRequest.readyState == 4) { // Complete
-				if (rmgrpRequest.status == 200) { // OK response
-					var grpSelectObj = document.getElementById("groups");
-					grpSelectObj.remove(grpSelectObj.selectedIndex);
-					document.getElementById("members[]").options.length = 0;
-					getNonmembers(document.getElementById("groupings"));
-				}else{
-					alert("<fmt:message key="error.grouping.data"/>"+" "+rmgrpRequest.status);
-				}
-				ajustButtonStatus();
-			}
-		}
-
 		var count = 0;
 
-		function addMembersToGroup(){
+		function addMembersToBranch(){
 			var nonmembersSelectObj = document.getElementById("nonmembers[]");
 			var members = "";
 			for(i=0; i<nonmembersSelectObj.length; i++){
@@ -299,7 +205,7 @@
 					members = members + "," + nonmembersSelectObj.options[i].value;
 				}	
 			}
-			url="<lams:WebAppURL/>/grouping.do?method=addMembers&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value+"&members="+members.substr(1);
+			url="<lams:WebAppURL/>/branching.do?method=addMembers&branchID="+document.getElementById("branches").value+"&members="+members.substr(1);
 			if (window.XMLHttpRequest) { // Non-IE browsers
 					addmbrsRequest = new XMLHttpRequest();
 					addmbrsRequest.onreadystatechange = membersAdded;
@@ -322,25 +228,25 @@
 		function membersAdded(){
 				if (addmbrsRequest.readyState == 4) { // Complete
 						if (addmbrsRequest.status == 200) { // OK response
-							getNonmembers(document.getElementById("groupings"));
-							getMembers(document.getElementById("groups"));
-							var groupSelectObj = document.getElementById("groups");
-							var groupName = groupSelectObj.options[groupSelectObj.selectedIndex].text;
-							var index1 = groupName.lastIndexOf("(");
-							var index2 = groupName.lastIndexOf(")");
-							var num = groupName.substring(index1+1,index2);
+							getNonmembers(document.getElementById("branches"));
+							getMembers(document.getElementById("branches"));
+							var branchSelectObj = document.getElementById("branches");
+							var branchName = branchSelectObj.options[branchSelectObj.selectedIndex].text;
+							var index1 = branchName.lastIndexOf("(");
+							var index2 = branchName.lastIndexOf(")");
+							var num = branchName.substring(index1+1,index2);
 							num = parseInt(num) + count;
-							groupSelectObj.options[groupSelectObj.selectedIndex].text = groupName.substring(0,index1)+"("+num+")";
+							branchSelectObj.options[branchSelectObj.selectedIndex].text = branchName.substring(0,index1)+"("+num+")";
 							count = 0;
 						}else{
 							alert("<fmt:message key="error.grouping.data"/>"+" "+addmbrsRequest.status);
 						}
-					ajustButtonStatus();
+					adjustButtonStatus();
 				}
 		}
 
 		
-		function removeMembersFromGroup(){
+		function removeMembersFromBranch(){
 			var membersSelectObj = document.getElementById("members[]");
 			var nonmembers = "";
 			for(i=0; i<membersSelectObj.length; i++){
@@ -349,7 +255,7 @@
 					nonmembers = nonmembers + "," + membersSelectObj.options[i].value;
 				}	
 			}
-			url="<lams:WebAppURL/>/grouping.do?method=removeMembers&activityID=<c:out value="${activityID}"/>&groupID="+document.getElementById("groups").value+"&members="+nonmembers.substr(1);
+			url="<lams:WebAppURL/>/branching.do?method=removeMembers&branchID="+document.getElementById("branches").value+"&members="+nonmembers.substr(1);
 			if (window.XMLHttpRequest) { // Non-IE browsers
 					rmmbrsRequest = new XMLHttpRequest();
 					rmmbrsRequest.onreadystatechange = membersRemoved;
@@ -372,20 +278,20 @@
 		function membersRemoved(){
 			if (rmmbrsRequest.readyState == 4) { // Complete
 					if (rmmbrsRequest.status == 200) { // OK response
-						getMembers(document.getElementById("groups"));
-						getNonmembers(document.getElementById("groupings"));
-						var groupSelectObj = document.getElementById("groups");
-						var groupName = groupSelectObj.options[groupSelectObj.selectedIndex].text;
-						var index1 = groupName.lastIndexOf("(");
-						var index2 = groupName.lastIndexOf(")");
-						var num = groupName.substring(index1+1,index2);
+						getMembers(document.getElementById("branches"));
+						getNonmembers(document.getElementById("branches"));
+						var branchSelectObj = document.getElementById("branches");
+						var branchName = branchSelectObj.options[branchSelectObj.selectedIndex].text;
+						var index1 = branchName.lastIndexOf("(");
+						var index2 = branchName.lastIndexOf(")");
+						var num = branchName.substring(index1+1,index2);
 						num = parseInt(num) - count;
-						groupSelectObj.options[groupSelectObj.selectedIndex].text = groupName.substring(0,index1)+"("+num+")";
+						branchSelectObj.options[branchSelectObj.selectedIndex].text = branchName.substring(0,index1)+"("+num+")";
 						count = 0;
 					}else{
 						alert("<fmt:message key="error.grouping.data"/>"+" "+rmmbrsRequest.status);
 					}
-			ajustButtonStatus();
+			adjustButtonStatus();
 			}
 		}	
 
@@ -418,50 +324,38 @@
 		<p><c:out value="${description}"/></p>
 	</c:if>
 	
-	<p><STRONG><fmt:message key="label.grouping.max.num.in.group.heading"/></STRONG> <c:out value="${maxNumberOfGroups}"/> 
 	<span id="message" align="right"></span></p>
 
-	<P><STRONG><fmt:message key="label.grouping.general.instructions.heading"/></STRONG> <fmt:message key="label.grouping.general.instructions.line1"/></P>
+	<P><STRONG><fmt:message key="label.grouping.general.instructions.heading"/></STRONG> <fmt:message key="label.branching.general.instructions"/></P>
 
-	<p><fmt:message key="label.grouping.general.instructions.line2"/></p>
-
-	<table class="chosengrouping">
+	<table class="chosenbranching">
 		<tr>
-			<th><fmt:message key="label.grouping.group.heading"/></th>
-			<th><fmt:message key="label.grouping.non.grouped.users.heading"/></th>
-			<th><fmt:message key="label.grouping.grouped.users.heading"/></th>
+			<th><fmt:message key="label.branching.branch.heading"/></th>
+			<th><fmt:message key="label.branching.non.allocated.users.heading"/></th>
+			<th><fmt:message key="label.branching.allocated.users.heading"/></th>
    		 </tr>
 		<tr>
 			<td width="34%">
-				<select id="groups" name="groups" size="15" onChange="getMembers(this)">
+				<select id="branches" name="branches" size="15" onChange="getMembers(this)">
 				</select>
 			</td >
 			<td width="33%">
-				<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
+				<select  id="nonmembers[]" name="nonmembers[]" size="15" multiple="multiple" onChange="adjustButtonStatus()">
 				</select>
 			</td>
 			<td width="33%">
-				<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="ajustButtonStatus()">
+				<select  id="members[]" name="members[]" size="15" multiple="multiple" onChange="adjustButtonStatus()">
 				</select>
 			</td>
 		</tr>
 		<tr>
-			<td width="34%">
-				<input type="button" class="button" id="groupremove" name="groupremove" value="<fmt:message key="button.grouping.remove.selected.group"/>" onclick="removeGroup()" disabled="true"/>
-			</td>
 			<td width="33%">
-				<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.grouping.add.user.to.group"/>" onclick="addMembersToGroup()" disabled="true"/>
+				<input type="button" class="button"  id="nonmembersadd" name="nonmembersadd" value="<fmt:message key="button.branching.add.user.to.branch"/>" onclick="addMembersToBranch()" disabled="true"/>
 			</td>
 			<td width="33%">
-				   <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.grouping.remove.user.from.group"/>" onclick="removeMembersFromGroup()" disabled="true"/>
+				   <input type="button" class="button" id="membersremove" name="membersremove" value="<fmt:message key="button.branching.remove.user.from.branch"/>" onclick="removeMembersFromBranch()" disabled="true"/>
 			</td>
 		</tr>
-		<tr>
-			<td colspan="3">
-				<input type="text" name="newgroupname" id="newgroupname" size="25"  /><br>
-				<input type="button" class="button" id="groupadd" name="groupadd" value="<fmt:message key="button.grouping.add.group"/>" onclick="addGroup()"  />
-			</td>
-		</tr>
 	</table>
 	<%@ include file="../template/finishbutton.jsp" %>
 	</form>