提交 2fcd613b 编写于 作者: 蔡祥熠

Merge branch 'fix/Homepage_calendar_execption' into 'develop'

Merge of fix/Homepage_calendar_execption 修复首页日程安排显示异常的问题 to develop

See merge request o2oa/o2oa!1703

(cherry picked from commit 9806e809)

8d58321a 首页日程安排
1d31bdb9 修复首页日程安排显示异常的问题
上级 db8236ba
......@@ -104,12 +104,19 @@ MWF.xApplication.Homepage.CalendarContent = new Class({
"createPerson": layout.user.distinguishedName
};
o2.Actions.load("x_calendar_assemble_control").Calendar_EventAction.listWithFilter(d, function(json){
debugger;
if (json.data){
if (json.data.wholeDayEvents && json.data.wholeDayEvents.length){
json.data.wholeDayEvents.each(function(e){
var d = (new Date()).parse(e.startTime);
var i = start.diff(d);
this.setCalenderFlag(tds[i]);
var ds = (new Date()).parse(e.startTime);
var de = (new Date()).parse(e.endTime);
if( start > ds )ds = start.clone();
if( de < start )return;
while( ds < de && ds <= end ){
var i = start.diff(ds);
this.setCalenderFlag(tds[i]);
ds.increment('day',1);
}
}.bind(this));
}
if (json.data.inOneDayEvents && json.data.inOneDayEvents.length){
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册