scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-26 16:53:12 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1230 from Zanz2/tables_value_error_sci2588

Browse source 
Tables value error [SCI-2588]
This commit is contained in:
Zanz2 2018-07-19 10:02:13 +02:00 committed by GitHub
commit 54caa772d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 103 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

139
vendor/assets/javascripts/handsontable.formula.js vendored
View file

@ -1,6 +1,9 @@
(function(Handsontable) { (function(Handsontable) {
'use strict'; 'use strict';
// [MODIFICATION] (sci 2588)
var formulasResults = {};
// _!_MODIFICATION
function HandsontableFormula() { function HandsontableFormula() {
var isFormula = function(value) { var isFormula = function(value) {
@ -13,6 +16,22 @@
return false; return false;
}; };
// [MODIFICATION] (sci 2588)
var beforeRender = function (isForced) {
formulasResults = {};
var data = this.getData();
for (var i = 0; i < data.length; ++i) {
for (var j = 0; j < data[i].length; ++j) {
var value = data[i][j];
if (value && value[0] === '=') {
var cellId = this.plugin.utils.translateCellCoords({row: i, col: j});
this.plugin.matrix.removeItem(cellId);
}
}
}
};
// _!_MODIFICATION
var formulaRenderer = function(instance, TD, row, col, prop, value, cellProperties) { var formulaRenderer = function(instance, TD, row, col, prop, value, cellProperties) {
if (instance.formulasEnabled && isFormula(value)) { if (instance.formulasEnabled && isFormula(value)) {
// translate coordinates into cellId // translate coordinates into cellId
@ -49,50 +68,63 @@
// check if typed formula or cell value should be recalculated // check if typed formula or cell value should be recalculated
if ((value && value[0] === '=') || needUpdate) { if ((value && value[0] === '=') || needUpdate) {
formula = value.substr(1).toUpperCase(); // [MODIFICATION] (sci 2588)
if (formulasResults[cellId] === undefined) {
// _!_MODIFICATION
if (!error || formula !== prevFormula) { formula = value.substr(1).toUpperCase();
var currentItem = item; if (!error || formula !== prevFormula) {
if (!currentItem) { var currentItem = item;
// define item to rulesJS matrix if not exists if (!currentItem) {
item = {
id: cellId,
formula: formula
};
// add item to matrix // define item to rulesJS matrix if not exists
currentItem = instance.plugin.matrix.addItem(item); item = {
id: cellId,
formula: formula
};
// add item to matrix
currentItem = instance.plugin.matrix.addItem(item);
}
// parse formula
var newValue = instance.plugin.parse(formula, {
row: row,
col: col,
id: cellId
});
// check if update needed
needUpdate = (newValue.error === '#NEED_UPDATE');
// update item value and error
instance.plugin.matrix.updateItem(currentItem, {
formula: formula,
value: newValue.result,
error: newValue.error,
needUpdate: needUpdate
});
error = newValue.error;
result = newValue.result;
// update cell value in hot
value = error || result;
} }
// [MODIFICATION] (sci 2588)
} else {
var newValue = formulasResults[cellId];
// parse formula error = newValue.error;
var newValue = instance.plugin.parse(formula, { result = newValue.result;
row: row,
col: col,
id: cellId
});
// check if update needed value = error || result;
needUpdate = (newValue.error === '#NEED_UPDATE');
// update item value and error
instance.plugin.matrix.updateItem(currentItem, {
formula: formula,
value: newValue.result,
error: newValue.error,
needUpdate: needUpdate
});
error = newValue.error;
result = newValue.result;
// update cell value in hot
value = error || result;
}
} }
// _!_MODIFICATION
}
if (error) { if (error) {
// clear cell value // clear cell value
if (!value) { if (!value) {
@ -379,7 +411,34 @@
if (instance.formulasEnabled) { if (instance.formulasEnabled) {
var custom = { var custom = {
cellValue: instance.getDataAtCell //
// [MODIFICATION] (sci 2588)
// Previously: "cellValue: instance.getDataAtCell"
//
cellValue: function(row, col){
var value = instance.getDataAtCell(row, col);
if (value && value[0] === '=') {
var formula = value.substr(1).toUpperCase();
var cellId = instance.plugin.utils.translateCellCoords({row: row, col: col});
var item = instance.plugin.matrix.getItem(cellId);
if (!item) {
item = instance.plugin.matrix.addItem({id: cellId, formula: formula});
} else {
item = instance.plugin.matrix.updateItem({id: cellId, formula: formula});
}
// parse formula
var newValue = instance.plugin.parse(formula, {row: row, col: col, id: cellId});
// cache result
formulasResults[cellId] = newValue;
// update item value and error
instance.plugin.matrix.updateItem(item, {formula: formula, value: newValue.result, error: newValue.error});
value = newValue.error || newValue.result;
}
return value;
}
// _!_MODIFICATION
}; };
instance.plugin = new ruleJS(); instance.plugin = new ruleJS();
@ -391,6 +450,10 @@
Handsontable.TextCell.renderer = formulaRenderer; Handsontable.TextCell.renderer = formulaRenderer;
Handsontable.NumericCell.renderer = formulaRenderer; Handsontable.NumericCell.renderer = formulaRenderer;
// [MODIFICATION] (sci 2588)
// This hook is new
instance.addHook('beforeRender', beforeRender);
// _!_MODIFICATION
instance.addHook('afterChange', afterChange); instance.addHook('afterChange', afterChange);
instance.addHook('beforeAutofillInsidePopulate', beforeAutofillInsidePopulate); instance.addHook('beforeAutofillInsidePopulate', beforeAutofillInsidePopulate);
@ -398,6 +461,10 @@
instance.addHook('afterCreateCol', afterCreateCol); instance.addHook('afterCreateCol', afterCreateCol);
} else { } else {
// [MODIFICATION] (sci 2588)
// This hook is new
instance.removeHook('beforeRender', beforeRender);
// _!_MODIFICATION
instance.removeHook('afterChange', afterChange); instance.removeHook('afterChange', afterChange);
instance.removeHook('beforeAutofillInsidePopulate', beforeAutofillInsidePopulate); instance.removeHook('beforeAutofillInsidePopulate', beforeAutofillInsidePopulate);