Index: lams_central/web/includes/javascript/progressBar.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/progressBar.js,v
diff -u -r1.12 -r1.13
--- lams_central/web/includes/javascript/progressBar.js 11 Jun 2014 09:51:39 -0000 1.12
+++ lams_central/web/includes/javascript/progressBar.js 20 Jun 2014 17:34:18 -0000 1.13
@@ -349,7 +349,7 @@
// label underneath the shape
var label = null,
- content = activity.name;
+ content = activity.name || '';
if (isHorizontalBar) {
// cut lengthy activity names so they don't overlap
if (content.length > 23) {
@@ -1023,9 +1023,9 @@
$.ajax({
url : LAMS_URL + 'monitoring/monitoring.do',
data : {
- 'method' : 'getLearnerProgress',
+ 'method' : 'getLearnerProgress',
'lessonID' : lessonId,
- 'userID' : bar.userId
+ 'userID' : bar.userId
},
cache : false,
dataType : 'json',
@@ -1135,13 +1135,13 @@
}
// draw support activities if they exist
- if (result.support
- && !supportSeparatorRow.is(':visible')) {
+ var supportSeparatorRow = $('#supportSeparatorRow');
+ if (result.support && supportSeparatorRow.length > 0 && !supportSeparatorRow.is(':visible')) {
supportSeparatorRow.show();
- supportPart.height(17 + 33 * result.support.length)
- .show();
+ $('#supportPart').height(17 + 33 * result.support.length)
+ .show();
- // separate paper for Suppor Activities frame
+ // separate paper for Support Activities frame
var supportPaper = Raphael('supportPart');
$.each(result.support, function(activityIndex,
Index: lams_learning/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v
diff -u -r1.29 -r1.30
--- lams_learning/web/main.jsp 21 Apr 2014 17:09:32 -0000 1.29
+++ lams_learning/web/main.jsp 20 Jun 2014 17:34:17 -0000 1.30
@@ -58,9 +58,6 @@
TOSTART_ACTIVITY : '',
SUPPORT_ACTIVITY : ''
},
-
- supportSeparatorRow = null,
- supportPart = null,
parentURL = "${notifyCloseURL}",
lessonId = '${param.lessonID}',
@@ -84,10 +81,6 @@
// show if panel is not disabled in LAMS Configuration
if (progressPanelEnabled) {
- // these DOM elements are accessed often, so cache reference to them
- supportSeparatorRow = $('#supportSeparatorRow');
- supportPart = $('#supportPart');
-
$('body').layout({
west : {
applyDefaultStyles : true,