Skip to content

S
sdkjs
Commit e0121724 authored by Igor.Zotov's avatar Igor.Zotov Committed by Alexander.Trofimov
Browse files
Options

чтение / запись а/ф (в качестве данных дата) 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62609 954022d7-b5bf-4e40-9824-e11837661b57
parent 1bd286e4
Hide whitespace changes
Inline Side-by-side
Showing with 149 additions and 54 deletions
Excel/model/Serialize.js
View file @ e0121724
...@@ -1140,7 +1140,11 @@ ...@@ -1140,7 +1140,11 @@
}; };
this.WriteDateGroupItem = function(dateGroupItem) this.WriteDateGroupItem = function(dateGroupItem)
{ {
if(null != dateGroupItem.DateTimeGrouping) var oDateGroupItem = new DateGroupItem();
oDateGroupItem.convertRangeToDateGroupItem(dateGroupItem);
dateGroupItem = oDateGroupItem;
if(null != dateGroupItem.DateTimeGrouping)
{ {
this.memory.WriteByte(c_oSer_DateGroupItem.DateTimeGrouping); this.memory.WriteByte(c_oSer_DateGroupItem.DateTimeGrouping);
this.memory.WriteByte(c_oSerPropLenType.Byte); this.memory.WriteByte(c_oSerPropLenType.Byte);
...@@ -3836,55 +3840,10 @@ ...@@ -3836,55 +3840,10 @@
res = this.bcr.Read2Spreadsheet(length, function(t,l){ res = this.bcr.Read2Spreadsheet(length, function(t,l){
return oThis.ReadDateGroupItem(t,l, oDateGroupItem); return oThis.ReadDateGroupItem(t,l, oDateGroupItem);
}); });
var startDate, endDate, date; var autoFilterDateElem = new AutoFilterDateElem();
switch(oDateGroupItem.DateTimeGrouping) autoFilterDateElem.convertDateGroupItemToRange(oDateGroupItem);
{ oFilters.Dates.push(autoFilterDateElem);
case 1://day
{
date = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day));
startDate = date.getExcelDateWithTime();
date.addDays(1)
endDate = date.getExcelDateWithTime();
break;
}
case 2://hour
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, 1)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, 59)).getExcelDateWithTime();
break;
}
case 3://minute
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, 1)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, 59)).getExcelDateWithTime();
break;
}
case 4://month
{
date = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, 1));
startDate = date.getExcelDateWithTime();
date.addMonths(1)
endDate = date.getExcelDateWithTime();
break;
}
case 5://second
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second )).getExcelDateWithTime();
break;
}
case 6://year
{
date = new Date(Date.UTC( oDateGroupItem.Year, 0));
startDate = date.getExcelDateWithTime();
date.addYears(1)
endDate = date.getExcelDateWithTime();
break;
}
}
oFilters.Dates.push(new dateElem(startDate, endDate, oDateGroupItem.DateTimeGrouping));
} }
else if ( c_oSer_FilterColumn.FiltersBlank == type ) else if ( c_oSer_FilterColumn.FiltersBlank == type )
oFilters.Blank = this.stream.GetBool(); oFilters.Blank = this.stream.GetBool();
......
Excel/model/WorkbookElems.js
View file @ e0121724
...@@ -4558,10 +4558,24 @@ Filters.prototype.init = function(obj) { ...@@ -4558,10 +4558,24 @@ Filters.prototype.init = function(obj) {
for(var i = 0; i < obj.values.length; i++) for(var i = 0; i < obj.values.length; i++)
{ {
if(obj.values[i].visible) if(obj.values[i].visible)
this.Values[obj.values[i].text] = true; {
if(obj.values[i].isDateFormat)
{
var dateGroupItem = new DateGroupItem();
var autoFilterDateElem = new AutoFilterDateElem(obj.values[i].val, obj.values[i].val, 1);
dateGroupItem.convertRangeToDateGroupItem(autoFilterDateElem);
autoFilterDateElem.convertDateGroupItemToRange(dateGroupItem);
this.Dates.push(autoFilterDateElem);
}
else
this.Values[obj.values[i].text] = true;
}
else else
allFilterOpenElements = false; allFilterOpenElements = false;
} }
this._sortDate();
return allFilterOpenElements; return allFilterOpenElements;
}; };
Filters.prototype.isHideValue = function(val, isDateTimeFormat) { Filters.prototype.isHideValue = function(val, isDateTimeFormat) {
...@@ -4606,6 +4620,16 @@ Filters.prototype.linearSearch = function(val, array) { ...@@ -4606,6 +4620,16 @@ Filters.prototype.linearSearch = function(val, array) {
else else
return -1; return -1;
}; };
Filters.prototype._sortDate = function()
{
if(this.Dates && this.Dates.length)
{
this.Dates.sort (function sortArr(a, b)
{
return a.start - b.start;
})
}
};
/** @constructor */ /** @constructor */
function Filter() { function Filter() {
...@@ -4632,6 +4656,66 @@ DateGroupItem.prototype.clone = function() { ...@@ -4632,6 +4656,66 @@ DateGroupItem.prototype.clone = function() {
res.Year = this.Year; res.Year = this.Year;
return res; return res;
}; };
DateGroupItem.prototype.convertRangeToDateGroupItem = function(range) {
var startUtcDate = NumFormat.prototype.parseDate(range.start);
var year = startUtcDate.year;
var month = startUtcDate.month + 1;
var day = startUtcDate.d;
var hour = startUtcDate.hour;
var minute = startUtcDate.minute;
var second = startUtcDate.second;
this.DateTimeGrouping = range.dateTimeGrouping;
switch(this.DateTimeGrouping)
{
case 1://day
{
this.Year = year;
this.Month = month;
this.Day = day;
break;
}
case 2://hour
{
this.Year = year;
this.Month = month;
this.Day = day;
this.Hour = hour;
break;
}
case 3://minute
{
this.Year = year;
this.Month = month;
this.Day = day;
this.Hour = hour;
this.Minute = minute;
break;
}
case 4://month
{
this.Year = year;
this.Month = month;
break;
}
case 5://second
{
this.Year = year;
this.Month = month;
this.Day = day;
this.Hour = hour;
this.Minute = minute;
this.Second = second;
break;
}
case 6://year
{
this.Year = year;
break;
}
}
};
/** @constructor */ /** @constructor */
function CustomFilters() { function CustomFilters() {
...@@ -4900,19 +4984,71 @@ SortCondition.prototype.clone = function() { ...@@ -4900,19 +4984,71 @@ SortCondition.prototype.clone = function() {
return res; return res;
}; };
function dateElem(start, end, dateTimeGrouping) { function AutoFilterDateElem(start, end, dateTimeGrouping) {
this.start = start; this.start = start;
this.end = end; this.end = end;
this.dateTimeGrouping = dateTimeGrouping; this.dateTimeGrouping = dateTimeGrouping;
} }
dateElem.prototype.clone = function() { AutoFilterDateElem.prototype.clone = function() {
var res = new dateElem(); var res = new AutoFilterDateElem();
res.start = this.start; res.start = this.start;
this.end = this.end; this.end = this.end;
this.dateTimeGrouping = this.dateTimeGrouping; this.dateTimeGrouping = this.dateTimeGrouping;
return res; return res;
}; };
AutoFilterDateElem.prototype.convertDateGroupItemToRange = function(oDateGroupItem) {
var startDate, endDate, date;
switch(oDateGroupItem.DateTimeGrouping)
{
case 1://day
{
date = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day));
startDate = date.getExcelDateWithTime();
date.addDays(1)
endDate = date.getExcelDateWithTime();
break;
}
case 2://hour
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, 1)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, 59)).getExcelDateWithTime();
break;
}
case 3://minute
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, 1)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Minute, 59)).getExcelDateWithTime();
break;
}
case 4://month
{
date = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, 1));
startDate = date.getExcelDateWithTime();
date.addMonths(1)
endDate = date.getExcelDateWithTime();
break;
}
case 5://second
{
startDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second)).getExcelDateWithTime();
endDate = new Date(Date.UTC( oDateGroupItem.Year, oDateGroupItem.Month - 1, oDateGroupItem.Day, oDateGroupItem.Hour, oDateGroupItem.Second )).getExcelDateWithTime();
break;
}
case 6://year
{
date = new Date(Date.UTC( oDateGroupItem.Year, 0));
startDate = date.getExcelDateWithTime();
date.addYears(1)
endDate = date.getExcelDateWithTime();
break;
}
}
this.start = startDate;
this.end = endDate;
this.dateTimeGrouping = oDateGroupItem.DateTimeGrouping;
};
window["Asc"]["CustomFilters"] = window["Asc"].CustomFilters = CustomFilters; window["Asc"]["CustomFilters"] = window["Asc"].CustomFilters = CustomFilters;
prot = CustomFilters.prototype; prot = CustomFilters.prototype;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7