Congegni/sintonia
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

CC-3105: Settings dates (the popup select date calendar) shows Today by local machine timezone and not Airtime timezone.

Browse source 
-fixed
This commit is contained in:
Martin Konecny 2011-11-25 17:36:11 -05:00
parent e9c25faa34
commit b1193318ed
7 changed files with 32 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

7
airtime_mvc/public/js/airtime/schedule/add-show.js
View file

@ -19,11 +19,10 @@ function startDpSelect(dateText, inst) {
function endDpSelect(dateText, inst) {
var time, date;
time = dateText.split("-");
date = new Date(time[0], time[1] - 1, time[2]);
//$("#add_show_start_date").datepicker( "option", "maxDate", date);
if (inst.input)
inst.input.trigger('change');
}
@ -32,7 +31,7 @@ function createDateInput(el, onSelect) {
var date;
el.datepicker({
minDate: new Date(),
minDate: adjustDateToServerDate(new Date(), timezoneOffset),
onSelect: onSelect,
dateFormat: 'yy-mm-dd'
});
@ -188,7 +187,7 @@ function setAddShowEvents() {
});
form.find('input[name^="add_show_rebroadcast_date_absolute"]').datepicker({
minDate: new Date(),
minDate: adjustDateToServerDate(new Date(), timezoneOffset),
dateFormat: 'yy-mm-dd'
});
form.find('input[name^="add_show_rebroadcast_time"]').timepicker({

15
airtime_mvc/public/js/airtime/schedule/full-calendar-functions.js
View file

@ -75,19 +75,6 @@ function makeTimeStamp(date){
return timestamp;
}
function adjustDateToServerDate(date, serverTimezoneOffset){
//date object stores time in the browser's localtime. We need to artificially shift
//it to
var timezoneOffset = date.getTimezoneOffset()*60*1000;
date.setTime(date.getTime() + timezoneOffset + serverTimezoneOffset*1000);
/* date object has been shifted to artificial UTC time. Now let's
* shift it to the server's timezone */
return date;
}
function pad(number, length) {
var str = '' + number;
while (str.length < length) {
@ -101,7 +88,7 @@ function dayClick(date, allDay, jsEvent, view) {
var now, today, selected, chosenDate, chosenTime;
now = adjustDateToServerDate(new Date(), serverTimezoneOffset);
if(view.name === "month") {
today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
selected = new Date(date.getFullYear(), date.getMonth(), date.getDate());