Including Category Description onto the chartSearchmanager#preference…

…s section
openmrs · Aug 3, 2015 · dc25fc0 · dc25fc0
1 parent 3b5ab4f
commit dc25fc0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/api/src/main/java/org/openmrs/module/chartsearch/GeneratingJson.java b/api/src/main/java/org/openmrs/module/chartsearch/GeneratingJson.java
@@ -724,6 +724,7 @@ public static JSONArray generateAllCategoriesJSON() {
 		for (CategoryFilter cat : allCats) {
 			JSONObject json = new JSONObject();
 			String name = cat.getCategoryName();
+			String description = cat.getCategoryDescription();
 			String displayName = "";
 			String uuid = cat.getCategoryUuid();
 
@@ -740,6 +741,7 @@ public static JSONArray generateAllCategoriesJSON() {
 			json.put("name", name);
 			json.put("uuid", uuid);
 			json.put("displayName", displayName);
+			json.put("description", description);
 
 			jsonArray.add(json);
 		}

diff --git a/omod/src/main/webapp/resources/scripts/views_factory.js b/omod/src/main/webapp/resources/scripts/views_factory.js
@@ -2041,13 +2041,14 @@ function applyPreferencesToUIDisplays() {
 }
 
 function displayCategoriesForPreferences(cats) {
-	var displayHtml = "<tr><th>Category Name</th><th>Category Display Name</th></tr>";
+	var displayHtml = "<tr><th>Category Name</th><th>Category Description</th><th>Category Display Name</th></tr>";
 
 	for (i = 0; i < cats.length; i++) {
 		var displayName = cats[i].displayName === undefined ? ""
 				: cats[i].displayName;
 
-		displayHtml += "<tr><td>" + cats[i].name
+		displayHtml += "<tr><td>" + cats[i].name + "</td><td>"
+				+ cats[i].description
 				+ "</td><td><input type='textbox' class='pref-cat-names' id='"
 				+ cats[i].uuid + "' value='" + displayName + "' title='"
 				+ cats[i].name + "' /></td></tr>";