amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-17 14:24:52 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: a836db508daad782c0212918fc4a9fdb04af2c86

Browse Source 
Monotone-Revision: 03c04ebe5a884f273812846b653628eea0f968b4

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-06-12T20:59:32
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2007-06-12 20:59:32 +00:00
parent 2042a9cc6e
commit 6b96781083
1 changed files with 19 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/SchedulerUI.js
+19 -24
View File
@@ -560,27 +560,19 @@ function refreshCalendarEvents() {
ed = endDate.getDayString();
}
else {
var monthDate = sd.asDate();
monthDate.setDate(1);
var workDate = new Date();
workDate.setTime(monthDate.getTime());
var day = workDate.getDay();
if (day > 0)
workDate.addDays(1 - day);
var monthDate;
if (currentDay)
monthDate = currentDay.asDate();
else
workDate.addDays(-6);
monthDate = todayDate;
monthDate.setDate(1);
sd = monthDate.beginOfWeek().getDayString();
sd = workDate.getDayString();
workDate.setTime(monthDate.getTime());
workDate.setMonth(workDate.getMonth() + 1);
workDate.addDays(-1);
var day = workDate.getDay();
if (day > 0)
workDate.addDays(7 - day);
ed = workDate.getDayString();
var lastMonthDate = new Date();
lastMonthDate.setTime(monthDate.getTime());
lastMonthDate.setMonth(monthDate.getMonth() + 1);
lastMonthDate.addDays(-1);
ed = lastMonthDate.endOfWeek().getDayString();
}
if (document.refreshCalendarEventsAjaxRequest) {
document.refreshCalendarEventsAjaxRequest.aborted = true;
@@ -619,18 +611,21 @@ function drawCalendarEvent(eventData, sd, ed) {
var divs = new Array();
var title = null;
var title = eventData[3];
// log("title: " + title);
// log("viewS: " + viewStartDate);
var startHour = null;
var endHour = null;
for (var i = 0; i < days.length; i++) {
for (var i = 0; i < days.length; i++)
if (days[i].earlierDate(viewStartDate) == viewStartDate
&& days[i].laterDate(viewEndDate) == viewEndDate) {
var starts;
// log("day: " + days[i]);
if (i == 0) {
var quarters = (startDate.getHours() * 4
+ Math.floor(startDate.getMinutes() / 15));
starts = quarters;
title = eventData[3];
startHour = startDate.getDisplayHoursString();
endHour = endDate.getDisplayHoursString();
}
@@ -650,10 +645,11 @@ function drawCalendarEvent(eventData, sd, ed) {
if (!lasts)
lasts = 1;
var parentDiv;
var eventDiv = newEventDIV(eventData[0], eventData[1], starts, lasts,
null, null, title);
var dayString = days[i].getDayString();
// log("day: " + dayString);
var parentDiv = null;
if (currentView == "monthview") {
var dayDivs = $("monthDaysView").childNodesWithTag("div");
var j = 0;
@@ -693,7 +689,6 @@ function drawCalendarEvent(eventData, sd, ed) {
if (parentDiv)
parentDiv.appendChild(eventDiv);
}
}
}
function newEventDIV(cname, owner, starts, lasts,