From 1d17d84bca90b0b957f5f7f16442bcab275bfc71 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Thu, 21 Aug 2014 11:08:32 +0000
Subject: [PATCH] SSDM-344 : New Free Form Table structure (ongoing work).
SVN: 32307
---
.../js/views/SampleForm/widgets/FreeFormTableController.js | 6 ++++++
.../html/js/views/SampleForm/widgets/FreeFormTableView.js | 4 ++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableController.js
index 7bfbfb1e0a0..c73db525611 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableController.js
@@ -88,6 +88,12 @@ function FreeFormTableController(sample, isEnabled) {
}
this.addColumn = function(tableModel, $wrappedTable, colIdx) {
+ //Detailed Model
+ for(var i = 0; i < tableModel.modelDetailed.length; i++) {
+ tableModel.modelDetailed[i].splice(colIdx, 0, '');
+ }
+ //Mini Model
+ tableModel.modelMini.columns.splice(colIdx, 0, '');
this._updateChangesOnDOMandView(tableModel, $wrappedTable);
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableView.js
index e2a4d40e27f..e786aaecdfe 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/widgets/FreeFormTableView.js
@@ -213,7 +213,7 @@ function FreeFormTableView(freeFormTableController, freeFormTableModel) {
var focusEventTACL = this._getFocusEventAction(
tableData,
function(selectedField) { return selectedField.columnIdx !== null; },
- function(selectedField) { _this._freeFormTableController.addColumn(tableData, $wrappedTable, selectedField.columnIdx - 1); }
+ function(selectedField) { _this._freeFormTableController.addColumn(tableData, $wrappedTable, selectedField.columnIdx); }
);
$toolBarBtnTACL.click(focusEventTACL);
@@ -243,7 +243,7 @@ function FreeFormTableView(freeFormTableController, freeFormTableModel) {
var focusEventTARA = this._getFocusEventAction(
tableData,
function(selectedField) { return selectedField.rowIdx !== null; },
- function(selectedField) { _this._freeFormTableController.addRow(tableData, $wrappedTable, selectedField.rowIdx - 1); }
+ function(selectedField) { _this._freeFormTableController.addRow(tableData, $wrappedTable, selectedField.rowIdx); }
);
$toolBarBtnTARA.click(focusEventTARA);
--
GitLab