Index: lams_monitoring/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/conf/language/lams/ApplicationResources.properties,v diff -u -r1.52 -r1.53 --- lams_monitoring/conf/language/lams/ApplicationResources.properties 27 Aug 2013 08:36:23 -0000 1.52 +++ lams_monitoring/conf/language/lams/ApplicationResources.properties 27 Aug 2013 16:15:14 -0000 1.53 @@ -302,6 +302,6 @@ button.export =Export Portfolio button.export.tooltip =Export the class portfolio and save it on your computer for future reference lesson.presence =online learners +sequence.help.info =Double click on an activity to see its details. - #======= End labels: Exported 291 labels for en AU ===== Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java,v diff -u -r1.18 -r1.19 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 9 Mar 2012 16:16:54 -0000 1.18 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 27 Aug 2013 16:15:14 -0000 1.19 @@ -63,4 +63,7 @@ public static final int COURSE_TYPE_HAVENT_STARTED_ANY_LESSONS = 9; public static final int COURSE_TYPE_HAVE_FINISHED_THESE_LESSONS = 10; public static final int COURSE_TYPE_HAVENT_FINISHED_THESE_LESSONS = 11; + + // how many times show info box in sequence tab + public static final short SEQUENCE_TAB_SHOW_INFO_MAX_COUNT = 2; } \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.98 -r1.99 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 8 Aug 2013 11:51:16 -0000 1.98 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 27 Aug 2013 16:15:14 -0000 1.99 @@ -194,11 +194,13 @@ try { String title = WebUtil.readStrParam(request, "lessonName"); - if (title == null) + if (title == null) { title = "lesson"; + } String desc = WebUtil.readStrParam(request, "lessonDescription", true); - if (desc == null) + if (desc == null) { desc = "description"; + } Integer organisationId = WebUtil.readIntParam(request, "organisationID", true); long ldId = WebUtil.readLongParam(request, AttributeNames.PARAM_LEARNINGDESIGN_ID); Boolean learnerExportAvailable = WebUtil.readBooleanParam(request, "learnerExportPortfolio", false); @@ -1168,7 +1170,7 @@ IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet() .getServletContext()); monitoringService.checkOwnerOrStaffMember(user.getUserID(), lessonId, "monitor lesson"); - + List contributeActivities = monitoringService.getAllContributeActivityDTO(lessonId); if (contributeActivities != null) { @@ -1193,6 +1195,18 @@ } } + // should info box on Sequence tab be displayed? + Short sequenceTabInfoShowCount = (Short) ss.getAttribute("sequenceTabInfoShowCount"); + if (sequenceTabInfoShowCount == null) { + sequenceTabInfoShowCount = 0; + } + // only few times per session + if (sequenceTabInfoShowCount < MonitoringConstants.SEQUENCE_TAB_SHOW_INFO_MAX_COUNT) { + sequenceTabInfoShowCount++; + ss.setAttribute("sequenceTabInfoShowCount", sequenceTabInfoShowCount); + request.setAttribute("sequenceTabShowInfo", true); + } + IUserManagementService userManagementService = MonitoringServiceProxy.getUserManagementService(getServlet() .getServletContext()); Organisation organisation = (Organisation) userManagementService.findById(Organisation.class, @@ -1239,7 +1253,8 @@ .append(learner.getLastName().toLowerCase()).append(" ") .append(learner.getLogin().toLowerCase()); for (String searchPhrasePiece : searchPhrases) { - if (!StringUtils.isBlank(searchPhrasePiece) && learnerDisplayName.indexOf(searchPhrasePiece) != -1) { + if (!StringUtils.isBlank(searchPhrasePiece) + && (learnerDisplayName.indexOf(searchPhrasePiece) != -1)) { searchResult.add(learnerProgress); } } Index: lams_monitoring/web/monitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v diff -u -r1.19 -r1.20 --- lams_monitoring/web/monitor.jsp 27 Aug 2013 08:36:23 -0000 1.19 +++ lams_monitoring/web/monitor.jsp 27 Aug 2013 16:15:14 -0000 1.20 @@ -81,8 +81,7 @@ $(document).ready(function(){ - $('#tabs').tabs(); - + initTabs(); initLessonTab(); initSequenceTab(); refreshMonitor(); @@ -448,8 +447,13 @@ -
+ +
+ +
+ +
\ No newline at end of file Index: lams_monitoring/web/css/monitorLesson.css =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/css/monitorLesson.css,v diff -u -r1.12 -r1.13 --- lams_monitoring/web/css/monitorLesson.css 27 Aug 2013 08:36:23 -0000 1.12 +++ lams_monitoring/web/css/monitorLesson.css 27 Aug 2013 16:15:14 -0000 1.13 @@ -40,7 +40,8 @@ border: none; } -.dialogContainer { +.dialogContainer, +.dialog-no-title .ui-dialog-titlebar { display: none; } @@ -260,4 +261,4 @@ td.progressBarLabel a { float: right; margin: 6px 5px 4px 0; -} +} \ No newline at end of file Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/includes/javascript/monitorLesson.js,v diff -u -r1.20 -r1.21 --- lams_monitoring/web/includes/javascript/monitorLesson.js 27 Aug 2013 08:36:23 -0000 1.20 +++ lams_monitoring/web/includes/javascript/monitorLesson.js 27 Aug 2013 16:15:14 -0000 1.21 @@ -7,6 +7,8 @@ var sequenceCanvas = null; // ID of currently shown branching activity; if NULL, the whole lesson is shown var sequenceBranchingId = null; +// info box show timeout +var sequenceInfoTimeout = 10000; // how learners in pop up lists are currently sorted var sortOrderAsc = { learnerGroup : false, @@ -28,6 +30,23 @@ // search phrase in Learners tab var learnersSearchPhrase = null; +// ********* GENERAL TABS FUNCTIONS ********* + +function initTabs(){ + $('#tabs').tabs({ + 'activate' : function(event, ui) { + if (ui.newPanel.attr('id') == 'tabSequence') { + var sequenceInfoDialog = $('#sequenceInfoDialog'); + if (sequenceInfoDialog.length > 0 + && !sequenceInfoDialog.dialog('option', 'showed')) { + sequenceInfoDialog.dialog('open'); + } + } + } + }); +} + + //********** LESSON TAB FUNCTIONS ********** /** @@ -541,8 +560,34 @@ $('#learnerGroupSortButton').click(function(){ sortDialogList('learnerGroup'); - }); + }); + + // small info box on Sequence tab, activated when the tab is showed + $('#sequenceInfoDialog').dialog({ + 'autoOpen' : false, + 'height' : 35, + 'width' : 290, + 'modal' : false, + 'resizable' : false, + 'show' : 'fold', + 'hide' : 'fold', + 'dialogClass': 'dialog-no-title', + 'position' : {my: "left top", + at: "left top+10", + of: '#sequenceTopButtonsContainer' + }, + 'open' : function(){ + var dialog = $(this); + // show only once in this Monitor + dialog.dialog('option', 'showed', true); + // close after given time + setTimeout(function(){ + dialog.dialog('close'); + }, sequenceInfoTimeout); + } + }); } + /**