From ea9f4910c287febef7686b01abaa2230a38c45c7 Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Wed, 9 Mar 2016 13:07:54 +0000
Subject: [PATCH] SSDM-3287 : Tree navigation refactoring
SVN: 35849
---
.../DataSetForm/widgets/DatasetViewerModel.js | 8 ++++
.../DataSetForm/widgets/DatasetViewerView.js | 48 +++++++++++++++++++
2 files changed, 56 insertions(+)
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
index 7e0627c97da..3c5cf5d64df 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerModel.js
@@ -14,6 +14,11 @@
* limitations under the License.
*/
+var DataSetViewerMode = {
+ LIST : 0,
+ TREE : 1
+}
+
function DataSetViewerModel(containerId, profile, sample, serverFacade, datastoreDownloadURL, datasets, enableUpload, enableOpenDataset) {
this.containerId = containerId;
this.containerIdTitle = containerId + "-title";
@@ -30,4 +35,7 @@ function DataSetViewerModel(containerId, profile, sample, serverFacade, datastor
this.sampleDataSets = {};
this.datastoreDownloadURL = datastoreDownloadURL
this.lastUsedPath = [];
+
+ this.dataSetViewerMode = DataSetViewerMode.LIST;
+
}
\ No newline at end of file
diff --git a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerView.js b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerView.js
index 15d415c718d..01547442c4b 100644
--- a/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerView.js
+++ b/plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataSetForm/widgets/DatasetViewerView.js
@@ -17,6 +17,8 @@
function DataSetViewerView(dataSetViewerController, dataSetViewerModel) {
this._dataSetViewerController = dataSetViewerController;
this._dataSetViewerModel = dataSetViewerModel;
+ this.$listIcon = null;
+ this.$treeIcon = null;
this.updateDirectoryView = function(code, path, isBack) {
var _this = this;
@@ -122,6 +124,52 @@ function DataSetViewerView(dataSetViewerController, dataSetViewerModel) {
// Path
$container.append($("<legend>").append("Path: " + parentPath));
+ var $filesContainer = $("<div>");
+
+ // Toolbar
+ var _this = this;
+ var switchViewMode = function() {
+ switch(_this._dataSetViewerModel.dataSetViewerMode) {
+ case DataSetViewerMode.LIST:
+ _this.$listIcon.attr("disabled","");
+ _this.$treeIcon.removeAttr("disabled");
+ _this.repaintFilesAsList(datasetCode, datasetFiles, $filesContainer);
+ break;
+ case DataSetViewerMode.TREE:
+ _this.$treeIcon.attr("disabled","");
+ _this.$listIcon.removeAttr("disabled");
+ _this.repaintFilesAsTree(datasetCode, datasetFiles, $filesContainer);
+ break;
+ }
+ }
+
+ var toolbarModel = [];
+ this.$listIcon = FormUtil.getButtonWithIcon('glyphicon-list', function() {
+ _this._dataSetViewerModel.dataSetViewerMode = DataSetViewerMode.LIST;
+ switchViewMode();
+ });
+
+ toolbarModel.push({ component : this.$listIcon, tooltip: "Show items in a list" });
+ this.$treeIcon = FormUtil.getButtonWithIcon('glyphicon-align-left', function() {
+ _this._dataSetViewerModel.dataSetViewerMode = DataSetViewerMode.TREE;
+ switchViewMode();
+ });
+ toolbarModel.push({ component : this.$treeIcon, tooltip: "Show items in a tree" });
+
+ //Build view and trigger refresh
+ $container.append(FormUtil.getToolbar(toolbarModel));
+ $container.append($filesContainer);
+
+ switchViewMode();
+ }
+
+ this.repaintFilesAsTree = function(datasetCode, datasetFiles, $container) {
+
+ }
+
+ this.repaintFilesAsList = function(datasetCode, datasetFiles, $container) {
+ $container.empty();
+ var _this = this;
//
// Simple Files Table
--
GitLab