getAllContributeActivityDTO(Long lessonID);
-}
+}
\ No newline at end of file
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -rdbbe9d80bcbeda8f746963fcde183242996fcc68 -r11403ed5085a73344f4cea2b7d3677115c6f2150
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision dbbe9d80bcbeda8f746963fcde183242996fcc68)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 11403ed5085a73344f4cea2b7d3677115c6f2150)
@@ -23,29 +23,8 @@
package org.lamsfoundation.lams.monitoring.service;
-import java.io.IOException;
-import java.sql.Timestamp;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-import java.util.TimeZone;
-import java.util.TreeMap;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import javax.servlet.http.HttpSession;
-
+import com.fasterxml.jackson.databind.node.JsonNodeFactory;
+import com.fasterxml.jackson.databind.node.ObjectNode;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
@@ -128,8 +107,27 @@
import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.sql.Timestamp;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.TimeZone;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.Vector;
/**
*
@@ -2265,6 +2263,9 @@
grouping = activity.getGrouping();
}
+ // get real object and not proxy
+ grouping = groupingDAO.getGroupingById(grouping.getGroupingId());
+
if (grouping == null) {
String error = methodName + ": Grouping activity missing grouping. Activity was " + activity;
MonitoringService.log.error(error);
@@ -2318,7 +2319,7 @@
Activity activity = getActivityById(activityID);
Grouping grouping = getGroupingForActivity(activity, !activity.isChosenBranchingActivity(), "addUsersToGroup");
ArrayList learners = createUserList(activityID, learnerIDs, "add");
- lessonService.performGrouping(grouping, groupId, learners);
+ lessonService.performGrouping(grouping, groupId, learners, false);
}
private ArrayList createUserList(Long activityIDForErrorMessage, String[] learnerIDs,
@@ -2345,7 +2346,7 @@
}
@Override
- public int addUsersToGroupByLogins(Long activityID, String groupName, Set logins)
+ public int addUsersToGroupByLogins(Long activityID, String groupName, Set logins, boolean forceChosenGrouping)
throws LessonServiceException {
ArrayList learners = new ArrayList<>();
@@ -2376,9 +2377,9 @@
if (group == null) {
// Leave performGrouping to create any new groups as addGroup returns a group without an id, so it could not be
- // used by performGrouping. Fix up name afterwards. Clumsy way to find to find the new group but how else?
+ // used by performGrouping. Fix up name afterwards. Clumsy way to find the new group but how else?
// It may not be the only new group and hence not the only group with no id.
- lessonService.performGrouping(grouping, (Long) null, learners);
+ lessonService.performGrouping(grouping, (Long) null, learners, forceChosenGrouping);
for (Group checkGroup : grouping.getGroups()) {
if (!otherGroupNames.contains(checkGroup.getGroupName())) {
group = checkGroup;
@@ -2389,7 +2390,7 @@
group.setGroupName(groupName);
}
} else {
- lessonService.performGrouping(grouping, group.getGroupId(), learners);
+ lessonService.performGrouping(grouping, group.getGroupId(), learners, forceChosenGrouping);
}
return learners.size();
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java
===================================================================
diff -u -rfd131067cd0d56f83e3f9675277248bca41e259e -r11403ed5085a73344f4cea2b7d3677115c6f2150
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java (.../GroupingUploadController.java) (revision fd131067cd0d56f83e3f9675277248bca41e259e)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadController.java (.../GroupingUploadController.java) (revision 11403ed5085a73344f4cea2b7d3677115c6f2150)
@@ -23,24 +23,8 @@
package org.lamsfoundation.lams.monitoring.web;
-import java.io.IOException;
-import java.security.InvalidParameterException;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.Vector;
-
-import javax.servlet.ServletOutputStream;
-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.apache.poi.hssf.usermodel.HSSFCell;
@@ -81,8 +65,22 @@
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.multipart.MultipartFile;
-import com.fasterxml.jackson.databind.node.JsonNodeFactory;
-import com.fasterxml.jackson.databind.node.ObjectNode;
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+import java.io.IOException;
+import java.security.InvalidParameterException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeSet;
+import java.util.Vector;
/**
* The action servlet that provides the support for the AJAX based Chosen Grouping upload from File
@@ -145,8 +143,9 @@
return;
}
- String fileName = new StringBuilder(messageService.getMessage("filename.create.grouping.template").trim())
- .append(" ").append(lessonOrOrganisationName).append(".xls").toString().replaceAll(" ", "-");
+ String fileName = new StringBuilder(
+ messageService.getMessage("filename.create.grouping.template").trim()).append(" ")
+ .append(lessonOrOrganisationName).append(".xls").toString().replaceAll(" ", "-");
fileName = FileUtil.encodeFilenameForDownload(request, fileName);
List sheets;
@@ -155,16 +154,17 @@
// check for any groups already exist in this grouping
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();
sheets = exportLearnersForGrouping(learners, grouping.getGroups(), null);
} else {
Long groupingId = WebUtil.readLongParam(request, "groupingId", true);
Set groups = null;
if (groupingId != null) {
- OrganisationGrouping orgGrouping = (OrganisationGrouping) userManagementService
- .findById(OrganisationGrouping.class, groupingId);
+ OrganisationGrouping orgGrouping = (OrganisationGrouping) userManagementService.findById(
+ OrganisationGrouping.class, groupingId);
if (orgGrouping != null) {
groups = orgGrouping.getGroups();
}
@@ -290,7 +290,8 @@
+ " filename " + file);
}
- ObjectNode responseJSON = isLessonMode ? saveLessonGrouping(lessonId, activityId, file)
+ ObjectNode responseJSON = isLessonMode
+ ? saveLessonGrouping(lessonId, activityId, file)
: saveCourseGrouping(organisation, groupingId, name, file);
return responseJSON.toString();
@@ -371,7 +372,8 @@
// Lesson grouping case so clean out and reuse any existing groups
Activity activity = monitoringService.getActivityById(activityId);
- Grouping grouping = activity.isChosenBranchingActivity() ? activity.getGrouping()
+ Grouping grouping = activity.isChosenBranchingActivity()
+ ? activity.getGrouping()
: ((GroupingActivity) activity).getCreateGrouping();
Set existingGroupNames = new HashSet<>();
@@ -440,7 +442,7 @@
// Now put in the new users groupings
for (Map.Entry> groupEntry : groups.entrySet()) {
int added = monitoringService.addUsersToGroupByLogins(activityId, groupEntry.getKey(),
- groupEntry.getValue());
+ groupEntry.getValue(), true);
totalUsersAdded += added;
totalUsersSkipped += groupEntry.getValue().size() - added;
}
@@ -506,8 +508,9 @@
String groupName = row.getLastCellNum() > 3 ? parseStringCell(row.getCell(3)) : null;
if (groupName == null || groupName.length() == 0) {
skipped++;
- GroupingUploadController.log.warn("Unable to add learner " + login
- + " for group in related to grouping " + groupingID + " as group name is missing.");
+ GroupingUploadController.log.warn(
+ "Unable to add learner " + login + " for group in related to grouping " + groupingID
+ + " as group name is missing.");
continue;
}
Set users = groups.get(groupName);
@@ -525,4 +528,4 @@
return (UserDTO) ss.getAttribute(AttributeNames.USER);
}
-}
+}
\ No newline at end of file