Skip to content

S
sdkjs
Commit df260350 authored by Dmitry.Shahtanov's avatar Dmitry.Shahtanov Committed by Alexander.Trofimov
Browse files
Options

добавлена EDATE 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47314 954022d7-b5bf-4e40-9824-e11837661b57
parent 2247c275
Show whitespace changes
Inline Side-by-side
Showing with 58 additions and 33 deletions
Excel/model/parserFormula.js
View file @ df260350
...@@ -24,7 +24,7 @@ var cErrorType = { ...@@ -24,7 +24,7 @@ var cErrorType = {
wrong_value_type: 6, wrong_value_type: 6,
unsupported_function: 7, unsupported_function: 7,
getting_data: 8 getting_data: 8
} };
var cExcelSignificantDigits = 15;//количество цифр в числе после запятой var cExcelSignificantDigits = 15;//количество цифр в числе после запятой
var cExcelMaxExponent = 308, cExcelMinExponent = -308; var cExcelMaxExponent = 308, cExcelMinExponent = -308;
var cExcelDateTimeDigits = 8;//количество цифр после запятой в числах отвечающих за время специализация $18.17.4.2 var cExcelDateTimeDigits = 8;//количество цифр после запятой в числах отвечающих за время специализация $18.17.4.2
...@@ -34,21 +34,19 @@ var c_Date1900Const = 25568; //разница в днях между 01.01.1970 ...@@ -34,21 +34,19 @@ var c_Date1900Const = 25568; //разница в днях между 01.01.1970
var c_DateCorrectConst = c_Date1900Const; var c_DateCorrectConst = c_Date1900Const;
function extend(Child, Parent) { function extend(Child, Parent) {
var F = function() { } var F = function() {};
F.prototype = Parent.prototype F.prototype = Parent.prototype;
Child.prototype = new F() Child.prototype = new F();
Child.prototype.constructor = Child Child.prototype.constructor = Child;
Child.superclass = Parent.prototype Child.superclass = Parent.prototype;
} }
Date.prototype.isLeapYear = function() Date.prototype.isLeapYear = function(){
{
var y = this.getFullYear(); var y = this.getFullYear();
return y % 4 == 0 && y % 100 != 0 || y % 400 == 0; return y % 4 == 0 && y % 100 != 0 || y % 400 == 0;
}; };
Date.prototype.getDaysInMonth = function() Date.prototype.getDaysInMonth = function(){
{
return arguments.callee[this.isLeapYear() ? 'L' : 'R'][this.getMonth()]; return arguments.callee[this.isLeapYear() ? 'L' : 'R'][this.getMonth()];
}; };
...@@ -58,14 +56,14 @@ Date.prototype.getDaysInMonth.R = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 3 ...@@ -58,14 +56,14 @@ Date.prototype.getDaysInMonth.R = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 3
Date.prototype.getDaysInMonth.L = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]; Date.prototype.getDaysInMonth.L = [31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
var _func = new Array();//для велосипеда а-ля перегрузка функций. var _func = [];//для велосипеда а-ля перегрузка функций.
_func[cElementType.number] = new Array(); _func[cElementType.number] = [];
_func[cElementType.string] = new Array(); _func[cElementType.string] = [];
_func[cElementType.bool] = new Array(); _func[cElementType.bool] = [];
_func[cElementType.error] = new Array(); _func[cElementType.error] = [];
_func[cElementType.cellsRange] = new Array(); _func[cElementType.cellsRange] = [];
_func[cElementType.empty] = new Array(); _func[cElementType.empty] = [];
_func[cElementType.array] = new Array(); _func[cElementType.array] = [];
_func[cElementType.number][cElementType.number] = function(arg0,arg1,what){ _func[cElementType.number][cElementType.number] = function(arg0,arg1,what){
...@@ -94,6 +92,7 @@ _func[cElementType.number][cElementType.number] = function(arg0,arg1,what){ ...@@ -94,6 +92,7 @@ _func[cElementType.number][cElementType.number] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( arg0.getValue() * arg1.getValue() ); return new cNumber( arg0.getValue() * arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.number][cElementType.string] = function(arg0,arg1,what){ _func[cElementType.number][cElementType.string] = function(arg0,arg1,what){
...@@ -114,6 +113,7 @@ _func[cElementType.number][cElementType.string] = function(arg0,arg1,what){ ...@@ -114,6 +113,7 @@ _func[cElementType.number][cElementType.string] = function(arg0,arg1,what){
case "*": case "*":
return new cError( cErrorType.wrong_value_type ); return new cError( cErrorType.wrong_value_type );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.number][cElementType.bool] = function(arg0,arg1,what){ _func[cElementType.number][cElementType.bool] = function(arg0,arg1,what){
...@@ -148,6 +148,7 @@ _func[cElementType.number][cElementType.bool] = function(arg0,arg1,what){ ...@@ -148,6 +148,7 @@ _func[cElementType.number][cElementType.bool] = function(arg0,arg1,what){
if( _arg instanceof cError ) return _arg; if( _arg instanceof cError ) return _arg;
return new cNumber( arg0.getValue() * _arg.getValue() ); return new cNumber( arg0.getValue() * _arg.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.number][cElementType.error] = function(arg0,arg1,what){ _func[cElementType.number][cElementType.error] = function(arg0,arg1,what){
...@@ -177,6 +178,7 @@ _func[cElementType.number][cElementType.empty] = function(arg0,arg1,what){ ...@@ -177,6 +178,7 @@ _func[cElementType.number][cElementType.empty] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( 0 ); return new cNumber( 0 );
} }
return new cError( cErrorType.wrong_value_type);
} }
...@@ -197,6 +199,7 @@ _func[cElementType.string][cElementType.number] = function(arg0,arg1,what){ ...@@ -197,6 +199,7 @@ _func[cElementType.string][cElementType.number] = function(arg0,arg1,what){
case "*": case "*":
return new cError( cErrorType.wrong_value_type ); return new cError( cErrorType.wrong_value_type );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.string][cElementType.string] = function(arg0,arg1,what){ _func[cElementType.string][cElementType.string] = function(arg0,arg1,what){
...@@ -240,6 +243,7 @@ _func[cElementType.string][cElementType.string] = function(arg0,arg1,what){ ...@@ -240,6 +243,7 @@ _func[cElementType.string][cElementType.string] = function(arg0,arg1,what){
if( _arg1 instanceof cError ) return _arg1; if( _arg1 instanceof cError ) return _arg1;
return new cNumber( _arg0.getValue() * _arg1.getValue() ); return new cNumber( _arg0.getValue() * _arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.string][cElementType.bool] = function(arg0,arg1,what){ _func[cElementType.string][cElementType.bool] = function(arg0,arg1,what){
...@@ -281,6 +285,7 @@ _func[cElementType.string][cElementType.bool] = function(arg0,arg1,what){ ...@@ -281,6 +285,7 @@ _func[cElementType.string][cElementType.bool] = function(arg0,arg1,what){
if( _arg1 instanceof cError ) return _arg1; if( _arg1 instanceof cError ) return _arg1;
return new cNumber( _arg0.getValue() * _arg1.getValue() ); return new cNumber( _arg0.getValue() * _arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.string][cElementType.error] = function(arg0,arg1,what){ _func[cElementType.string][cElementType.error] = function(arg0,arg1,what){
...@@ -307,6 +312,7 @@ _func[cElementType.string][cElementType.empty] = function(arg0,arg1,what){ ...@@ -307,6 +312,7 @@ _func[cElementType.string][cElementType.empty] = function(arg0,arg1,what){
case "*": case "*":
return new cError( cErrorType.wrong_value_type ); return new cError( cErrorType.wrong_value_type );
} }
return new cError( cErrorType.wrong_value_type);
} }
...@@ -342,6 +348,7 @@ _func[cElementType.bool][cElementType.number] = function(arg0,arg1,what){ ...@@ -342,6 +348,7 @@ _func[cElementType.bool][cElementType.number] = function(arg0,arg1,what){
if( _arg instanceof cError ) return _arg; if( _arg instanceof cError ) return _arg;
return new cNumber( _arg.getValue() * arg1.getValue() ); return new cNumber( _arg.getValue() * arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.bool][cElementType.string] = function(arg0,arg1,what){ _func[cElementType.bool][cElementType.string] = function(arg0,arg1,what){
...@@ -379,6 +386,7 @@ _func[cElementType.bool][cElementType.string] = function(arg0,arg1,what){ ...@@ -379,6 +386,7 @@ _func[cElementType.bool][cElementType.string] = function(arg0,arg1,what){
if( _arg1 instanceof cError ) return _arg1; if( _arg1 instanceof cError ) return _arg1;
return new cNumber( _arg0.getValue() * _arg1.getValue() ); return new cNumber( _arg0.getValue() * _arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.bool][cElementType.bool] = function(arg0,arg1,what){ _func[cElementType.bool][cElementType.bool] = function(arg0,arg1,what){
...@@ -414,6 +422,7 @@ _func[cElementType.bool][cElementType.bool] = function(arg0,arg1,what){ ...@@ -414,6 +422,7 @@ _func[cElementType.bool][cElementType.bool] = function(arg0,arg1,what){
_arg1 = arg1.tocNumber(); _arg1 = arg1.tocNumber();
return new cNumber( _arg0.getValue() * _arg1.getValue() ); return new cNumber( _arg0.getValue() * _arg1.getValue() );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.bool][cElementType.error] = function(arg0,arg1,what){ _func[cElementType.bool][cElementType.error] = function(arg0,arg1,what){
...@@ -443,6 +452,7 @@ _func[cElementType.bool][cElementType.empty] = function(arg0,arg1,what){ ...@@ -443,6 +452,7 @@ _func[cElementType.bool][cElementType.empty] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( 0 ); return new cNumber( 0 );
} }
return new cError( cErrorType.wrong_value_type);
} }
...@@ -478,6 +488,7 @@ _func[cElementType.empty][cElementType.number] = function(arg0,arg1,what){ ...@@ -478,6 +488,7 @@ _func[cElementType.empty][cElementType.number] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( 0 ); return new cNumber( 0 );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.empty][cElementType.string] = function(arg0,arg1,what){ _func[cElementType.empty][cElementType.string] = function(arg0,arg1,what){
...@@ -500,6 +511,7 @@ _func[cElementType.empty][cElementType.string] = function(arg0,arg1,what){ ...@@ -500,6 +511,7 @@ _func[cElementType.empty][cElementType.string] = function(arg0,arg1,what){
case "*": case "*":
return new cError( cErrorType.wrong_value_type ); return new cError( cErrorType.wrong_value_type );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.empty][cElementType.bool] = function(arg0,arg1,what){ _func[cElementType.empty][cElementType.bool] = function(arg0,arg1,what){
...@@ -527,6 +539,7 @@ _func[cElementType.empty][cElementType.bool] = function(arg0,arg1,what){ ...@@ -527,6 +539,7 @@ _func[cElementType.empty][cElementType.bool] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( 0 ); return new cNumber( 0 );
} }
return new cError( cErrorType.wrong_value_type);
} }
_func[cElementType.empty][cElementType.error] = function(arg0,arg1,what){ _func[cElementType.empty][cElementType.error] = function(arg0,arg1,what){
...@@ -551,6 +564,7 @@ _func[cElementType.empty][cElementType.empty] = function(arg0,arg1,what){ ...@@ -551,6 +564,7 @@ _func[cElementType.empty][cElementType.empty] = function(arg0,arg1,what){
case "*": case "*":
return new cNumber( 0 ); return new cNumber( 0 );
} }
return new cError( cErrorType.wrong_value_type);
} }
...@@ -1697,7 +1711,7 @@ var cFormulaFunction = { ...@@ -1697,7 +1711,7 @@ var cFormulaFunction = {
if( arg0 instanceof cError) return this.value = arg0; if( arg0 instanceof cError) return this.value = arg0;
if( arg1 instanceof cError) return this.value = arg1; if( arg1 instanceof cError) return this.value = arg1;
var val = arg0.getValue(); var val = arg0.getValue(), date, _date;
if(val < 0) if(val < 0)
return this.setCA(new cError( cErrorType.not_numeric ),true); return this.setCA(new cError( cErrorType.not_numeric ),true);
...@@ -1712,17 +1726,28 @@ var cFormulaFunction = { ...@@ -1712,17 +1726,28 @@ var cFormulaFunction = {
else else
val = new Date((val-c_DateCorrectConst)*86400*1000); val = new Date((val-c_DateCorrectConst)*86400*1000);
date = new Date(val);
if( 0 <= date.getDate() && 28 >= date.getDate() ){
val = new Date(val.setMonth(val.getMonth()+arg1.getValue())) val = new Date(val.setMonth(val.getMonth()+arg1.getValue()))
}
else if( 29 <= date.getDate() && 31 >= date.getDate() ){
date.setDate(1);
date.setMonth(date.getMonth()+arg1.getValue());
if( val.getDate() > (_date = date.getDaysInMonth()) ){
val.setDate( _date );
}
val = new Date(val.setMonth(val.getMonth()+arg1.getValue()));
}
return this.value = new cNumber( Math.floor( ( val.getTime()/1000 - val.getTimezoneOffset()*60 )/86400+(c_DateCorrectConst+1) ) ) return this.value = new cNumber( Math.floor( ( val.getTime()/1000 - val.getTimezoneOffset()*60 )/86400+(c_DateCorrectConst+1) ) )
} }
/* r.getInfo = function(){ r.getInfo = function(){
return { return {
name:this.name, name:this.name,
args:"( start-date , month-offset )" args:"( start-date , month-offset )"
}; };
} */ }
r.setFormat(r.formatType.noneFormat); r.setFormat(r.formatType.noneFormat);
return r; return r;
}, },
......
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