From c2f77660d08696e4ec8aa257146ea590d7cef49c Mon Sep 17 00:00:00 2001
From: juanf <juanf>
Date: Fri, 14 Nov 2014 09:41:19 +0000
Subject: [PATCH] SSDM-983 : PAPER - Annotations on Batch Import
SVN: 32822
---
.../js/views/SampleTable/SampleTableController.js | 15 +++++++++++++++
.../html/js/views/SampleTable/SampleTableView.js | 11 ++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
index a7445a7459e..37a69125c6e 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableController.js
@@ -47,6 +47,21 @@ function SampleTableController(parentController, title, experimentIdentifier) {
}
}
callback();
+
+ //Show samples when only one type available by default
+ var numSampleTypes = 0;
+ var defaultSampleType = null;
+ for(sampleTypeCode in _this._sampleTableModel.sampleTypes) {
+ if(numSampleTypes === 0) {
+ defaultSampleType = sampleTypeCode;
+ }
+ numSampleTypes++;
+ }
+
+ if(numSampleTypes === 1) {
+ _this._reloadTableWithSampleType(defaultSampleType);
+ _this._sampleTableView.getSampleTypeSelector().val(defaultSampleType);
+ }
});
}
diff --git a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableView.js b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableView.js
index 893e56e3fe2..2d31b74896e 100644
--- a/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableView.js
+++ b/plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleTable/SampleTableView.js
@@ -17,6 +17,7 @@ function SampleTableView(sampleTableController, sampleTableModel) {
this._sampleTableController = sampleTableController;
this._sampleTableModel = sampleTableModel;
this._tableContainer = $("<div>");
+ this.sampleTypeSelector = null;
this.repaint = function($container) {
$container.empty();
@@ -43,6 +44,13 @@ function SampleTableView(sampleTableController, sampleTableModel) {
return this._tableContainer;
}
+ //
+ // Components
+ //
+ this.getSampleTypeSelector = function() {
+ return this.sampleTypeSelector;
+ }
+
//
// Menus
//
@@ -82,11 +90,12 @@ function SampleTableView(sampleTableController, sampleTableModel) {
for(sampleTypeCode in this._sampleTableModel.sampleTypes) {
$sampleTypesSelector.append($('<option>', { 'value' : sampleTypeCode }).text(sampleTypeCode));
}
+
$sampleTypesSelector.change(function(event) {
var sampleTypeToShow = $(this).val();
_this._sampleTableController._reloadTableWithSampleType(sampleTypeToShow);
});
-
+ this.sampleTypeSelector = $sampleTypesSelector;
return $("<span>").append($sampleTypesSelector);
}
--
GitLab