Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r5d9a70da32933cfebd7d6dd3c3e90e481e829c10 -redece7093e248662435cbb9a70536f8aff7cbb85 --- lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 5d9a70da32933cfebd7d6dd3c3e90e481e829c10) +++ lams_central/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision edece7093e248662435cbb9a70536f8aff7cbb85) @@ -1138,6 +1138,7 @@ label.grouping.general.instructions.line1 = Choose a course grouping to use in this lesson or create a new one. You are working with copies, so any changes made here have no influence on the original course groupings. Grouping with zero groups are not listed here. Once a grouping is chosen, the only way to come back to the grouping list is to manually remove all groups. label.grouping.general.instructions.line2 = Place the lesson participants in their groups. Initially you can add and remove learners, but once a groups is used (that is, a participant starts an activity that uses the grouping) you will not be able to remove learners from it. Even if a group is in use you can still add learners. The changes are saved immediately. label.grouping.general.instructions.branching = This grouping activity is used for branching. Groups can therefore not be added or deleted. +label.grouping.return.to.monitoring = Return to monitoring label.branching.general.instructions = Place the lesson participants in their branches. Initially you can add and remove learners, but once a participant starts one of the branches then you will not be able to remove learners from any branches. If you try to remove someone from a branch and they will not remove then check their progress - if they start using the branch while you are on this screen you will not get any errors but you will not be able to remove them from the branch. You will still be able to add learners to branches. label.grouping.popup.viewmode.message = You are presently in group view mode. Groups can not be modified. label.tab.grouping = Groups Index: lams_central/web/groups.jsp =================================================================== diff -u -r54a3c302d29d64b55efa18189083dadd13c51708 -redece7093e248662435cbb9a70536f8aff7cbb85 --- lams_central/web/groups.jsp (.../groups.jsp) (revision 54a3c302d29d64b55efa18189083dadd13c51708) +++ lams_central/web/groups.jsp (.../groups.jsp) (revision edece7093e248662435cbb9a70536f8aff7cbb85) @@ -114,6 +114,11 @@ + + +   + +
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java =================================================================== diff -u -r3eab31a1109437bc25679e6ebe38be0a350e17ac -redece7093e248662435cbb9a70536f8aff7cbb85 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java (.../GroupingController.java) (revision 3eab31a1109437bc25679e6ebe38be0a350e17ac) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingController.java (.../GroupingController.java) (revision edece7093e248662435cbb9a70536f8aff7cbb85) @@ -23,21 +23,8 @@ package org.lamsfoundation.lams.monitoring.web; -import java.io.IOException; -import java.util.Comparator; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; - -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; - +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.learningdesign.Activity; @@ -67,8 +54,19 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.ResponseBody; -import com.fasterxml.jackson.databind.node.JsonNodeFactory; -import com.fasterxml.jackson.databind.node.ObjectNode; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; +import java.io.IOException; +import java.util.Comparator; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.SortedSet; +import java.util.TreeSet; /** * The action servlet that provides the support for the @@ -116,6 +114,8 @@ Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); + boolean displayReturnToMonitoringLink = WebUtil.readBooleanParam(request, "displayReturnToMonitoringLink", + false); Activity activity = monitoringService.getActivityById(activityID); Grouping grouping = null; @@ -128,7 +128,8 @@ if (!forcePrintView) { return "redirect:" + Configuration.get(ConfigurationKeys.SERVER_URL) + "grouping/viewGroupings.do?lessonID=" - + lessonId + "&activityID=" + activityID; + + lessonId + "&activityID=" + activityID + "&displayReturnToMonitoringLink=" + + displayReturnToMonitoringLink; } request.setAttribute(AttributeNames.PARAM_ACTIVITY_ID, activityID); @@ -186,7 +187,8 @@ } request.setAttribute(GroupingController.GROUPS, groups); - request.setAttribute("isCourseGrouping", true); // flag to page it is a course grouping so use the field names for OrganisationGroup + request.setAttribute("isCourseGrouping", + true); // flag to page it is a course grouping so use the field names for OrganisationGroup return "grouping/viewGroups"; } @@ -207,7 +209,8 @@ // remove users from current group if (members != null) { Activity activity = monitoringService.getActivityById(activityID); - Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping() + Grouping grouping = activity.isChosenBranchingActivity() + ? activity.getGrouping() : ((GroupingActivity) activity).getCreateGrouping(); User exampleUser = (User) userManagementService.findById(User.class, Integer.valueOf(members[0])); Group group = grouping.getGroupBy(exampleUser); @@ -304,7 +307,8 @@ Long activityID = WebUtil.readLongParam(request, AttributeNames.PARAM_ACTIVITY_ID); Activity activity = monitoringService.getActivityById(activityID); - Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping() + Grouping grouping = activity.isChosenBranchingActivity() + ? activity.getGrouping() : ((GroupingActivity) activity).getCreateGrouping(); // iterate over groups @@ -402,4 +406,4 @@ responseJSON.put("result", result); return responseJSON.toString(); } -} +} \ No newline at end of file Index: lams_monitoring/web/tblmonitor/teams.jsp =================================================================== diff -u -r87c236112358ed9c229876a63816b5e14b17f2af -redece7093e248662435cbb9a70536f8aff7cbb85 --- lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision 87c236112358ed9c229876a63816b5e14b17f2af) +++ lams_monitoring/web/tblmonitor/teams.jsp (.../teams.jsp) (revision edece7093e248662435cbb9a70536f8aff7cbb85) @@ -3,27 +3,27 @@