Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java =================================================================== diff -u -ra61b6ad192148c0ae514f37a9b488c3a15535ee9 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision a61b6ad192148c0ae514f37a9b488c3a15535ee9) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java (.../GateController.java) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -150,13 +150,13 @@ gateForm.setTotalLearners(gateDTO.getExpectedLearnerCount()); gateForm.setWaitingLearners(gateDTO.getWaitingLearnerCount()); gateForm.setPreviewLesson(lesson.isPreviewLesson()); - gateForm.setMonitorCanOpenGate(true); GateActivity gate = gateDTO.getGate(); gateForm.setActivityID(gate.getActivityId()); gateForm.setLessonID(lesson.getLessonId()); gateForm.setGate(gate); if (gate.isSynchGate()) { return "gate/synchGateContent"; + } else if (gate.isScheduleGate()) { ScheduleGateActivity scheduleGate = (ScheduleGateActivity) gate; if (Boolean.TRUE.equals(scheduleGate.getGateActivityCompletionBased())) { @@ -189,17 +189,19 @@ gateForm.setEndingTime(null); } return "gate/scheduleGateContent"; + } else if (gate.isConditionGate()) { - gateForm.setMonitorCanOpenGate(false); return "gate/conditionGateContent"; + } else if (gate.isPermissionGate() || gate.isSystemGate()) { return "gate/permissionGateContent"; + } else if (gate.isPasswordGate()) { - gateForm.setMonitorCanOpenGate(false); if (StringUtils.isNotBlank(gateForm.getKey()) && !gateDTO.getAllowToPass()) { gateForm.setIncorrectKey(true); } return "gate/passwordGateContent"; + } else { throw new LearnerServiceException("Invalid gate activity. " + "gate id [" + gate.getActivityId() + "] - the type [" + gate.getActivityTypeId() + "] is not a gate type"); Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java =================================================================== diff -u -r255e14779b181a96063e506b5c99be6ffb47d2ad -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java (.../GateForm.java) (revision 255e14779b181a96063e506b5c99be6ffb47d2ad) +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java (.../GateForm.java) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -23,7 +23,6 @@ // used for updating the the progress bar private Integer version; private String progressSummary; - private Boolean monitorCanOpenGate; public GateActivity getGate() { return gate; @@ -129,14 +128,6 @@ this.progressSummary = progressSummary; } - public Boolean getMonitorCanOpenGate() { - return monitorCanOpenGate; - } - - public void setMonitorCanOpenGate(Boolean monitorCanOpenGate) { - this.monitorCanOpenGate = monitorCanOpenGate; - } - public String getKey() { return key; } Index: lams_learning/web/gate/gateDescription.jsp =================================================================== diff -u -r7c32b3ca8ccf88d8eddde7bd6cf12acc3ebd4d65 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/web/gate/gateDescription.jsp (.../gateDescription.jsp) (revision 7c32b3ca8ccf88d8eddde7bd6cf12acc3ebd4d65) +++ lams_learning/web/gate/gateDescription.jsp (.../gateDescription.jsp) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -1,9 +1,14 @@ <%@ taglib uri="tags-core" prefix="c"%> -
- -
- -
-
-
+ + + + + + + +
+ +
+
+ Index: lams_learning/web/gate/gateNext.jsp =================================================================== diff -u -r7c32b3ca8ccf88d8eddde7bd6cf12acc3ebd4d65 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision 7c32b3ca8ccf88d8eddde7bd6cf12acc3ebd4d65) +++ lams_learning/web/gate/gateNext.jsp (.../gateNext.jsp) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -10,20 +10,6 @@ } -
- - - - - - - - - - - -
-
Index: lams_learning/web/gate/permissionGateContent.jsp =================================================================== diff -u -r68bed1236f782a91c2710f30f31a017f059e2b95 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision 68bed1236f782a91c2710f30f31a017f059e2b95) +++ lams_learning/web/gate/permissionGateContent.jsp (.../permissionGateContent.jsp) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -37,6 +37,8 @@
+
+
<%@ include file="gateDescription.jsp"%> Index: lams_learning/web/gate/scheduleGateContent.jsp =================================================================== diff -u -r68bed1236f782a91c2710f30f31a017f059e2b95 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 68bed1236f782a91c2710f30f31a017f059e2b95) +++ lams_learning/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -66,6 +66,7 @@
+ <%@ include file="gateDescription.jsp"%> Index: lams_learning/web/gate/synchGateContent.jsp =================================================================== diff -u -r68bed1236f782a91c2710f30f31a017f059e2b95 -r739cd4409935e2cbe4b6798c14515e1bf2ea93d4 --- lams_learning/web/gate/synchGateContent.jsp (.../synchGateContent.jsp) (revision 68bed1236f782a91c2710f30f31a017f059e2b95) +++ lams_learning/web/gate/synchGateContent.jsp (.../synchGateContent.jsp) (revision 739cd4409935e2cbe4b6798c14515e1bf2ea93d4) @@ -35,16 +35,15 @@ refresh="60;URL=${WebAppURL}/gate/knockGate.do?activityID=${gateForm.activityID}&lessonID=${gateForm.lessonID }">
- - -
- - - - -
+   + + + + +
+
<%@ include file="gateDescription.jsp"%>