Index: lams_documents/lams_monitoring/Monitoring.doc =================================================================== diff -u -r105c3f14f03daf872434e6c2946a1a02bbda6b4b -r57013f9cd1d5b7444b84b4c3949fdf121cf801d6 Binary files differ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java =================================================================== diff -u -r2428d60d75ce02f5e171cafa31853de121ddfe31 -r57013f9cd1d5b7444b84b4c3949fdf121cf801d6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java (.../MonitoringConstants.java) (revision 2428d60d75ce02f5e171cafa31853de121ddfe31) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java (.../MonitoringConstants.java) (revision 57013f9cd1d5b7444b84b4c3949fdf121cf801d6) @@ -32,4 +32,5 @@ public static final String JOB_START_LESSON = "startScheduleLessonJob"; public static final String JOB_FINISH_LESSON = "finishScheduleLessonJob"; public static final String PARAM_LESSON_START_DATE = "lessonStartDate"; + public static final String PARAM_LESSON_FINISH_DATE = "lessonFinishDate";; } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r2428d60d75ce02f5e171cafa31853de121ddfe31 -r57013f9cd1d5b7444b84b4c3949fdf121cf801d6 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 2428d60d75ce02f5e171cafa31853de121ddfe31) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 57013f9cd1d5b7444b84b4c3949fdf121cf801d6) @@ -296,16 +296,16 @@ { this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); long lessonId = WebUtil.readLongParam(request, AttributeNames.PARAM_LESSON_ID); - String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_START_DATE); + String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_FINISH_DATE); FlashMessage flashMessage = null; try { - Date startDate = DateFormat.getInstance().parse(dateStr); - monitoringService.finishLessonOnSchedule(lessonId,startDate); + Date finishDate = DateFormat.getInstance().parse(dateStr); + monitoringService.finishLessonOnSchedule(lessonId,finishDate); flashMessage = new FlashMessage("finishOnScheduleLesson",Boolean.TRUE); } catch(ParseException e){ flashMessage = new FlashMessage("finishOnScheduleLesson", - "Invalid lesson start datetime format:" + dateStr, + "Invalid lesson finish datetime format:" + dateStr, FlashMessage.ERROR); }catch (Exception e) { flashMessage = new FlashMessage("finishOnScheduleLesson",