Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -rfbeb734a6ccb4d08e312fbf1b7fc6eb7bae46535 -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd Binary files differ Index: lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as =================================================================== diff -u -r348b1d6692ec42cec8ac2ab89dac9ff2a04d19f0 -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision 348b1d6692ec42cec8ac2ab89dac9ff2a04d19f0) +++ lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as (.../Monitor.as) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -141,7 +141,7 @@ } dialog.addEventListener("click", lo); } - + /** * Called when Users loaded for role type * @param evt:Object the event object @@ -189,7 +189,7 @@ private function loadLessonToMonitor(lessonID:Number){ var callback:Function = Proxy.create(monitorModel,monitorModel.loadSequence); - Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonDetails&lessonID=' + String(lessonID),callback, false); + Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonDetails&lessonID=' + String(lessonID) + '&userID=' + _root.userID,callback, false); } public function reloadLessonToMonitor(){ Index: lams_common/src/flash/org/lamsfoundation/lams/common/Sequence.as =================================================================== diff -u -r6b43802c93907932391a757c5e9515753c3e2e58 -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_common/src/flash/org/lamsfoundation/lams/common/Sequence.as (.../Sequence.as) (revision 6b43802c93907932391a757c5e9515753c3e2e58) +++ lams_common/src/flash/org/lamsfoundation/lams/common/Sequence.as (.../Sequence.as) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -55,6 +55,7 @@ // sequence dates private var _seqCreatedDate:Date; private var _seqStartDate:Date; + private var _seqStartDateStr:String; private var _seqScheduleStartDate:Date; private var _seqScheduleStartDateStr:String; @@ -120,6 +121,7 @@ _seqCreatedDate = dto.createDateTime; _seqStartDate = dto.startDateTime; + _seqStartDateStr = dto.startDateTimeStr; _seqScheduleStartDate = dto.scheduleStartDate; _seqScheduleStartDateStr = dto.scheduleStartDateStr; @@ -286,20 +288,31 @@ } public function getStartDateTime():String{ - var dateFormated:String + /**var dateFormated:String if (_seqStartDate.getDate() == undefined || _seqStartDate.getDate() == null){ //dateFormated = "Not Started" return null; }else{ var dateFormated:String = (_seqStartDate.getDate()+" "+(StringUtils.getMonthAsString(_seqStartDate.getMonth()))+" "+_seqStartDate.getFullYear());; - } - return dateFormated; + } + + return dateFormated; + */ + return this.startdatestr; } + public function setStartDateTimeStr(seqStartDateStr:String){ + _seqStartDateStr = seqStartDateStr; + } + public function get startdate():Date{ return _seqStartDate; } + public function get startdatestr():String { + return _seqStartDateStr; + } + public function get isStarted():Boolean{ if (_seqStartDate.getDate() == undefined || _seqStartDate.getDate() == null || _seqStartDate.getFullYear() == 1970){ return false; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java (.../LessonDetailsDTO.java) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -41,6 +41,7 @@ private Integer lessonStateID; private Date createDateTime; private Date startDateTime; + private String startDateTimeStr; private Date scheduleStartDate; private String scheduleStartDateStr; private Date scheduleEndDate; @@ -65,12 +66,14 @@ this.lessonStateID = lesson.getLessonStateId(); this.createDateTime = lesson.getCreateDateTime(); this.startDateTime = lesson.getStartDateTime(); + this.startDateTimeStr = null; this.scheduleStartDate = lesson.getScheduleStartDate(); - if(this.scheduleStartDate != null) { - this.scheduleStartDateStr = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(this.scheduleStartDate); - } else { - this.scheduleStartDateStr = null; - } + //if(this.scheduleStartDate != null) { + // this.scheduleStartDateStr = DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL).format(this.scheduleStartDate); + + //} else { + this.scheduleStartDateStr = null; + //} this.scheduleEndDate = lesson.getScheduleEndDate(); this.duration = lesson.getLearningDesign().getDuration(); @@ -188,6 +191,15 @@ public Date getStartDateTime() { return startDateTime!=null?startDateTime:WDDXTAGS.DATE_NULL_VALUE; } + + public String getStartDateTimeStr() { + return startDateTimeStr!=null?startDateTimeStr:WDDXTAGS.STRING_NULL_VALUE; + } + + public void setStartDateTimeStr(String startDateTimeStr) { + this.startDateTimeStr = startDateTimeStr; + } + /** * @return Returns the workspaceFolderID. */ Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -220,10 +220,11 @@ * * @param lessonID The lesson_id of the Lesson for which the details have * to be fetched - * @return String The requested details in wddx format + * @param userID The user who is fetching the Lesson details + * @return String The requested details in wddx format * @throws IOException */ - public String getLessonDetails(Long lessonID)throws IOException; + public String getLessonDetails(Long lessonID, Integer userID)throws IOException; /** * Returns a list of learners participating in the given Lesson Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -29,6 +29,7 @@ import java.util.Calendar; import java.util.Comparator; import java.util.Date; +import java.text.DateFormat; import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; @@ -40,6 +41,7 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.Vector; +import java.util.Locale; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -998,15 +1000,26 @@ * (non-Javadoc) * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#getLessonDetails(java.lang.Long) */ - public String getLessonDetails(Long lessonID)throws IOException{ + public String getLessonDetails(Long lessonID, Integer userID)throws IOException{ + User user = (User)baseDAO.find(User.class,userID); LessonDetailsDTO dto = lessonService.getLessonDetails(lessonID); + + Locale userLocale = new Locale(user.getLocale().getLanguageIsoCode(), user.getLocale().getCountryIsoCode()); + + if(dto.getStartDateTime() != null) + dto.setStartDateTimeStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale).format(dto.getStartDateTime())); + + if(dto.getScheduleStartDate() != null) + dto.setScheduleStartDateStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale).format(dto.getScheduleStartDate())); + FlashMessage flashMessage; - if(dto!=null){ - flashMessage = new FlashMessage("getLessonDetails",dto); - }else - flashMessage = new FlashMessage("getLessonDetails", - messageService.getMessage("NO.SUCH.LESSON",new Object[]{lessonID}), - FlashMessage.ERROR); + if(dto!=null){ + flashMessage = new FlashMessage("getLessonDetails",dto); + }else + flashMessage = new FlashMessage("getLessonDetails", + messageService.getMessage("NO.SUCH.LESSON",new Object[]{lessonID}), + FlashMessage.ERROR); + return flashMessage.serializeMessage(); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision f43da266c31a898f0fddc628bdeab7ebbdbef2dd) @@ -573,7 +573,7 @@ IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); try{ Long lessonID = new Long(WebUtil.readLongParam(request,"lessonID")); - wddxPacket = monitoringService.getLessonDetails(lessonID); + wddxPacket = monitoringService.getLessonDetails(lessonID, getUserId(request)); }catch (Exception e) { wddxPacket = handleException(e, "getLessonDetails", monitoringService).serializeMessage(); } Index: lams_monitoring/web/lams_monitoring.swf =================================================================== diff -u -r0f55ee572b2e9bc672efc9ee4feb774e8dd75946 -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd Binary files differ Index: lams_monitoring/web/lams_monitoring_library.swf =================================================================== diff -u -r0f55ee572b2e9bc672efc9ee4feb774e8dd75946 -rf43da266c31a898f0fddc628bdeab7ebbdbef2dd Binary files differ