Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java =================================================================== diff -u -rbeaa199615fcde4a870870eb2ae9088455d0dc8e -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java (.../GateController.java) (revision beaa199615fcde4a870870eb2ae9088455d0dc8e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateController.java (.../GateController.java) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -255,7 +255,7 @@ return "gate/passwordGateContent"; } - return "gate/permissionGateContent"; + return "gate/permissionGateContent5"; } else { throw new MonitoringServiceException("Invalid gate activity. " + "gate id [" + gate.getActivityId() + "] - the type [" + gate.getActivityTypeId() + "] is not a gate type"); Index: lams_monitoring/web/css/components-monitoring.css =================================================================== diff -u -rc9048d2a6d579af33cc6b3a36e716715be8e9b2b -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe --- lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision c9048d2a6d579af33cc6b3a36e716715be8e9b2b) +++ lams_monitoring/web/css/components-monitoring.css (.../components-monitoring.css) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -1252,3 +1252,10 @@ --bs-table-accent-bg: var(--bs-gray-200); } +.gate-card .card-body { + height: 80px; +} + +.gate-opened-icon { + cursor: pointer; +} \ No newline at end of file Index: lams_monitoring/web/gate/gateInfo5.jsp =================================================================== diff -u --- lams_monitoring/web/gate/gateInfo5.jsp (revision 0) +++ lams_monitoring/web/gate/gateInfo5.jsp (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -0,0 +1,36 @@ +<%@ include file="/taglibs.jsp"%> + + + + + +
+
+ + +
+
+
+ + + +
+ +
+
+ +

+ + + + + + +

+ + + +

+ +

+
\ No newline at end of file Index: lams_monitoring/web/gate/gateStatus5.jsp =================================================================== diff -u --- lams_monitoring/web/gate/gateStatus5.jsp (revision 0) +++ lams_monitoring/web/gate/gateStatus5.jsp (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -0,0 +1,61 @@ +<%@ include file="/taglibs.jsp"%> + + + + + + + +

+ " /> +

+
+
+
+ +
+ + + + +   + + +   + + + + +
+ + + + + + +

+ " + value="" /> +

+
+
Index: lams_monitoring/web/gate/openGateSingleUser5.jsp =================================================================== diff -u --- lams_monitoring/web/gate/openGateSingleUser5.jsp (revision 0) +++ lams_monitoring/web/gate/openGateSingleUser5.jsp (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -0,0 +1,104 @@ + + + + +
+

+ + + + +
+
+
+
+ + +
+
+
+ +
+ + +
+
+
+
+ " + onclick="javascript:allowUsers('forbidden')"/> +
+ +
+
+ + +
+
+
+ +
+ + +
+
+
+
+ " + onclick="javascript:allowUsers('waiting')"/> +
+ +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ +
Index: lams_monitoring/web/gate/permissionGateContent5.jsp =================================================================== diff -u --- lams_monitoring/web/gate/permissionGateContent5.jsp (revision 0) +++ lams_monitoring/web/gate/permissionGateContent5.jsp (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -0,0 +1,61 @@ +<%-- +Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) +License Information: http://lamsfoundation.org/licensing/lams/2.0/ + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as + published by the Free Software Foundation. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + USA + + http://www.gnu.org/licenses/gpl.txt +--%> + + +<%@ include file="/taglibs.jsp"%> + + + + + + + + + + + + +

+ + <%@ include file="gateInfo5.jsp" %> + + +

+
+ + <%@ include file="gateStatus5.jsp" %> + + <%@ include file="openGateSingleUser5.jsp" %> + + +
\ No newline at end of file Index: lams_monitoring/web/includes/javascript/monitorLesson5.js =================================================================== diff -u -rfd09b5f6803a74b4660114e2bacc234bf9ba7c38 -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe --- lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision fd09b5f6803a74b4660114e2bacc234bf9ba7c38) +++ lams_monitoring/web/includes/javascript/monitorLesson5.js (.../monitorLesson5.js) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -143,6 +143,11 @@ tabContent.load(LAMS_URL + 'monitoring/tblmonitor/teams.do?lessonID=' + lessonId); } break; + + case 'gates': { + tabContent.load(LAMS_URL + 'monitoring/tblmonitor/gates.do?lessonID=' + lessonId); + } + break; } } @@ -174,6 +179,10 @@ loadTab('teams', this); }); + $('#load-gates-tab-btn').click(function(){ + loadTab('gates', this); + }); + $('#load-other-nvg-btn').click(function(){ let switchButton = $(this), tblButtons = $('#tbl-navigate-btn-group'), @@ -2752,6 +2761,8 @@ updateGradebookTab(); } else if (tabName == 'teams'){ loadTab('teams'); + } else if (tabName == 'gates'){ + loadTab('gates'); } } Index: lams_monitoring/web/monitor5.jsp =================================================================== diff -u -rd0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628 -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe --- lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision d0a966a0d817bebcc0ffbc9fa386e5ab5e8f3628) +++ lams_monitoring/web/monitor5.jsp (.../monitor5.jsp) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -1,5 +1,8 @@ <%@ include file="/taglibs.jsp"%> + + + @@ -25,6 +28,8 @@ + + Index: lams_monitoring/web/tblmonitor/gates5.jsp =================================================================== diff -u -rfd09b5f6803a74b4660114e2bacc234bf9ba7c38 -r89da5ec382514ba94e3b2f2b8661ec28b42f7afe --- lams_monitoring/web/tblmonitor/gates5.jsp (.../gates5.jsp) (revision fd09b5f6803a74b4660114e2bacc234bf9ba7c38) +++ lams_monitoring/web/tblmonitor/gates5.jsp (.../gates5.jsp) (revision 89da5ec382514ba94e3b2f2b8661ec28b42f7afe) @@ -1,11 +1,7 @@ <%@ include file="/taglibs.jsp"%> - - - - - -
-
-

- -

-
-
- - -
-
+ +
+

+ +

+ - -
-
-
- -
- +
+
+ +
- - -   - - -   - - - + + +   + + +   + + + - +
+ + + -
+
@@ -75,24 +92,11 @@
- - -
- -
-
+
\ No newline at end of file