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.149.2.1 -r1.149.2.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 16 Apr 2009 07:01:36 -0000 1.149.2.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 7 May 2009 06:01:23 -0000 1.149.2.2 @@ -38,6 +38,7 @@ import java.util.Map; import java.util.Set; import java.util.SortedSet; +import java.util.TimeZone; import java.util.TreeMap; import java.util.TreeSet; import java.util.Vector; @@ -92,6 +93,7 @@ import org.lamsfoundation.lams.usermanagement.util.LastNameAlphabeticComparator; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.DateUtil; import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.audit.AuditService; import org.lamsfoundation.lams.util.wddx.FlashMessage; @@ -1430,15 +1432,19 @@ LessonDetailsDTO dto = lessonService.getLessonDetails(lessonID); Locale userLocale = new Locale(user.getLocale().getLanguageIsoCode(), user.getLocale().getCountryIsoCode()); - + TimeZone tz = TimeZone.getTimeZone(User.timezoneList[user.getTimeZone()]); + + Date tzStartDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getStartDateTime())); + Date tzScheduleDate = DateUtil.convertFromUTCToLocal(tz, DateUtil.convertToUTC(dto.getScheduleStartDate())); + if (dto.getStartDateTime() != null) { dto.setStartDateTimeStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) - .format(dto.getStartDateTime())); + .format(tzStartDate)); } if (dto.getScheduleStartDate() != null) { dto.setScheduleStartDateStr(DateFormat.getDateTimeInstance(DateFormat.FULL, DateFormat.FULL, userLocale) - .format(dto.getScheduleStartDate())); + .format(tzScheduleDate)); } MonitoringService.log.debug(dto.toString());