Index: lams_central/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/addLesson.jsp,v diff -u -r1.14 -r1.15 --- lams_central/web/addLesson.jsp 27 Jan 2014 13:21:01 -0000 1.14 +++ lams_central/web/addLesson.jsp 20 Feb 2014 09:42:16 -0000 1.15 @@ -188,7 +188,7 @@


-
+



Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java,v diff -u -r1.51 -r1.52 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 17 May 2013 09:36:08 -0000 1.51 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java 20 Feb 2014 09:42:17 -0000 1.52 @@ -344,80 +344,6 @@ /** *

- * The struts dispatch action to retrieve the progress data from the server and tailor it into the object struture - * that expected by flash. A wddx packet with object data struture is sent back in the end of this call. It is used - * to construct or restore the flash learner progress bar - *

- * - *

- * Gets the most recent copy from the database - not the cached version. That way if the cached version has - * problems, at least we start off right! - *

- * - *

- * As this process is expensive, the server is only expecting this call whenever is necessary. For example, - * starting, resuming and restoring a new lesson. And it should not happen every time that learner is progressing to - * next activity. - *

- * - * @param mapping - * An ActionMapping class that will be used by the Action class to tell the ActionServlet where to send - * the end-user. - * - * @param form - * The ActionForm class that will contain any data submitted by the end-user via a form. - * @param request - * A standard Servlet HttpServletRequest class. - * @param response - * A standard Servlet HttpServletResponse class. - * @return An ActionForward class that will be returned to the ActionServlet indicating where the user is to go - * next. - * @throws IOException - * @throws ServletException - */ - public ActionForward getFlashProgressData(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) throws IOException, ServletException { - if (LearnerAction.log.isDebugEnabled()) { - LearnerAction.log.debug("Getting Flash progress data..."); - } - - FlashMessage message = null; - try { - - // SessionBean sessionBean = LearningWebUtil.getSessionBean(request,getServlet().getServletContext()); - - Integer learnerId = LearningWebUtil.getUserId(); - ICoreLearnerService learnerService = LearnerServiceProxy - .getLearnerService(getServlet().getServletContext()); - - Long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - LearnerProgressDTO learnerProgress = learnerService.getProgressDTOByLessonId(lessonId, learnerId); - - message = new FlashMessage("getFlashProgressData", learnerProgress); - - } catch (Exception e) { - message = handleException(e, "getFlashProgressData", - LearnerServiceProxy.getLearnerService(getServlet().getServletContext())); - } - - String wddxPacket = WDDXProcessor.serialize(message); - if (LearnerAction.log.isDebugEnabled()) { - LearnerAction.log.debug("Sending learner progress data to flash:" + wddxPacket); - } - // LDEV-2835 - response.addHeader("Pragma", "no-cache"); - response.addHeader("Cache-Control", "no-cache"); - response.addDateHeader("Expires", System.currentTimeMillis() - LamsDispatchAction.HEADER_EXPIRES_VALUE); - - response.getWriter().print(wddxPacket); - - // don't need to return a action forward because it sent the wddx packet - // back already. - return null; - } - - /** - *

* The struts dispatch action to view the activity. This will be called by flash progress bar to check up the * activity component. The lams side will calculate the url and send a flash message back to the flash component. *

Index: lams_learning/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/main.jsp,v diff -u -r1.27 -r1.28 --- lams_learning/web/main.jsp 6 Feb 2014 13:00:45 -0000 1.27 +++ lams_learning/web/main.jsp 20 Feb 2014 09:42:18 -0000 1.28 @@ -143,7 +143,9 @@ - + + + Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.191 -r1.192 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 18 Feb 2014 11:42:38 -0000 1.191 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 20 Feb 2014 09:42:21 -0000 1.192 @@ -487,7 +487,7 @@ User user = userID != null ? (User) baseDAO.find(User.class, userID) : null; return initializeLesson(lessonName, lessonDescription, originalLearningDesign, user, null, - LearningDesign.COPY_TYPE_PREVIEW, customCSV, false, false, true, learnerPresenceAvailable, + LearningDesign.COPY_TYPE_PREVIEW, customCSV, false, false, false, learnerPresenceAvailable, learnerImAvailable, liveEditEnabled, true, false, null, null); } Fisheye: Tag 1.20 refers to a dead (removed) revision in file `lams_monitoring/web/addLesson.jsp'. Fisheye: No comparison available. Pass `N' to diff?