monitor.jsp

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration
Conflicts:
lams_admin/.classpath
lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java
lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java
lams_admin/web/WEB-INF/struts-config.xml
lams_admin/web/WEB-INF/tiles-defs.xml
lams_admin/web/config/items.jsp
lams_admin/web/css/admin.scss
lams_admin/web/organisation/courseAdminEdit.jsp
lams_admin/web/organisation/createOrEdit.jsp
lams_admin/web/organisation/list.jsp
lams_admin/web/servermaintain.jsp
lams_admin/web/signupmanagement/add.jsp
lams_admin/web/signupmanagement/list.jsp
lams_admin/web/timezoneServerManagement.jsp
lams_admin/web/user.jsp
lams_admin/web/usersearchlist.jsp
lams_build/lib/lams/lams-admin.jar
lams_build/lib/lams/lams-central.jar
lams_build/lib/lams/lams-gradebook.jar
lams_build/lib/lams/lams-learning.jar
lams_build/lib/lams/lams-monitoring.jar
lams_build/lib/lams/lams.jar
lams_central/.classpath
lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java
lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java
lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java
lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java
lams_central/web/WEB-INF/struts-config.xml
lams_central/web/editprofile.jsp
lams_central/web/includes/javascript/pedagogicalPlanner.js
lams_central/web/lessons.jsp
lams_central/web/main.jsp
lams_central/web/portrait.jsp
lams_central/web/profile.jsp
lams_central/web/signup/singupTab.jsp
lams_central/web/tutorialVideo.jsp
lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql
lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
lams_gradebook/.classpath
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java
lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java
lams_monitoring/web/gate/scheduleGateContent.jsp
lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java
lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java
lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java
lams_tool_daco/.classpath
lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java
lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java
lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java
lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java
lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java
lams_tool_dimdim/.classpath
lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java
lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java
lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
lams_tool_eadventure/.classpath
lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java
lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java
lams_tool_forum/web/jsps/learning/viewtopic.jsp
lams_tool_forum/web/jsps/monitoring/summary.jsp
lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java
lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java
lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java
lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java
lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java
lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java
lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java
lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
lams_tool_lamc/web/authoring/AdvancedContent.jsp
lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java
lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java
lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java
lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java
lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java
lams_tool_mindmap/web/pages/authoring/authoring.jsp
lams_tool_mindmap/web/pages/learning/mindmap.jsp
lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java
lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java
lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java
lams_tool_pixlr/.classpath
lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java
lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java
lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java
lams_tool_preview/.classpath
lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java
lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java
lams_tool_sbmt/web/authoring/advance.jsp
lams_tool_sbmt/web/monitoring/mark/mark.jsp
lams_tool_sbmt/web/monitoring/parts/summary.jsp
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java
lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java
lams_tool_scribe/.classpath
lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java
lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java
lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java
lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java
lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java
lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java
lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java
lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java
lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java
lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java
lams_tool_videorecorder/.classpath
lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java
lams_tool_vote/.classpath
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java
lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java
lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java
lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java
lams_tool_wookie/.classpath
lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java