From eb61b25b7a904f59cfec3ea1122709663b6b813b Mon Sep 17 00:00:00 2001
From: hjkhjk54 <hjkhjk54@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 30 Nov 2011 19:50:37 +0000
Subject: [PATCH] updates for add concept javascript

---
 productMods/edit/forms/js/addConcept.js | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/productMods/edit/forms/js/addConcept.js b/productMods/edit/forms/js/addConcept.js
index 59627773..fe3466df 100644
--- a/productMods/edit/forms/js/addConcept.js
+++ b/productMods/edit/forms/js/addConcept.js
@@ -206,13 +206,26 @@ var addConceptForm = {
     	var htmlAdd = "<li class='concepts'>" + 
     	"<div class='row'>" + 
     	"<span class='column conceptLabel'>" +
-    	"<input type='checkbox'  id='CUI' name='CUI' value='" + cuiURI + "' label='" + label + "' conceptType='" + type + "' conceptDefinedBy='" + definedBy + "'/>" + 
-    	label + " (" + type + ")</span>" + 
-    	"<span class='column conceptDefinition'>" + definition + "</span>" + 
+    	addConceptForm.generateIndividualCUIInput(cuiURI, label, definition, type, definedBy) +  
+    	label + addConceptForm.generateIndividualTypeDisplay(type) + "</span>" + 
+    	addConceptForm.generateIndividualDefinitionDisplay(definition) + 
     	"</div>" +  
     	"</li>";	
     	return htmlAdd;
-    }, validateConceptSelection:function(checkedElements) {
+    }, 
+    generateIndividualCUIInput:function(cuiURI, label, type, definedBy) {
+    	return 	"<input type='checkbox'  id='CUI' name='CUI' value='" + cuiURI + "' label='" + label + "' conceptType='" + type + "' conceptDefinedBy='" + definedBy + "'/>";
+    },
+    generateIndividualTypeDisplay:function(type) {
+    	if(type != null && type.length > 0) {
+    		return " (" + type + ")";
+    	}
+    	return "";
+    },
+    generateIndividualDefinitionDisplay:function(definition) {
+    	return "<span class='column conceptDefinition'>" + definition + "</span>";
+    },
+    validateConceptSelection:function(checkedElements) {
     	var numberElements = checkedElements.length;
     	if(numberElements < 1) {
     		addConceptForm.errors.html("<p class='validationError'>Please select at least one term from search results to add or click cancel.</p>");