@@ -71,40 +70,40 @@ *
* * @param lessonName - * the name of the lesson + * the name of the lesson * @param lessonDescription - * the description of the lesson. + * the description of the lesson. * @param learningDesignId - * the selected learning design + * the selected learning design * @param organisationId - * the copied sequence will be put in the default runtime sequence folder for this org, if such a folder exists. + * the copied sequence will be put in the default runtime sequence folder for this org, if such a folder + * exists. * @param userId - * the user who want to create this lesson. + * the user who want to create this lesson. * @param customCSV - * the custom comma separated values to be used by toolAdapters + * the custom comma separated values to be used by toolAdapters * @param enableLessonIntro - * display an intro page to the lesson + * display an intro page to the lesson * @param displayDesignImage - * display the design image or not + * display the design image or not * @param enableNotifications - * enable "email notifications" link for the current lesson + * enable "email notifications" link for the current lesson * @param numberDaysToLessonFinish - * number of days the lesson will be available to user since he starts it. (lesson finish scheduling feature) + * number of days the lesson will be available to user since he starts it. (lesson finish scheduling + * feature) * @return the lesson initialized. */ Lesson initializeLesson(String lessonName, String lessonDescription, long learningDesignId, Integer organisationId, Integer userID, String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage, - Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled, - Boolean enableNotifications, Boolean forceLearnerRestart, Boolean allowLearnerRestart, + Boolean liveEditEnabled, Boolean enableNotifications, Boolean forceLearnerRestart, Boolean allowLearnerRestart, Boolean gradebookOnComplete, Integer numberDaysToLessonFinish, Long precedingLessonId); /** * Create new lesson according to the learning design specified by the user, but for a preview session rather than a * normal learning session. The design is not assigned to any workspace folder. */ Lesson initializeLessonForPreview(String lessonName, String lessonDescription, long learningDesignId, - Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable, - Boolean liveEditEnabled); + Integer userID, String customCSV, Boolean liveEditEnabled); /** * Setup the lesson class and organization for a lesson according to the input from monitoring GUI interface. Index: lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java =================================================================== diff -u -rbca8248580df6c46e6a8462d80e4341598cd9f28 -r0993bbd812a25ddb84feec64dd0e4847ce32d164 --- lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision bca8248580df6c46e6a8462d80e4341598cd9f28) +++ lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java (.../AttributeNames.java) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164) @@ -67,10 +67,6 @@ public static final String PARAM_LESSON_ID = "lessonID"; public static final String PARAM_DIRECTORY_NAME = "directoryName"; public static final String PARAM_FILENAME = "filename"; - public static final String PARAM_PRESENCE_ENABLED = "presenceEnabledPatch"; - // PARAM_PRESENCE_ENABLED = "presenceEnabledPatch" : strange name used to avoid Java overwriting values in its a - // hashmap used in learner action in HomeAction.java - public static final String PARAM_PRESENCE_IM_ENABLED = "presenceImEnabled"; public static final String PARAM_CURRENT_TAB = "currentTab"; public static final String PARAM_CUSTOM_CSV = "customCSV"; public static final String PARAM_EXT_LMS_ID = "extlmsid"; Index: lams_learning/build.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0993bbd812a25ddb84feec64dd0e4847ce32d164 --- lams_learning/build.xml (.../build.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_learning/build.xml (.../build.xml) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164) @@ -18,10 +18,6 @@
* The action servlet that interacts with learner to start a lams learner module, join a user to the lesson and allows a
@@ -375,16 +377,6 @@
return responseJSON;
}
- @RequestMapping("/getPresenceChatActiveUserCount")
- @ResponseBody
- public String getPresenceChatActiveUserCount(HttpServletRequest request, HttpServletResponse response)
- throws IOException {
- Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID);
- int count = PresenceWebsocketServer.getActiveUserCount(lessonId);
-
- return String.valueOf(count);
- }
-
/**
* Forces a move to a destination Activity in the learning sequence, redirecting to the new page rather.
*/
@@ -537,8 +529,6 @@
responseJSON.put(AttributeNames.PARAM_LESSON_ID, lesson.getLessonId());
responseJSON.put(AttributeNames.PARAM_TITLE, lesson.getLessonName());
responseJSON.put("allowRestart", lesson.getAllowLearnerRestart());
- responseJSON.put(AttributeNames.PARAM_PRESENCE_ENABLED, lesson.getLearnerPresenceAvailable());
- responseJSON.put(AttributeNames.PARAM_PRESENCE_IM_ENABLED, lesson.getLearnerImAvailable());
response.setContentType("application/json;charset=utf-8");
Fisheye: Tag 0993bbd812a25ddb84feec64dd0e4847ce32d164 refers to a dead (removed) revision in file `lams_learning/web/css/presence.scss'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 0993bbd812a25ddb84feec64dd0e4847ce32d164 refers to a dead (removed) revision in file `lams_learning/web/includes/javascript/presence.js'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 0993bbd812a25ddb84feec64dd0e4847ce32d164 refers to a dead (removed) revision in file `lams_learning/web/presenceChat.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java
===================================================================
diff -u -r50ce17b539bba75dc92c9799db20a66fa118e788 -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java (.../IMonitoringFullService.java) (revision 50ce17b539bba75dc92c9799db20a66fa118e788)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringFullService.java (.../IMonitoringFullService.java) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -31,30 +31,6 @@
/** Get the message service, which gives access to the I18N text */
MessageService getMessageService();
- /**
- * Set whether or not the learner presence button is available in monitor. Checks that the user is a staff member of
- * this lesson before updating.
- *
- * @param lessonId
- * @param userId
- * @param learnerPresenceAvailable
- * @return new value for learnerPresenceAvailable. Normally will be same as input parameter, will only be different
- * if the value cannot be updated for some reason.
- */
- Boolean togglePresenceAvailable(long lessonId, Integer userId, Boolean learnerPresenceAvailable);
-
- /**
- * Set whether or not the learner IM button is available in monitor. Checks that the user is a staff member of this
- * lesson before updating.
- *
- * @param lessonId
- * @param userId
- * @param learnerImPresenceAvailable
- * @return new value for learnerPresenceImAvailable. Normally will be same as input parameter, will only be
- * different if the value cannot be updated for some reason.
- */
- Boolean togglePresenceImAvailable(long lessonId, Integer userId, Boolean learnerPresenceImAvailable);
-
/** Set whether or not to display the gradebook activity scores at the end of a lesson */
Boolean toggleGradebookOnComplete(long lessonId, Integer userId, Boolean gradebookOnComplete);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
===================================================================
diff -u -r5ac2673214d4a3e9d831e1c468e235015b8bd0b2 -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 5ac2673214d4a3e9d831e1c468e235015b8bd0b2)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -359,10 +359,9 @@
@Override
public Lesson initializeLesson(String lessonName, String lessonDescription, long learningDesignId,
Integer organisationId, Integer userID, String customCSV, Boolean enableLessonIntro,
- Boolean displayDesignImage, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
- Boolean liveEditEnabled, Boolean enableLessonNotifications, Boolean forceLearnerRestart,
- Boolean allowLearnerRestart, Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish,
- Long precedingLessonId) {
+ Boolean displayDesignImage, Boolean liveEditEnabled, Boolean enableLessonNotifications,
+ Boolean forceLearnerRestart, Boolean allowLearnerRestart, Boolean gradebookOnComplete,
+ Integer scheduledNumberDaysToLessonFinish, Long precedingLessonId) {
securityService.ensureGroupMonitor(organisationId, userID, "intializeLesson");
@@ -391,9 +390,8 @@
User user = userID != null ? (User) baseDAO.find(User.class, userID) : null;
Lesson initializedLesson = initializeLesson(lessonName, lessonDescription, originalLearningDesign, user,
runSeqFolder, LearningDesign.COPY_TYPE_LESSON, customCSV, enableLessonIntro, displayDesignImage,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, enableLessonNotifications,
- forceLearnerRestart, allowLearnerRestart, gradebookOnComplete, scheduledNumberDaysToLessonFinish,
- precedingLesson);
+ liveEditEnabled, enableLessonNotifications, forceLearnerRestart, allowLearnerRestart,
+ gradebookOnComplete, scheduledNumberDaysToLessonFinish, precedingLesson);
logLessonStateChange(LogEvent.TYPE_TEACHER_LESSON_CREATE, initializedLesson, userID, null,
initializedLesson.getLessonStateId());
@@ -402,8 +400,7 @@
@Override
public Lesson initializeLessonForPreview(String lessonName, String lessonDescription, long learningDesignId,
- Integer userID, String customCSV, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
- Boolean liveEditEnabled) {
+ Integer userID, String customCSV, Boolean liveEditEnabled) {
LearningDesign originalLearningDesign = learningDesignDAO.getLearningDesignById(new Long(learningDesignId));
if (originalLearningDesign == null) {
throw new MonitoringServiceException(
@@ -412,14 +409,13 @@
User user = userID != null ? (User) baseDAO.find(User.class, userID) : null;
return initializeLesson(lessonName, lessonDescription, originalLearningDesign, user, null,
- LearningDesign.COPY_TYPE_PREVIEW, customCSV, false, false, learnerPresenceAvailable, learnerImAvailable,
- liveEditEnabled, true, false, false, false, null, null);
+ LearningDesign.COPY_TYPE_PREVIEW, customCSV, false, false, liveEditEnabled, true, false, false, false,
+ null, null);
}
@Override
public Lesson initializeLessonWithoutLDcopy(String lessonName, String lessonDescription, long learningDesignID,
- User user, String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage,
- Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
+ User user, String customCSV, Boolean enableLessonIntro, Boolean displayDesignImage, Boolean liveEditEnabled,
Boolean enableLessonNotifications, Boolean forceLearnerRestart, Boolean allowLearnerRestart,
Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) {
LearningDesign learningDesign = learningDesignDAO.getLearningDesignById(learningDesignID);
@@ -428,9 +424,8 @@
"Learning design for id=" + learningDesignID + " is missing. Unable to initialize lesson.");
}
Lesson lesson = createNewLesson(lessonName, lessonDescription, user, learningDesign, enableLessonIntro,
- displayDesignImage, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled,
- enableLessonNotifications, forceLearnerRestart, allowLearnerRestart, gradebookOnComplete,
- scheduledNumberDaysToLessonFinish, precedingLesson);
+ displayDesignImage, liveEditEnabled, enableLessonNotifications, forceLearnerRestart,
+ allowLearnerRestart, gradebookOnComplete, scheduledNumberDaysToLessonFinish, precedingLesson);
logLessonGeneralChange(LogEvent.TYPE_TEACHER_LESSON_CREATE, user != null ? user.getUserId() : null,
lesson != null ? lesson.getLessonId() : null, MonitoringService.AUDIT_LESSON_CREATED_KEY,
new Object[] { lessonName, learningDesign.getTitle(), learningDesign.getLearningDesignId() });
@@ -439,10 +434,9 @@
private Lesson initializeLesson(String lessonName, String lessonDescription, LearningDesign originalLearningDesign,
User user, WorkspaceFolder workspaceFolder, int copyType, String customCSV, Boolean enableLessonIntro,
- Boolean displayDesignImage, Boolean learnerPresenceAvailable, Boolean learnerImAvailable,
- Boolean liveEditEnabled, Boolean enableLessonNotifications, Boolean forceLearnerRestart,
- Boolean allowLearnerRestart, Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish,
- Lesson precedingLesson) {
+ Boolean displayDesignImage, Boolean liveEditEnabled, Boolean enableLessonNotifications,
+ Boolean forceLearnerRestart, Boolean allowLearnerRestart, Boolean gradebookOnComplete,
+ Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) {
// copy the current learning design
LearningDesign copiedLearningDesign = authoringService.copyLearningDesign(originalLearningDesign,
new Integer(copyType), user, workspaceFolder, true, null, customCSV);
@@ -457,9 +451,8 @@
}
Lesson lesson = createNewLesson(title, lessonDescription, user, copiedLearningDesign, enableLessonIntro,
- displayDesignImage, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled,
- enableLessonNotifications, forceLearnerRestart, allowLearnerRestart, gradebookOnComplete,
- scheduledNumberDaysToLessonFinish, precedingLesson);
+ displayDesignImage, liveEditEnabled, enableLessonNotifications, forceLearnerRestart,
+ allowLearnerRestart, gradebookOnComplete, scheduledNumberDaysToLessonFinish, precedingLesson);
logLessonGeneralChange(LogEvent.TYPE_TEACHER_LESSON_CREATE, user != null ? user.getUserId() : null,
lesson != null ? lesson.getLessonId() : null, MonitoringService.AUDIT_LESSON_CREATED_KEY,
new Object[] { lessonName, copiedLearningDesign.getTitle(),
@@ -1231,24 +1224,6 @@
}
@Override
- public Boolean togglePresenceAvailable(long lessonId, Integer userId, Boolean presenceAvailable) {
- securityService.ensureLessonMonitor(lessonId, userId, "set presence available");
- Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
- requestedLesson.setLearnerPresenceAvailable(presenceAvailable != null ? presenceAvailable : Boolean.FALSE);
- lessonDAO.updateLesson(requestedLesson);
- return requestedLesson.getLearnerPresenceAvailable();
- }
-
- @Override
- public Boolean togglePresenceImAvailable(long lessonId, Integer userId, Boolean presenceImAvailable) {
- securityService.ensureLessonMonitor(lessonId, userId, "set presence instant messaging available");
- Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
- requestedLesson.setLearnerImAvailable(presenceImAvailable != null ? presenceImAvailable : Boolean.FALSE);
- lessonDAO.updateLesson(requestedLesson);
- return requestedLesson.getLearnerImAvailable();
- }
-
- @Override
public Boolean toggleGradebookOnComplete(long lessonId, Integer userId, Boolean gradebookOnComplete) {
securityService.ensureLessonMonitor(lessonId, userId, "set gradebook on complete");
Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId));
@@ -2144,13 +2119,12 @@
*/
private Lesson createNewLesson(String lessonName, String lessonDescription, User user,
LearningDesign copiedLearningDesign, Boolean enableLessonIntro, Boolean displayDesignImage,
- Boolean learnerPresenceAvailable, Boolean learnerImAvailable, Boolean liveEditEnabled,
- Boolean enableLessonNotifications, Boolean forceLearnerRestart, Boolean allowLearnerRestart,
- Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish, Lesson precedingLesson) {
+ Boolean liveEditEnabled, Boolean enableLessonNotifications, Boolean forceLearnerRestart,
+ Boolean allowLearnerRestart, Boolean gradebookOnComplete, Integer scheduledNumberDaysToLessonFinish,
+ Lesson precedingLesson) {
Lesson newLesson = Lesson.createNewLessonWithoutClass(lessonName, lessonDescription, user, copiedLearningDesign,
- enableLessonIntro, displayDesignImage, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled,
- enableLessonNotifications, forceLearnerRestart, allowLearnerRestart, gradebookOnComplete,
- scheduledNumberDaysToLessonFinish);
+ enableLessonIntro, displayDesignImage, liveEditEnabled, enableLessonNotifications, forceLearnerRestart,
+ allowLearnerRestart, gradebookOnComplete, scheduledNumberDaysToLessonFinish);
if (precedingLesson != null) {
HashSet precedingLessons = new HashSet();
precedingLessons.add(precedingLesson);
@@ -2859,7 +2833,6 @@
newLesson = this.initializeLesson(lesson.getLessonName(), lesson.getLessonDescription(),
lesson.getLearningDesign().getLearningDesignId(), group.getOrganisationId(), creatorId,
null, lesson.isEnableLessonIntro(), lesson.isDisplayDesignImage(),
- lesson.getLearnerPresenceAvailable(), lesson.getLearnerImAvailable(),
lesson.getLiveEditEnabled(), lesson.getEnableLessonNotifications(),
lesson.getForceLearnerRestart(), lesson.getAllowLearnerRestart(),
lesson.getGradebookOnComplete(), null, null);
Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
===================================================================
diff -u -r819399aeee074e740f0756ceafb9fd119073cb88 -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 819399aeee074e740f0756ceafb9fd119073cb88)
+++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -249,8 +249,6 @@
long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID);
Integer copyType = WebUtil.readIntParam(request, "copyType", true);
String customCSV = request.getParameter("customCSV");
- Boolean learnerPresenceAvailable = WebUtil.readBooleanParam(request, "learnerPresenceAvailable", false);
- Boolean learnerImAvailable = WebUtil.readBooleanParam(request, "learnerImAvailable", false);
Boolean liveEditEnabled = WebUtil.readBooleanParam(request, "liveEditEnabled", false);
Boolean forceRestart = WebUtil.readBooleanParam(request, "forceRestart", false);
Boolean allowRestart = WebUtil.readBooleanParam(request, "allowRestart", false);
@@ -259,12 +257,12 @@
Lesson newLesson = null;
if ((copyType != null) && copyType.equals(LearningDesign.COPY_TYPE_PREVIEW)) {
newLesson = monitoringService.initializeLessonForPreview(title, desc, ldId, getUserId(), customCSV,
- learnerPresenceAvailable, learnerImAvailable, liveEditEnabled);
+ liveEditEnabled);
} else {
try {
newLesson = monitoringService.initializeLesson(title, desc, ldId, organisationId, getUserId(),
- customCSV, false, false, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, false,
- forceRestart, allowRestart, gradebookOnComplete, null, null);
+ customCSV, false, false, liveEditEnabled, false, forceRestart, allowRestart,
+ gradebookOnComplete, null, null);
} catch (SecurityException e) {
response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the organisation");
return null;
@@ -366,8 +364,6 @@
boolean startMonitor = WebUtil.readBooleanParam(request, "startMonitor", false);
boolean enableLiveEdit = WebUtil.readBooleanParam(request, "liveEditEnable", false);
boolean notificationsEnable = WebUtil.readBooleanParam(request, "notificationsEnable", false);
- boolean presenceEnable = WebUtil.readBooleanParam(request, "presenceEnable", false);
- boolean imEnable = WebUtil.readBooleanParam(request, "imEnable", false);
Integer splitNumberLessons = WebUtil.readIntParam(request, "splitNumberLessons", true);
boolean schedulingEnable = WebUtil.readBooleanParam(request, "schedulingEnable", false);
Long orgGroupingId = WebUtil.readLongParam(request, "orgGroupingId", true);
@@ -445,7 +441,7 @@
Lesson lesson = null;
try {
lesson = monitoringService.initializeLesson(lessonInstanceName, introDescription, learningDesignID,
- organisationId, userId, null, introEnable, introImage, presenceEnable, imEnable,
+ organisationId, userId, null, introEnable, introImage,
enableLiveEdit, notificationsEnable, forceRestart, allowRestart, gradebookOnComplete,
timeLimitIndividual, precedingLessonId);
@@ -1613,50 +1609,8 @@
}
/**
- * Set whether or not the presence available button is available in learner. Expects parameters lessonID and
- * presenceAvailable.
- */
- @RequestMapping(path = "/presenceAvailable", method = RequestMethod.POST)
- public String presenceAvailable(HttpServletRequest request, HttpServletResponse response)
- throws IOException, ServletException {
- Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
- Integer userID = getUserId();
- Boolean presenceAvailable = WebUtil.readBooleanParam(request, "presenceAvailable", false);
-
- try {
- monitoringService.togglePresenceAvailable(lessonID, userID, presenceAvailable);
-
- if (!presenceAvailable) {
- monitoringService.togglePresenceImAvailable(lessonID, userID, false);
- }
- } catch (SecurityException e) {
- response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
- }
- return null;
- }
-
- /**
- * Set whether or not the presence available button is available in learner. Expects parameters lessonID and
- * presenceImAvailable.
- */
- @RequestMapping(path = "/presenceImAvailable", method = RequestMethod.POST)
- public String presenceImAvailable(HttpServletRequest request, HttpServletResponse response)
- throws IOException, ServletException {
- Long lessonID = new Long(WebUtil.readLongParam(request, "lessonID"));
- Integer userID = getUserId();
- Boolean presenceImAvailable = WebUtil.readBooleanParam(request, "presenceImAvailable", false);
-
- try {
- monitoringService.togglePresenceImAvailable(lessonID, userID, presenceImAvailable);
- } catch (SecurityException e) {
- response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a monitor in the lesson");
- }
- return null;
- }
-
- /**
* Set whether or not the activity scores / gradebook values are shown to the learner at the end of the lesson.
- * Expects parameters lessonID and presenceAvailable.
+ * Expects parameters lessonID and gradebookOnComplete.
*/
@RequestMapping(path = "/gradebookOnComplete", method = RequestMethod.POST)
public String gradebookOnComplete(HttpServletRequest request, HttpServletResponse response) throws IOException {
Index: lams_monitoring/web/css/_monitorLesson_base.scss
===================================================================
diff -u -rb2af5118e14e1c212f59996da644bc32001745c1 -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision b2af5118e14e1c212f59996da644bc32001745c1)
+++ lams_monitoring/web/css/_monitorLesson_base.scss (.../_monitorLesson_base.scss) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -205,7 +205,7 @@
display: none;
}
-#lessonStartDateCell *, #presenceAvailableCount {
+#lessonStartDateCell * {
display: none;
}
Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r81f928586161dd03042b6353f68c7d7b8279ccde -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 81f928586161dd03042b6353f68c7d7b8279ccde)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -293,61 +293,6 @@
$('#forceBackwardsDialog').modal('hide');
});
-
- $('#presenceButton').change(function(){
- var checked = $(this).prop('checked'),
- data = {
- 'presenceAvailable' : checked,
- 'lessonID' : lessonId
- };
- data[csrfTokenName] = csrfTokenValue;
- $.ajax({
- url : LAMS_URL + 'monitoring/monitoring/presenceAvailable.do',
- type : 'POST',
- cache : false,
- data : data,
- success : function() {
- // updatePresenceAvailableCount();
- if (checked) {
- $('#imButtonWrapper').show();
- showToast(LABELS.LESSON_PRESENCE_ENABLE_ALERT);
- } else {
- $('#imButtonWrapper, #openImButton').hide();
- $('#imButton').prop('checked', false);
- showToast(LABELS.LESSON_PRESENCE_DISABLE_ALERT);
- }
- }
- });
- });
-
- // sets instant messaging availability
- $('#imButton').click(function(){
- var checked = $(this).prop('checked'),
- data = {
- 'presenceImAvailable' : checked,
- 'lessonID' : lessonId
- };
- data[csrfTokenName] = csrfTokenValue;
- $.ajax({
- url : LAMS_URL + 'monitoring/monitoring/presenceImAvailable.do',
- type : 'POST',
- cache : false,
- data : data,
- success : function() {
- if (checked) {
- $('#openImButton').show();
- $('#openImButton').prop('disabled', false);
- showToast(LABELS.LESSON_IM_ENABLE_ALERT);
- } else {
- $('#openImButton').hide();
- showToast(LABELS.LESSON_IM_DISABLE_ALERT);
- }
- }
- });
- });
-
- $('#openImButton').click(openChatWindow);
-
//enable renaming of lesson title
$('#lesson-name').editable({
type: 'text',
@@ -1051,16 +996,6 @@
return list;
}
-
-function openChatWindow(){
- // variables are set in JSP page
- window.open(LAMS_URL + 'learning/presenceChat.jsp?lessonID=' + lessonId
- + '&presenceEnabledPatch=true&presenceImEnabled=true&presenceShown=true&createDateTime='
- + createDateTimeStr
- ,'Chat'
- ,'width=650,height=350,resizable=no,scrollbars=no,status=no,menubar=no,toolbar=no');
-}
-
function showEmailDialog(userId){
//check whether current window is a top level one (otherwise it's an iframe or popup)
@@ -1089,28 +1024,6 @@
}, false, true);
}
-/*
-function updatePresenceAvailableCount(){
- var checked = $('#presenceButton').prop('checked');
- counter = $('#presenceCounter');
- if (checked) {
- $.ajax({
- dataType : 'text',
- url : LAMS_URL + 'learning/learner/getPresenceChatActiveUserCount.do?',
- cache : false,
- data : {
- 'lessonID' : lessonId
- },
- success : function(result) {
- counter.text(result).show();
- }
- });
- } else {
- counter.hide();
- }
-}
-*/
-
function updateContributeActivities(contributeActivities) {
let requiredTasksPanel = $('#required-tasks'),
requiredTasksContent = $('#required-tasks-content', requiredTasksPanel);
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r509e81cd8bc4486fab7de352c4e8cfafd38efe48 -r0993bbd812a25ddb84feec64dd0e4847ce32d164
--- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 509e81cd8bc4486fab7de352c4e8cfafd38efe48)
+++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 0993bbd812a25ddb84feec64dd0e4847ce32d164)
@@ -108,10 +108,6 @@
SAVE_BUTTON : "