SSDM-1612 : Hide titles from empty sections

SVN: 33641

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/DataSetForm/DataSetFormView.js

@@ -261,6 +261,7 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 				$legend.remove();
 			}
 			
+			var propertyGroupPropertiesOnForm = 0;
 			for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
 				var propertyType = propertyTypeGroup.propertyTypes[j];
 				if(propertyType.code === "XMLCOMMENTS") {
@@ -286,6 +287,8 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 						}
 						var $controlGroup = FormUtil.getFieldForLabelWithText(propertyType.label, value, propertyType.code);
 						$fieldset.append($controlGroup);
+					} else {
+						continue;
 					}
 				} else {
 					var $controlGroup = $('<div>', {class : 'form-group'});
@@ -295,7 +298,6 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 					
 					$controlGroup.append($controlLabel);
 					$controlGroup.append($controls);
-					$fieldset.append($controlGroup);
 					
 					var $component = FormUtil.getFieldForPropertyType(propertyType);
 					
@@ -342,9 +344,16 @@ function DataSetFormView(dataSetFormController, dataSetFormModel) {
 					}
 					
 					$controls.append($component);
+					
+					$fieldset.append($controlGroup);
+					propertyGroupPropertiesOnForm++;
 				}
 			}
 			
+			if(propertyGroupPropertiesOnForm === 0) {
+				$legend.remove();
+			}
+			
 			$wrapper.append($fieldset);
 		}
 		

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/ExperimentForm/ExperimentFormView.js

@@ -159,6 +159,7 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 				$legend.remove();
 			}
 			
+			var propertyGroupPropertiesOnForm = 0;
 			for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
 				var propertyType = propertyTypeGroup.propertyTypes[j];
 				if(propertyType.code === "XMLCOMMENTS") {
@@ -182,6 +183,8 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 							value = FormUtil.getVocabularyLabelForTermCode(propertyType, value);
 						}
 						$controlGroup = FormUtil.getFieldForLabelWithText(propertyType.label, value);
+					} else {
+						continue;
 					}
 				} else {
 					var $component = FormUtil.getFieldForPropertyType(propertyType);
@@ -229,6 +232,11 @@ function ExperimentFormView(experimentFormController, experimentFormModel) {
 				}
 				
 				$fieldset.append($controlGroup);
+				propertyGroupPropertiesOnForm++;
+			}
+			
+			if(propertyGroupPropertiesOnForm === 0) {
+				$legend.remove();
 			}
 			
 			$formColumn.append($fieldset);

plasmid/source/core-plugins/newbrowser/1/as/webapps/newbrowser/html/js/views/SampleForm/SampleFormView.js

@@ -313,6 +313,7 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 				continue;
 			}
 			
+			var propertyGroupPropertiesOnForm = 0;
 			for(var j = 0; j < propertyTypeGroup.propertyTypes.length; j++) {
 				var propertyType = propertyTypeGroup.propertyTypes[j];
 				if(propertyType.code === "XMLCOMMENTS") {
@@ -336,6 +337,8 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 							value = FormUtil.getVocabularyLabelForTermCode(propertyType, value);
 						}
 						$controlGroup = FormUtil.getFieldForLabelWithText(propertyType.label, value, propertyType.code);
+					} else {
+						continue;
 					}
 				} else {
 					var $component = FormUtil.getFieldForPropertyType(propertyType);
@@ -383,6 +386,11 @@ function SampleFormView(sampleFormController, sampleFormModel) {
 				}
 				
 				$fieldset.append($controlGroup);
+				propertyGroupPropertiesOnForm++;
+			}
+			
+			if(propertyGroupPropertiesOnForm === 0) {
+				$legend.remove();
 			}
 			
 			$formColumn.append($fieldset);