From dc5a2cde7a744b797af1ed06a94ae228d19b5e10 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 10 Oct 2014 12:20:47 +0000
Subject: [PATCH] SSDM-1038 ELN UI - PAPER - Support Domain-specific searching
SVN: 32582
---
.../html/js/controllers/MainController.js | 23 +++++--------------
.../js/views/DataGrid/DataGridController.js | 4 ++--
.../html/js/views/DataGrid/DataGridModel.js | 3 ++-
.../html/js/views/DataGrid/DataGridView.js | 1 +
4 files changed, 11 insertions(+), 20 deletions(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
index f1552a0aece..16ef2d62469 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/controllers/MainController.js
@@ -521,22 +521,7 @@ function MainController(profile) {
label : 'Position',
property : 'position',
sortable : true
- }, {
- label : "Options",
- property : 'Options',
- sortable : true,
- render : function(data) {
- return $("<button>").text("Button").click(function() {
- alert("WORKS!");
- });
- },
- filter : function(data, filter) {
- return false;
- },
- sort : function(data1, data2, asc) {
- return naturalSort(data1.identifier, data2.identifier);
- }
- } ];
+ }];
var getDataList = function(callback) {
var dataList = [];
@@ -552,7 +537,11 @@ function MainController(profile) {
callback(dataList);
};
- var dataGrid = new DataGridController(localReference, searchDomainLabel + " Search Results", columns, getDataList);
+ var rowClick = function(e) {
+ window.alert("Open Data Set From with :" + e.data.permId);
+ }
+
+ var dataGrid = new DataGridController(localReference, searchDomainLabel + " Search Results", columns, getDataList, rowClick);
localReference.currentView = dataGrid;
dataGrid.init($("#mainContainer"));
history.pushState(null, "", ""); //History Push State
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
index 44d71126d95..03677979184 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridController.js
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-function DataGridController(mainController, title, columns, data) {
+function DataGridController(mainController, title, columns, data, rowClickEventHandler) {
this._mainController = mainController;
- this._dataGridModel = new DataGridModel(title, columns, data);
+ this._dataGridModel = new DataGridModel(title, columns, data, rowClickEventHandler);
this._dataGridView = new DataGridView(this, this._dataGridModel);
this.init = function($container) {
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js
index 67753f04115..1a058a39496 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridModel.js
@@ -14,8 +14,9 @@
* limitations under the License.
*/
-function DataGridModel(title, columns, data) {
+function DataGridModel(title, columns, data, rowClickEventHandler) {
this.title = title;
this.columns = columns;
this.data = data;
+ this.rowClickEventHandler = rowClickEventHandler;
}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js
index 17db9a4efa3..c48a39e5732 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataGrid/DataGridView.js
@@ -20,6 +20,7 @@ function DataGridView(dataGridController, dataGridModel) {
this.repaint = function($container) {
$container.empty();
var grid = new Grid(this._dataGridModel.columns, this._dataGridModel.data);
+ grid.addRowClickListener(this._dataGridModel.rowClickEventHandler);
$container.append($("<h1>").append(this._dataGridModel.title));
$container.append(grid.render());
}
--
GitLab