SSDM-2658 : Scaling dropdown refactoring

SVN: 35197

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/css/style.css

@@ -458,8 +458,8 @@ table.downloads {
 	cursor : pointer;
 }
 
-#sample-form-plate-view > div > .featureDropdown,
-#sample-form-plate-view > div > span > .featureDropdown {
+#sample-form-plate-view > div > .featureToolbarOption,
+#sample-form-plate-view > div > span > .featureToolbarOption {
 	max-width: 300px;
 	display: inline;
 }

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js

@@ -567,6 +567,10 @@ var FormUtil = new function() {
 		return $component;
 	}
 	
+	this.getTextInputField = function(id, alt, isRequired) {
+		return this._getInputField('text', id, alt, null, isRequired);
+	}
+	
 	this._getInputField = function(type, id, alt, step, isRequired) {
 		var $component = $('<input>', {'type' : type, 'id' : id, 'alt' : alt, 'placeholder' : alt, 'class' : 'form-control'});
 		if (isRequired) {

plasmid/source/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SampleForm/widgets/PlateView.js

@@ -43,26 +43,33 @@ function PlateView(plateController, plateModel) {
 					"Scaling options",
 					false
 					);
-			this._$scaleDropdown.addClass("featureDropdown");
+			this._$scaleDropdown.addClass("featureToolbarOption");
 			
 			this._$scaleDropdown.change(function(event) {
 			
 			});
 			
 			//Max and Min
+			this._$scaleMax = FormUtil.getTextInputField("scaleMax-" + this._plateModel.sample.permId, "Max Scale Value", false);
+			this._$scaleMax.addClass("featureToolbarOption");
 			
-			
+			this._$scaleMin = FormUtil.getTextInputField("scaleMin-" + this._plateModel.sample.permId, "Min Scale Value", false);
+			this._$scaleMin.addClass("featureToolbarOption");
 			
 			//Build Set
-			this._$scaleDropdownContainer.append(this._$scaleDropdown);
+			this._$scaleDropdownContainer.append(this._$scaleDropdown).append(this._$scaleMax).append(this._$scaleMin);
 		}
 		
 		this._$scaleDropdown.empty();
 		if(isEmpty) {
 			this._$scaleDropdown.append($("<option>").attr('value', '').text("Choose a Feature first"));
+			this._$scaleMax.hide();
+			this._$scaleMin.hide();
 		} else {
 			this._$scaleDropdown.append($("<option>").attr('value', 'Max/Min').text('Max/Min'));
 			this._$scaleDropdown.append($("<option>").attr('value', '10/90').text('10/90'));
+			this._$scaleMax.show();
+			this._$scaleMin.show();
 		}
 	}
 	
@@ -85,7 +92,7 @@ function PlateView(plateController, plateModel) {
 					"Choose a Feature Vector Dataset first",
 					false
 					);
-			this._$featureVectorDatasetFeaturesDropdown.addClass("featureDropdown");
+			this._$featureVectorDatasetFeaturesDropdown.addClass("featureToolbarOption");
 			this._$featureVectorDatasetFeaturesDropdown.change(function(event) {
 				var selectedFeature = $(this).val();
 				if(selectedFeature) {
@@ -151,7 +158,7 @@ function PlateView(plateController, plateModel) {
 												"Choose a Feature Vector Dataset please",
 												false
 												);
-			this._$featureVectorDatasetsDropdown.addClass("featureDropdown");
+			this._$featureVectorDatasetsDropdown.addClass("featureToolbarOption");
 			
 			this._$featureVectorDatasetsDropdown.change(function(event) {
 				var featureVectorDatasetCode = $(this).val();