Skip to content

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

git-svn-id:... 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@50570 954022d7-b5bf-4e40-9824-e11837661b57
parent abec7f1c
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 150 additions and 154 deletions
Excel/.unit-tests/FormulaTests.js
View file @ b03f9a49
This diff is collapsed.
Excel/model/FormulaObjects/cubeFunctions.js
View file @ b03f9a49
......@@ -6,33 +6,33 @@
* To change this template use File | Settings | File Templates.
*/
cFormulaFunction.Cube = {
'groupName' : "Cube",
'CUBEKPIMEMBER' : function(){
var r = new cBaseFunction("CUBEKPIMEMBER");
'groupName':"Cube",
'CUBEKPIMEMBER':function () {
var r = new cBaseFunction( "CUBEKPIMEMBER" );
return r;
},
'CUBEMEMBER' : function(){
var r = new cBaseFunction("CUBEMEMBER");
'CUBEMEMBER':function () {
var r = new cBaseFunction( "CUBEMEMBER" );
return r;
},
'CUBEMEMBERPROPERTY' : function(){
var r = new cBaseFunction("CUBEMEMBERPROPERTY");
'CUBEMEMBERPROPERTY':function () {
var r = new cBaseFunction( "CUBEMEMBERPROPERTY" );
return r;
},
'CUBERANKEDMEMBER' : function(){
var r = new cBaseFunction("CUBERANKEDMEMBER");
'CUBERANKEDMEMBER':function () {
var r = new cBaseFunction( "CUBERANKEDMEMBER" );
return r;
},
'CUBESET' : function(){
var r = new cBaseFunction("CUBESET");
'CUBESET':function () {
var r = new cBaseFunction( "CUBESET" );
return r;
},
'CUBESETCOUNT' : function(){
var r = new cBaseFunction("CUBESETCOUNT");
'CUBESETCOUNT':function () {
var r = new cBaseFunction( "CUBESETCOUNT" );
return r;
},
'CUBEVALUE' : function(){
var r = new cBaseFunction("CUBEVALUE");
'CUBEVALUE':function () {
var r = new cBaseFunction( "CUBEVALUE" );
return r;
}
}
\ No newline at end of file
Excel/model/FormulaObjects/databaseFunctions.js
View file @ b03f9a49
......@@ -6,53 +6,53 @@
* To change this template use File | Settings | File Templates.
*/
cFormulaFunction.Database = {
'groupName' : "Database",
'DAVERAGE' : function(){
var r = new cBaseFunction("DAVERAGE");
'groupName':"Database",
'DAVERAGE':function () {
var r = new cBaseFunction( "DAVERAGE" );
return r;
},
'DCOUNT' : function(){
var r = new cBaseFunction("DCOUNT");
'DCOUNT':function () {
var r = new cBaseFunction( "DCOUNT" );
return r;
},
'DCOUNTA' : function(){
var r = new cBaseFunction("DCOUNTA");
'DCOUNTA':function () {
var r = new cBaseFunction( "DCOUNTA" );
return r;
},
'DGET' : function(){
var r = new cBaseFunction("DGET");
'DGET':function () {
var r = new cBaseFunction( "DGET" );
return r;
},
'DMAX' : function(){
var r = new cBaseFunction("DMAX");
'DMAX':function () {
var r = new cBaseFunction( "DMAX" );
return r;
},
'DMIN' : function(){
var r = new cBaseFunction("DMIN");
'DMIN':function () {
var r = new cBaseFunction( "DMIN" );
return r;
},
'DPRODUCT' : function(){
var r = new cBaseFunction("DPRODUCT");
'DPRODUCT':function () {
var r = new cBaseFunction( "DPRODUCT" );
return r;
},
'DSTDEV' : function(){
var r = new cBaseFunction("DSTDEV");
'DSTDEV':function () {
var r = new cBaseFunction( "DSTDEV" );
return r;
},
'DSTDEVP' : function(){
var r = new cBaseFunction("DSTDEVP");
'DSTDEVP':function () {
var r = new cBaseFunction( "DSTDEVP" );
return r;
},
'DSUM' : function(){
var r = new cBaseFunction("DSUM");
'DSUM':function () {
var r = new cBaseFunction( "DSUM" );
return r;
},
'DVAR' : function(){
var r = new cBaseFunction("DVAR");
'DVAR':function () {
var r = new cBaseFunction( "DVAR" );
return r;
},
'DVARP' : function(){
var r = new cBaseFunction("DVARP");
'DVARP':function () {
var r = new cBaseFunction( "DVARP" );
return r;
}
}
Excel/model/FormulaObjects/statisticalFunctions.js
View file @ b03f9a49
......@@ -283,18 +283,18 @@ cFormulaFunction.Statistical = {
}
valueForSearching = parseNum( search ) ? new cNumber( search ) : new cString( search );
if ( arg0 instanceof cArea ) {
val = arg0.getValue();
for ( var i = 0; i < val.length; i++ ) {
if ( matching( val[i], valueForSearching, oper ) ) {
var r = arg0.getRange(), ws = arg0.getWS(),
r1 = r.first.getRow0() + i, c1 = arg2.getRange().first.getCol0();
r = new cRef( ws.getRange3( r1, c1, r1, c1 ).getName(), ws );
if ( r.getValue() instanceof cNumber ) {
_sum += r.getValue().getValue();
var r = arg0.getRange().first.getRow0(), ws = arg0.getWS(), c1 = arg2.getRange().first.getCol0(), i = 0;
arg0.foreach2(function(c){
if ( matching( c, valueForSearching, oper ) ) {
var r1 = r + i,
r2 = new cRef( ws.getRange3( r1, c1, r1, c1 ).getName(), ws );
if ( r2.getValue() instanceof cNumber ) {
_sum += r2.getValue().getValue();
_count++;
}
}
}
i++;
})
}
else {
val = arg0.getValue();
......@@ -742,13 +742,8 @@ cFormulaFunction.Statistical = {
valueForSearching = parseNum( search ) ? new cNumber( search ) : new cString( search );
if ( arg0 instanceof cArea ) {
arg0.foreach2(function(_val){
// _val
_count += matching( _val, valueForSearching, oper );
})
/*val = arg0.getValue();
for ( var i = 0; i < val.length; i++ ) {
_count += matching( val[i], valueForSearching, oper );
}*/
}
else if ( arg0 instanceof cArea3D ) {
val = arg0.getValue();
......
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