Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.110.2.18 -r1.110.2.19 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 13 Dec 2016 13:49:18 -0000 1.110.2.18 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 1 Feb 2017 09:20:13 -0000 1.110.2.19 @@ -337,7 +337,7 @@ * @param userId * @return */ - GateActivity openGateForSingleUser(Long gateId, Integer userId); + GateActivity openGateForSingleUser(Long gateId, Integer[] userIds); /** * Set the gate to closed. Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.195.2.37 -r1.195.2.38 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 31 Dec 2016 14:27:39 -0000 1.195.2.37 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 1 Feb 2017 09:20:13 -0000 1.195.2.38 @@ -908,7 +908,7 @@ if (grouping != null) { groupingDAO.delete(grouping); } - + for (BranchActivityEntry entry : branchingActivity.getBranchActivityEntries()) { BranchCondition condition = entry.getCondition(); if (condition != null) { @@ -978,9 +978,9 @@ } @Override - public GateActivity openGateForSingleUser(Long gateId, Integer userId) { + public GateActivity openGateForSingleUser(Long gateId, Integer[] userIds) { GateActivity gate = (GateActivity) activityDAO.getActivityByActivityId(gateId); - if ((gate != null) && (userId != null) && (userId >= 0)) { + for (Integer userId : userIds) { User user = (User) baseDAO.find(User.class, userId); gate.getAllowedToPassLearners().add(user); activityDAO.update(gate); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java,v diff -u -r1.24.2.5 -r1.24.2.6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java 11 May 2016 07:14:44 -0000 1.24.2.5 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java 1 Feb 2017 09:20:13 -0000 1.24.2.6 @@ -21,14 +21,14 @@ * **************************************************************** */ - package org.lamsfoundation.lams.monitoring.web; import java.io.IOException; import java.util.Calendar; import java.util.Collection; import java.util.GregorianCalendar; import java.util.HashSet; +import java.util.LinkedList; import java.util.List; import java.util.Set; import java.util.TimeZone; @@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -216,8 +217,15 @@ DynaActionForm gateForm = (DynaActionForm) form; Long gateIdLong = (Long) gateForm.get(GateAction.ACTIVITY_FORM_FIELD); - Integer userId = (Integer) gateForm.get(GateAction.USER_ID); - GateActivity gate = monitoringService.openGateForSingleUser(gateIdLong, userId); + String userId = (String) gateForm.get(GateAction.USER_ID); + String[] userIdsString = userId.split(","); + List userIds = new LinkedList(); + for (String userIdString : userIdsString) { + if (StringUtils.isNotBlank(userIdString)) { + userIds.add(Integer.valueOf(userIdString)); + } + } + GateActivity gate = monitoringService.openGateForSingleUser(gateIdLong, userIds.toArray(new Integer[] {})); return findViewByGateType(mapping, gateForm, gate); } Index: lams_monitoring/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.2.2.3 -r1.2.2.4 --- lams_monitoring/web/WEB-INF/struts-config.xml 29 Jun 2016 13:00:04 -0000 1.2.2.3 +++ lams_monitoring/web/WEB-INF/struts-config.xml 1 Feb 2017 09:20:13 -0000 1.2.2.4 @@ -24,7 +24,7 @@ - + Index: lams_monitoring/web/gate/conditionGateContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/conditionGateContent.jsp,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_monitoring/web/gate/conditionGateContent.jsp 18 Sep 2016 08:51:59 -0000 1.3.2.3 +++ lams_monitoring/web/gate/conditionGateContent.jsp 1 Feb 2017 09:20:13 -0000 1.3.2.4 @@ -4,16 +4,19 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + Index: lams_monitoring/web/gate/openGateSingleUser.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/Attic/openGateSingleUser.jsp,v diff -u -r1.1.2.1 -r1.1.2.2 --- lams_monitoring/web/gate/openGateSingleUser.jsp 18 Sep 2016 08:51:59 -0000 1.1.2.1 +++ lams_monitoring/web/gate/openGateSingleUser.jsp 1 Feb 2017 09:20:13 -0000 1.1.2.2 @@ -1,37 +1,56 @@ + +

- +

- + +
- -
- " onclick="document.pressed='forbidden'"/> +
+ " + onclick="javascript:allowUsers('forbidden')"/>

- + +
- -
- " onclick="document.pressed='waiting'"/> +
+ " + onclick="javascript:allowUsers('waiting')"/>

- +
+ + +
+
+
Index: lams_monitoring/web/gate/permissionGateContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/gate/permissionGateContent.jsp,v diff -u -r1.16.2.4 -r1.16.2.5 --- lams_monitoring/web/gate/permissionGateContent.jsp 18 Sep 2016 08:51:59 -0000 1.16.2.4 +++ lams_monitoring/web/gate/permissionGateContent.jsp 1 Feb 2017 09:20:13 -0000 1.16.2.5 @@ -4,18 +4,22 @@ <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-lams" prefix="lams" %> + + +