New Project
- -Tolerably earnestly middleton extremely distrusts she boy now - not. Add and offered prepare how cordial.
-Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -r6eff730504702cb886be4c8f697bf4ee6d9c3bbd -rc177c5ddcbb7f4882a4c128b28a51c5a995995c7 --- lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 6eff730504702cb886be4c8f697bf4ee6d9c3bbd) +++ lams_monitoring/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision c177c5ddcbb7f4882a4c128b28a51c5a995995c7) @@ -532,3 +532,6 @@ label.monitoring.burning.questions = Burning Questions label.monitoring.teams.question.results.question = Question label.monitoring.teams.question.results = Question results +label.monitoring.learners.no.progress = No progress yet +label.monitoring.learners.time.taken = Time taken +label.monitoring.learners.mark = Mark Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r71558769fdc586041073bb32fb34d790ce55f835 -rc177c5ddcbb7f4882a4c128b28a51c5a995995c7 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 71558769fdc586041073bb32fb34d790ce55f835) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision c177c5ddcbb7f4882a4c128b28a51c5a995995c7) @@ -2532,8 +2532,9 @@ entry = activityEntryTemplate.clone().appendTo(timeline), icon = $('.timeline-icon', entry), iconURL = null, - durationCell = $('.timeline-activity-duration', entry), - markCell = $('.timeline-activity-mark', entry); + activityBox = ('.timeline-label', entry), + durationCell = $('.timeline-activity-duration', activityBox), + markCell = $('.timeline-activity-mark', activityBox); $('.timeline-title', entry).text(activity.name); @@ -2571,6 +2572,14 @@ } else { durationCell.closest('tr').remove(); } + + if (activity.url) { + activityBox.css('cursor', 'pointer'); + dblTap(activityBox, function(){ + // open pop up with user progress in the given activity + openPopUp(activity.url, "LearnActivity", popupHeight, popupWidth, true); + }); + } }); timelineContainer.show(); Index: lams_monitoring/web/monitor-learners-tab.jsp =================================================================== diff -u -rbfa7dfb5557d54767b137652b34dd89c13fb1227 -rc177c5ddcbb7f4882a4c128b28a51c5a995995c7 --- lams_monitoring/web/monitor-learners-tab.jsp (.../monitor-learners-tab.jsp) (revision bfa7dfb5557d54767b137652b34dd89c13fb1227) +++ lams_monitoring/web/monitor-learners-tab.jsp (.../monitor-learners-tab.jsp) (revision c177c5ddcbb7f4882a4c128b28a51c5a995995c7) @@ -26,7 +26,9 @@
Time taken | +||
---|---|---|
Mark | +
Tolerably earnestly middleton extremely distrusts she boy now - not. Add and offered prepare how cordial.
-Caulie dandelion maize lentil collard greens radish arugula - sweet pepper water spinach kombu courgette.
-
- Parsley amaranth tigernut
- silver beet maize fennel spinach ricebean black-eyed. Tolerably
- earnestly middleton extremely distrusts she boy now not. Add and
- offered prepare how cordial.
-