Index: lams_monitoring/web/includes/javascript/monitorLesson.js
===================================================================
diff -u -r5af0be57144213ec595237f5ac9dee7fe3bbc4a8 -r050a231052c87da93630886a48c6fa5fa4cafe51
--- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 5af0be57144213ec595237f5ac9dee7fe3bbc4a8)
+++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 050a231052c87da93630886a48c6fa5fa4cafe51)
@@ -1927,7 +1927,7 @@
// hide unnecessary controls
togglePagingCells(learnerGroupDialog, pageNumber, maxPageNumber);
- $.each(learners, function(learnerIndex, learner) {
+ $.each(learners, function(learnerIndex, learner) {
var viewUrl = allowView ? LAMS_URL + 'monitoring/monitoring.do?method=getLearnerActivityURL&userID='
+ learner.id + '&activityID=' + ajaxProperties.data.activityID + '&lessonID=' + lessonId
: null,
@@ -1939,7 +1939,7 @@
.html(getLearnerDisplayName(learner))
.appendTo(learnerGroupList);
- if (allowForceComplete || allowView || allowEmail) {
+ if (allowForceComplete || allowView || allowEmail) {
learnerDiv.click(function(event){
// select the learner
var learnerDiv = $(this),
@@ -1967,25 +1967,25 @@
selectedSiblings.removeClass('dialogListItemSelected');
}
});
- if (allowView){
- dblTap(learnerDiv, function(){
- // same as clicking View Learner button
- openPopUp(viewUrl, "LearnActivity", popupHeight, popupWidth, true);
- });
- }
+ if (allowView){
+ dblTap(learnerDiv, function(){
+ // same as clicking View Learner button
+ openPopUp(viewUrl, "LearnActivity", popupHeight, popupWidth, true);
+ });
}
- });
+ }
+ });
colorDialogList(learnerGroupDialog);
if (!isRefresh) {
// show buttons and labels depending on parameters
$('span#learnerGroupMultiSelectLabel, button#learnerGroupDialogForceCompleteButton', learnerGroupDialog)
- .css('display', allowForceComplete ? 'inline' : 'none');
+ .css('display', allowForceComplete ? 'inline' : 'none');
$('button#learnerGroupDialogViewButton', learnerGroupDialog)
- .css('display', allowView ? 'inline' : 'none');
+ .css('display', allowView ? 'inline' : 'none');
$('button#learnerGroupDialogEmailButton', learnerGroupDialog)
- .css('display', allowEmail ? 'inline' : 'none');
+ .css('display', allowEmail ? 'inline' : 'none');
$('.modal-title', learnerGroupDialog).text(dialogTitle);
learnerGroupDialog.data({
Index: lams_monitoring/web/monitor.jsp
===================================================================
diff -u -r757f4919e3cf9567eaad331bc4323fda7ea50eb2 -r050a231052c87da93630886a48c6fa5fa4cafe51
--- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 757f4919e3cf9567eaad331bc4323fda7ea50eb2)
+++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 050a231052c87da93630886a48c6fa5fa4cafe51)
@@ -324,34 +324,54 @@