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

CC-2289:Differentiate between time and duration

Browse source 
- css has been modified (from Vlad)
- new image were added (from Vlad)
This commit is contained in:
james 2011-06-13 12:24:17 -04:00
parent 6a15f51aac
commit 7cc1f5c2e7
5 changed files with 124 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -349,88 +349,16 @@ function setAddShowEvents() {
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
if(startDateTime.getTime() > endDateTime.getTime()){
$('#add_show_end_date_no_repeat').css('background', '#F49C9C');
$('#add_show_end_time').css('background', '#F49C9C');
$('#add_show_end_date_no_repeat').css('background-color', '#F49C9C');
$('#add_show_end_time').css('background-color', '#F49C9C');
}else{
$('#add_show_end_date_no_repeat').css('background', '');
$('#add_show_end_time').css('background', '');
$('#add_show_end_date_no_repeat').css('background-color', '');
$('#add_show_end_time').css('background-color', '');
}
// calculate duration
calculateDuration(endDateTime, startDateTime);
});
// auto puplate end date and time
/*$('#add_show_start_date, #add_show_end_time_no_repeat').change(function(){
var startDate = $('#add_show_start_date').val().split('-');
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]);
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]);
if(startDateTime.getTime() > endDateTime.getTime()){
if($(this) == $('#add_show_start_date')){
var endDateTemp = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
$('#add_show_end_date_no_repeat').val(endDateTemp);
}else{
var startDateTemp = startDateTime.getFullYear() + '-' + pad(startDateTime.getMonth()+1,2) + '-' + pad(startDateTime.getDate(),2);
$('#add_show_end_date_no_repeat').val(startDateTemp);
}
}
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val());
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
// if changed start time is greater than end, set end time to start time + 1 hour
if(startDateTime.getTime() > endDateTime.getTime()){
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
}
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
$('#add_show_end_date_no_repeat').val(endDate);
$('#add_show_end_time').val(endTime);
// calculate duration
calculateDuration(endDateTime, startDateTime)
})
$('#add_show_start_time, #add_show_end_time').change(function(){
var startDate = $('#add_show_start_date').val().split('-');
var startDateTime = new Date(startDate[1]+' '+startDate[2]+','+startDate[0]+' '+$('#add_show_start_time').val());
var endDate = $('#add_show_end_date_no_repeat').val().split('-');
var endDateTime = new Date(endDate[1]+' '+endDate[2]+','+endDate[0]+' '+$('#add_show_end_time').val());
if($(this) == $('#add_show_start_time')){
// if changed start time is greater than end, set end time to start time + 1 hour
if(startDateTime.getTime() > endDateTime.getTime()){
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
}
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
$('#add_show_end_date_no_repeat').val(endDate);
$('#add_show_end_time').val(endTime);
}else{
// if changed start time is greater than end, set end time to start time + 1 hour
if(startDateTime.getTime() > endDateTime.getTime()){
endDateTime = new Date(startDateTime.getTime() + (1*60*60*1000));
}
var endDate = endDateTime.getFullYear() + '-' + pad(endDateTime.getMonth()+1,2) + '-' + pad(endDateTime.getDate(),2);
var endTime = pad(endDateTime.getHours(),2) + ':' + pad(endDateTime.getMinutes(),2);
$('#add_show_end_date_no_repeat').val(endDate);
$('#add_show_end_time').val(endTime);
}
// calculate duration
calculateDuration(endDateTime, startDateTime)
})*/
function calculateDuration(endDateTime, startDateTime){
var duration;
@ -444,6 +372,7 @@ function setAddShowEvents() {
}
$('#add_show_duration').val(duration);
}
function pad(number, length) {
var str = '' + number;
while (str.length < length) {