- Timestamp:
- 06/08/12 17:22:36 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.4/prototype/modules/calendar/js/map.disponibility.js
r6327 r6453 15 15 var isAllDay = $('.new-event-win.active input[name="allDay"]').is(':checked'); 16 16 17 var formatString = (isAllDay)? User.preferences.dateFormat+" HH:mm" :User.preferences.dateFormat + " " + User.preferences.hourFormat;17 var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat; 18 18 19 var startDate = Date.parseExact( isAllDay ? start_date+ " 00:00":start_date + " " + $.trim(start_time) , formatString );20 var endDate = Date.parseExact( isAllDay ? end_date+ " 00:00":end_date + " " + $.trim(end_time) , formatString );19 var startDate = Date.parseExact( start_date + " " + $.trim(start_time) , formatString ); 20 var endDate = Date.parseExact( end_date + " " + $.trim(end_time) , formatString ); 21 21 22 22 … … 36 36 37 37 function disponibily(objEvent, path, attendees){ 38 var formatString = (objEvent.allDay)? User.preferences.dateFormat+" HH:mm" :User.preferences.dateFormat + " " + User.preferences.hourFormat;39 var startDate = Date.parseExact( objEvent. allDay ? objEvent.startDate+ " 00:00": objEvent.startDate + " " + $.trim(objEvent.startHour) , formatString );40 var endDate = Date.parseExact( objEvent. allDay ? objEvent.endDate+ " 00:00": objEvent.endDate + " " + $.trim(objEvent.endHour) , formatString );38 var formatString = User.preferences.dateFormat + " " + User.preferences.hourFormat; 39 var startDate = Date.parseExact( objEvent.startDate + " " + $.trim(objEvent.startHour) , formatString ); 40 var endDate = Date.parseExact( objEvent.endDate + " " + $.trim(objEvent.endHour) , formatString ); 41 41 42 42 var mapHtml = DataLayer.render( path+'templates/availability_map.ejs', {}); … … 44 44 $("#new_event_map").fullCalendar(DataLayer.merge({ 45 45 height : 300, 46 timeFormat: { 47 agenda: 'HH:mm{ - HH:mm}', 48 '': 'HH:mm{ - HH:mm} }' 49 }, 46 timeFormat: User.preferences.hourFormat, 50 47 axisFormat: User.preferences.hourFormat, 51 48 firstDay: dateCalendar.dayOfWeek[User.preferences.weekStart], … … 76 73 $("#new_event_map").fullCalendar( 'updateEvent', event2 ); 77 74 78 $('[name="startDate"]').val(start.toString( "dd/MM/yyyy"));79 $('[name="endDate"]').val(end.toString( "dd/MM/yyyy"));75 $('[name="startDate"]').val(start.toString(User.preferences.dateFormat)); 76 $('[name="endDate"]').val(end.toString(User.preferences.dateFormat)); 80 77 if(!allDay){ 81 78 $('[name="allDay"]').attr("checked", false); 82 79 UI.dialogs.addEvent.find('.start-time, .end-time').removeClass('hidden'); 83 80 84 $('[name="startHour"]').val(start.toString( "HH:mm"));81 $('[name="startHour"]').val(start.toString(User.preferences.hourFormat)); 85 82 if(end){ 86 $('[name="endHour"]').val(end.toString( "HH:mm"));83 $('[name="endHour"]').val(end.toString(User.preferences.hourFormat)); 87 84 } 88 85 }else{ … … 108 105 $('[name="allDay"]').attr("checked", true); 109 106 UI.dialogs.addEvent.find('.start-time, .end-time').addClass('hidden'); 110 $('[name="startDate"]').val(event.start.toString("dd/MM/yyyy")); 111 if(event.end) 112 $('[name="endDate"]').val(event.end.toString("dd/MM/yyyy")); 113 else 114 $('[name="endDate"]').val(event.start.toString("dd/MM/yyyy")); 115 return; 107 108 $('[name="startDate"]').val(dateCalendar.toString(event.start, User.preferences.dateFormat)); 109 $('[name="endDate"]').val(dateCalendar.toString((event.end ? event.end : event.start), User.preferences.dateFormat)); 110 116 111 }else{ 117 112 $('[name="allDay"]').attr("checked", false); 118 113 UI.dialogs.addEvent.find('.start-time, .end-time').removeClass('hidden'); 114 115 $('[name="startHour"]').val(dateCalendar.formatDate(event.start, User.preferences.hourFormat)); 116 $('[name="startDate"]').val(dateCalendar.toString(event.start, User.preferences.dateFormat)); 117 118 $('[name="endHour"]').val(dateCalendar.formatDate((event.end ? event.end : new Date(dateCalendar.decodeRange(event.start, 120))), User.preferences.hourFormat)); 119 120 $('[name="endDate"]').val(dateCalendar.toString(event.end ? event.end : event.start , User.preferences.dateFormat)); 119 121 } 120 $('[name="startHour"]').val(event.start.toString("HH:mm"));121 $('[name="startDate"]').val(event.start.toString("dd/MM/yyyy"));122 if(event.end){123 $('[name="endHour"]').val(event.end.toString("HH:mm"));124 $('[name="endDate"]').val(event.end.toString("dd/MM/yyyy"));125 }else126 $('[name="endDate"]').val(event.start.toString("dd/MM/yyyy"));127 122 }, 128 123 eventResize: function(event,dayDelta,minuteDelta,revertFunc) { 129 if(event.end){ 130 $('[name="endHour"]').val(event.end.toString("HH:mm")); 131 $('[name="endDate"]').val(event.end.toString("dd/MM/yyyy")); 132 }else 133 $('[name="endDate"]').val(event.start.toString("dd/MM/yyyy")); 124 if(event.end) 125 $('[name="endHour"]').val(dateCalendar.formatDate(event.end, User.preferences.hourFormat)); 126 127 $('[name="endDate"]').val(dateCalendar.toString(event.end ? event.end : event.start , User.preferences.dateFormat)); 134 128 135 129 }, 136 130 defaultView : "agendaWeek" 137 131 }, dateCalendar)); 138 132 var eventSource = new Array();
Note: See TracChangeset
for help on using the changeset viewer.