Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java =================================================================== diff -u -r04ddbcceec831fcb71c1c9d160300569ac1547f6 -rca3ad097610bd056ab66d6e7a8a1f2622a215522 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java (.../DummyForm.java) (revision 04ddbcceec831fcb71c1c9d160300569ac1547f6) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyForm.java (.../DummyForm.java) (revision ca3ad097610bd056ab66d6e7a8a1f2622a215522) @@ -21,11 +21,16 @@ package org.lamsfoundation.lams.monitoring.web; +import java.util.Calendar; +import java.util.GregorianCalendar; + import javax.servlet.http.HttpServletRequest; import org.apache.log4j.Logger; +import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; /** * See DummyMonitoringAction @@ -38,7 +43,11 @@ private String desc; private Long learningDesignId; private Integer organisationId; - + private Integer startDay; + private Integer startMonth; + private Integer startYear; + private Integer startHour; + private Integer startMinute; public void reset(ActionMapping mapping, HttpServletRequest request) { @@ -92,5 +101,65 @@ this.organisationId = organisationId; } + public Integer getStartDay() { + return startDay; + } + + public void setStartDay(Integer startDay) { + this.startDay = startDay; + } + + + public Integer getStartHour() { + return startHour; + } + + + public void setStartHour(Integer startHour) { + this.startHour = startHour; + } + + + public Integer getStartMinute() { + return startMinute; + } + + + public void setStartMinute(Integer startMinute) { + this.startMinute = startMinute; + } + + + public Integer getStartMonth() { + return startMonth; + } + + + public void setStartMonth(Integer startMonth) { + this.startMonth = startMonth; + } + + + public Integer getStartYear() { + return startYear; + } + + + public void setStartYear(Integer startYear) { + this.startYear = startYear; + } + + public Calendar getStartDate() { + if ( getStartDay() != null && getStartDay().intValue() > 0 ) { + Calendar cal = new GregorianCalendar(); + cal.set(Calendar.DAY_OF_MONTH, getStartDay().intValue()); + cal.set(Calendar.MONTH, getStartMonth() != null ? getStartMonth().intValue()-1 : 1); + cal.set(Calendar.YEAR, getStartYear() != null ? getStartYear().intValue() : 0); + cal.set(Calendar.HOUR_OF_DAY, getStartHour() != null ? getStartHour().intValue() : 0); + cal.set(Calendar.MINUTE, getStartMinute() != null ? getStartMinute().intValue() : 0); + return cal; + } + return null; + } } \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java =================================================================== diff -u -r2b516bec2b4c42ad0c7f3ea68db139d31d831205 -rca3ad097610bd056ab66d6e7a8a1f2622a215522 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (.../DummyMonitoringAction.java) (revision 2b516bec2b4c42ad0c7f3ea68db139d31d831205) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/DummyMonitoringAction.java (.../DummyMonitoringAction.java) (revision ca3ad097610bd056ab66d6e7a8a1f2622a215522) @@ -203,18 +203,18 @@ testLesson = monitoringService.createLessonClassForLesson(testLesson.getLessonId().longValue(), organisation, - "Leaner Group", + "Learner Group", learners, "Staff Group", staffs); // start the lesson. - this.monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); -// Calendar cal = Calendar.getInstance(); -// cal.setTime(new Date()); -// cal.add(Calendar.MILLISECOND,5000); -// monitoringService.startLessonOnSchedule(testLesson.getLessonId().longValue(),cal.getTime()); - monitoringService.startLesson(testLesson.getLessonId().longValue()); + Calendar startDate = dummyForm.getStartDate(); + if ( startDate == null ) { + monitoringService.startLesson(testLesson.getLessonId().longValue()); + } else { + monitoringService.startLessonOnSchedule(testLesson.getLessonId().longValue(),startDate.getTime()); + } return mapping.findForward(LESSON_STARTED_FORWARD); } Index: lams_monitoring/web/dummyStart.jsp =================================================================== diff -u -rccd319d5814f7182b441e35cd615aa162fef83fb -rca3ad097610bd056ab66d6e7a8a1f2622a215522 --- lams_monitoring/web/dummyStart.jsp (.../dummyStart.jsp) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) +++ lams_monitoring/web/dummyStart.jsp (.../dummyStart.jsp) (revision ca3ad097610bd056ab66d6e7a8a1f2622a215522) @@ -46,9 +46,19 @@