Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as,v diff -u -r1.3 -r1.4 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as 7 Mar 2012 18:38:48 -0000 1.3 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/events/WizardEvent.as 9 Mar 2012 16:15:14 -0000 1.4 @@ -50,7 +50,6 @@ public var startEvent_type:String; public var schedule:String; - public var timeZone:String; public var scheduledNumberDaysToLessonFinish:int; Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml,v diff -u -r1.2 -r1.3 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml 26 Aug 2011 19:46:07 -0000 1.2 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/maps/MainEventMap.mxml 9 Mar 2012 16:15:14 -0000 1.3 @@ -209,7 +209,7 @@ - + Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as,v diff -u -r1.2 -r1.3 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as 7 Mar 2012 18:38:48 -0000 1.2 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/validators/LessonValidator.as 9 Mar 2012 16:15:14 -0000 1.3 @@ -34,7 +34,7 @@ } else if(value is FormItem) { var children:Array = (value as FormItem).getChildren(); if(children.length > 0) { - validateScheduleDate(children[0] as DateTimePicker, children[1] as ComboBox); + validateScheduleDate(children[0] as DateTimePicker); } } @@ -62,18 +62,9 @@ results.push(new ValidationResult(true, "", "noLearners", this.errorMessage)); } - private function validateScheduleDate(timePicker:DateTimePicker, timeZonePicker:ComboBox):void { + private function validateScheduleDate(timePicker:DateTimePicker):void { var now:Date = new Date(); - var tzList:ArrayCollection = (timeZonePicker.dataProvider != null) ? timeZonePicker.dataProvider as ArrayCollection : new ArrayCollection(); - var usersTzIdx:uint = Advanced.getUserTimeZoneIndex(Application.application.param("tz") as String, tzList.toArray()); - var usersTzOffset:Number = timeZonePicker.dataProvider[usersTzIdx].data; - - var selectedTzOffset:Number = timeZonePicker.selectedItem.data; - var rawOffset:Number = (usersTzOffset - selectedTzOffset); - - var valTime:Number = now.setTime(now.getTime() - rawOffset); - - if(timePicker.enabled) { + if(timePicker.enabled) { if(timePicker.selectedDate.date > now.date) return; else if(timePicker.selectedDate.date == now.date) Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml,v diff -u -r1.4 -r1.5 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml 7 Mar 2012 18:38:48 -0000 1.4 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Advanced.mxml 9 Mar 2012 16:15:14 -0000 1.5 @@ -48,25 +48,6 @@ private var instTxt_idx:uint; private static var focusTimeout:uint; - [Bindable] - private var tzList:Array; - - [Bindable] - private var userTimeZoneIndex:uint; - - //returns user's timezone index from the list of timezones - public static function getUserTimeZoneIndex(tz:String, tzList:Array):uint { - - for(var i:uint=0; i 0) - return; - - tzList = new Array(); - - // populate TimeZone list from User (java) class passed through in the Dictionary data. - var timezoneNumber:uint = uint(dictionary.getValue("timezoneNumber")); - for (var i:uint = 0; i < timezoneNumber; i++) { - label = dictionary.getLabel(String('timezoneID' + i)) as String; - value = dictionary.getValue(String('timezoneID' + i)) as String; - timeZoneId = label.substring(0, label.indexOf(" - ")); - - tzList.push({label: label, data: value, timeZoneId: timeZoneId }); - } - - userTimeZoneIndex = Advanced.getUserTimeZoneIndex(Application.application.param("tz") as String, tzList); - } ]]> @@ -307,7 +262,6 @@ - Index: lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml,v diff -u -r1.4 -r1.5 --- lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml 7 Mar 2012 18:38:48 -0000 1.4 +++ lams_flex/CloudWizard/src/org/lamsfoundation/lams/views/Lesson.mxml 9 Mar 2012 16:15:14 -0000 1.5 @@ -189,8 +189,6 @@ wizardEvent.lesson = newLesson; wizardEvent.schedule = (newLesson.enableScheduling) ? advanced.scheduleDateTimeStr : null; - var selectedTimeZoneIndex:uint = advanced.scheduleDateTZ.selectedIndex; - wizardEvent.timeZone = advanced.scheduleDateTZ.dataProvider[selectedTimeZoneIndex].timeZoneId; if(lessonInstances.length > 1) { startLessonInstances(wizardEvent); @@ -211,8 +209,6 @@ wizardEvent.lesson = newLesson; wizardEvent.schedule = event.schedule; - var selectedTimeZoneIndex:uint = advanced.scheduleDateTZ.selectedIndex; - wizardEvent.timeZone = advanced.scheduleDateTZ.dataProvider[selectedTimeZoneIndex].timeZoneId; wizardEvent.last = (lessonInstances.length == count); Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java,v diff -u -r1.17 -r1.18 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 1 Mar 2012 18:29:38 -0000 1.17 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java 9 Mar 2012 16:16:54 -0000 1.18 @@ -47,7 +47,6 @@ public static final String KEY_GROUP_ORDER_ID = "orderID"; public static final String KEY_GROUP_LEARNERS = "learners"; public static final Object KEY_USERS = "users"; - public static final String PARAM_SCHEDULE_TIME_ZONE_IDX = "scheduleTimeZoneIdx"; // --------------------------------------------------------------------- // Search type constants used in EmailNotificationsAction Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.92 -r1.93 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 5 Dec 2011 22:04:29 -0000 1.92 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 9 Mar 2012 16:16:55 -0000 1.93 @@ -214,11 +214,9 @@ * the lesson start date and time. * @param userId * checks that the user is a staff member for this lesson - * @param timeZoneId - * Timezone id to use for the start date * @see org.lamsfoundation.lams.monitoring.service#startLesson(long) */ - public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId, String timeZoneId) throws UserAccessDeniedException; + public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId) throws UserAccessDeniedException; /** * Finish a lesson on schedule datetime. 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.163 -r1.164 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 1 Mar 2012 18:29:38 -0000 1.163 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 9 Mar 2012 16:16:55 -0000 1.164 @@ -722,7 +722,7 @@ * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#startLessonOnSchedule(long * , Date, User) */ - public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId, String timeZoneId) { + public void startLessonOnSchedule(long lessonId, Date startDate, Integer userId) { // we get the lesson just created Lesson requestedLesson = lessonDAO.getLesson(new Long(lessonId)); @@ -747,18 +747,9 @@ } // Change client/users schedule date to server's timezone. - User user = (User) baseDAO.find(User.class, userId); - - TimeZone tz = TimeZone.getDefault(); - TimeZone selectedTz; - - if (timeZoneId != null) { - selectedTz = TimeZone.getTimeZone(timeZoneId); - } else { - selectedTz = TimeZone.getTimeZone(user.getTimeZone()); - } - - Date tzStartLessonDate = DateUtil.convertFromTimeZoneToDefault(selectedTz, startDate); + User user = (User) baseDAO.find(User.class, userId); + TimeZone userTimeZone = TimeZone.getTimeZone(user.getTimeZone()); + Date tzStartLessonDate = DateUtil.convertFromTimeZoneToDefault(userTimeZone, startDate); JobDetail startLessonJob = getStartScheduleLessonJob(); // setup the message for scheduling job Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.70 -r1.71 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 7 Mar 2012 18:41:14 -0000 1.70 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 9 Mar 2012 16:16:55 -0000 1.71 @@ -284,9 +284,7 @@ String dateStr = WebUtil.readStrParam(request, MonitoringConstants.PARAM_LESSON_START_DATE); Date startDate = DateUtil.convertFromLAMSFlashFormat(dateStr); - String timeZoneId = WebUtil.readStrParam(request, MonitoringConstants.PARAM_SCHEDULE_TIME_ZONE_IDX, true); - - monitoringService.startLessonOnSchedule(lessonId,startDate,getUserId(),timeZoneId); + monitoringService.startLessonOnSchedule(lessonId, startDate, getUserId()); flashMessage = new FlashMessage("startOnScheduleLesson",Boolean.TRUE); }catch (Exception e) { flashMessage = handleException(e, "startOnScheduleLesson", monitoringService); @@ -777,27 +775,8 @@ languageOutput += "" + messageService.getMessage(languageCollection.get(i)) + ""; } - if(module.equals("wizard")) { - - //sort timezones - TreeSet timezones = new TreeSet(new TimezoneComparator()); - timezones.addAll(getTimezoneService().getDefaultTimezones()); - - //let Flex know the number of timezones - languageOutput += "" + timezones.size() + ""; - - int i = 0; - for (Timezone timezone : timezones) { - TimeZone timeZone = TimeZone.getTimeZone(timezone.getTimezoneId()); - languageOutput += "" + - "" + timezone.getTimezoneId() + " - " + timeZone.getDisplayName() + "" + - "" + TimeZone.getTimeZone(timezone.getTimezoneId()).getRawOffset() + "" + - ""; - } - - if (orgName != null) { - languageOutput += "" + orgName + ""; - } + if(module.equals("wizard") && (orgName != null)) { + languageOutput += "" + orgName + ""; } languageOutput += ""; Index: lams_monitoring/web/CloudWizard.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/CloudWizard.swf,v diff -u -r1.14 -r1.15 Binary files differ