diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css index cb615858d..edc706231 100644 --- a/UI/WebServerResources/SchedulerUI.css +++ b/UI/WebServerResources/SchedulerUI.css @@ -611,10 +611,13 @@ DIV.daysView DIV.days left: 5em; right: 0px; } +DIV.multicolumnDayView DIV.lastDayUser +{ border-right: 1px solid #397d94; } + DIV.daysView DIV.day { position: absolute; - left: 0px; border-left: 1px solid #397d94; + left: 0px; top: 0px; bottom: 0px; } diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index f2d800c3c..6aa1bfb3f 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -22,8 +22,12 @@ function newEvent(sender, type) { if (!day) day = currentDay; + var user = UserLogin; + if (currentView == "multicolumndayview" && type == "event") + user = sender.parentNode.parentNode.getAttribute("user"); + var hour = sender.getAttribute("hour"); - var urlstr = ApplicationBaseURL + "new" + type; + var urlstr = UserFolderURL + "../" + user + "/Calendar/new" + type; var params = new Array(); if (day) params.push("day=" + day); @@ -375,6 +379,7 @@ function changeDateSelectorDisplay(day, keepCurrentDay) if (!keepCurrentDay) currentDay = day; + log (backtrace()); var month = day.substr(0, 6); if (cachedDateSelectors[month]) { // log ("restoring cached selector for month: " + month); @@ -442,6 +447,11 @@ function onDayOverview() return _ensureView("dayview"); } +function onMulticolumnDayOverview() +{ + return _ensureView("multicolumndayview"); +} + function onWeekOverview() { return _ensureView("weekview"); @@ -773,7 +783,11 @@ function onCalendarSelectAppointment() { } function onCalendarSelectDay(event) { - var day = this.getAttribute("day"); + var day; + if (currentView == "multicolumndayview") + day = this.parentNode.getAttribute("day"); + else + day = this.getAttribute("day"); var needRefresh = (listFilter == 'view_selectedday' && day != currentDay);