Commit a92a192f authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov

обработка для данных формата data

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49386 954022d7-b5bf-4e40-9824-e11837661b57
parent 06abaeb1
......@@ -3917,6 +3917,35 @@
result[m] = true;
}
}
else if(filter && filter.Filters && filter.Filters.Dates && filter.Filters.Dates.length)
{
var customFilter = filter.Filters.Dates;
var isBlank = filter.Filters.Blank;
//для головных мерженных ячеек
if(filter.ShowButton == false)
{
var isMerged = ws.model.getCell( new CellAddress(startCell.r1, startCell.c1, 0)).hasMerged();
if(isMerged)
{
startCell.c1 = isMerged.c1;
}
}
for(var m = startCell.r1 + 1; m <= endCell.r1; m++)
{
var val = ws.model.getCell( new CellAddress(m, startCell.c1, 0)).getValue();
var isVis = false;
var dataVal = NumFormat.prototype.parseDate(val);
for(var k = 0; k < customFilter.length;k++)
{
if(dataVal.d == customFilter[k].Day && dataVal.month + 1 == customFilter[k].Month && dataVal.year == customFilter[k].Year)
isVis = true;
}
if(val == '' && isBlank == true)
isVis = true;
if(!isVis)
result[m] = true;
}
}
else if(filter && filter.Filters)
{
var customFilter = filter.Filters.Values;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment