From 45c2fefa839f0176841afece94edd110d3cdbd18 Mon Sep 17 00:00:00 2001 From: Marco Antonio Nina Date: Wed, 12 Jun 2013 11:32:29 -0400 Subject: [PATCH 1/2] BUG-11751 Borrar el primer registro de una grilla da error SOLVED - The Requested functionality was added to delete a row in a grid. --- gulliver/js/grid/core/grid.js | 26 ++++++++++++++++++++++++-- gulliver/js/maborak/core/maborak.js | 7 +++++-- 2 files changed, 29 insertions(+), 4 deletions(-) diff --git a/gulliver/js/grid/core/grid.js b/gulliver/js/grid/core/grid.js index 8e661d2fe..38db3eec0 100755 --- a/gulliver/js/grid/core/grid.js +++ b/gulliver/js/grid/core/grid.js @@ -942,6 +942,7 @@ var G_Grid = function(oForm, sGridName){ this.clearRowWC = function (oObj, aRow) { var i = 0; + var pmLabel = ''; var elemNodeName = ''; var objects = ''; for (i = 1; i < oObj.oGrid.rows[1].cells.length; i++) { @@ -957,9 +958,31 @@ var G_Grid = function(oForm, sGridName){ fieldSuggest = (objects[0].id).substring(0, (objects[0].id).length-7) + "]"; if ( document.getElementById(fieldSuggest) != null) { document.getElementById(fieldSuggest).value = ''; - oObj.aElements[i-1].updateDepententFields(); } } + if (oObj.aFunctions.length>0) { + pmLabel = ''; + for (iAux = 0; iAux <= objects[0].attributes.length - 1; iAux++) { + if ( objects[0].attributes[iAux].name == "pm:label" ) { + pmLabel = objects[0].attributes[iAux].nodeValue; + break; + } + } + for (j = 0; j < oObj.aFunctions.length; j++) { + if ( pmLabel != '' && pmLabel == oObj.aFunctions[j].sFieldName) { + switch (oObj.aFunctions[j].sFunction) { + case "sum": + oObj.sum(false, document.getElementById(objects[0].id)); + break; + case "avg": + oObj.avg(false, document.getElementById(objects[0].id)); + break; + } + break; + } + } + } + oObj.aElements[i-1].updateDepententFields(); break; case "select": objects = oCell1.getElementsByTagName("select"); @@ -975,7 +998,6 @@ var G_Grid = function(oForm, sGridName){ } } }; - /////////////////////////////////////////////////////////////////////////////////// this.assignFunctions = function (aFields, sEvent, iRow) diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index 187ae21f1..4e369bfc0 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1410,8 +1410,11 @@ iRowAux++;} this.oGrid.deleteRow(lastItem);for(i=0;i<=this.aFields.length-1;i++){this.aElements.pop();} var elem;if(oObj.aFunctions.length>0){for(i=0;i<=oObj.aFunctions.length-1;i++){elem=document.getElementById("form["+oObj.sGridName+"][1]["+oObj.aFunctions[i].sFieldName+"]");if(elem){switch(oObj.aFunctions[i].sFunction){case"sum":oObj.sum(false,elem);break;case"avg":oObj.avg(false,elem);break;}}}} if(oObj.ondeleterow){oObj.ondeleterow(iRow);}};this.clearRowWC=function(oObj,aRow) -{var i=0;var elemNodeName='';var objects='';for(i=1;i0){pmLabel='';for(iAux=0;iAux<=objects[0].attributes.length-1;iAux++){if(objects[0].attributes[iAux].name=="pm:label"){pmLabel=objects[0].attributes[iAux].nodeValue;break;}} +for(j=0;j Date: Wed, 12 Jun 2013 14:19:17 -0400 Subject: [PATCH 2/2] BUG-11751 Borrar el primer registro de una grilla da error IMPROVEMENT - The Requested functionality was added to delete a row in a grid. --- gulliver/js/grid/core/grid.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gulliver/js/grid/core/grid.js b/gulliver/js/grid/core/grid.js index 38db3eec0..165f66a69 100755 --- a/gulliver/js/grid/core/grid.js +++ b/gulliver/js/grid/core/grid.js @@ -942,6 +942,8 @@ var G_Grid = function(oForm, sGridName){ this.clearRowWC = function (oObj, aRow) { var i = 0; + var j = 0; + var iAux = 0; var pmLabel = ''; var elemNodeName = ''; var objects = '';