fixed bug where button more conditions button showing for 3 diseases …

…and fixed issue where other-undefined disease was being showed for self
CBIIT · Sep 8, 2017 · 79dcf5c · 79dcf5c
1 parent d61b1c2
commit 79dcf5c
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/js/fhh.js b/js/fhh.js
@@ -1877,11 +1877,16 @@ function createConditionsList(family_member, listType) {
 					};
 				}
 				else {
-					html += '<li class="conditionsEntry">' + $.t("diseases:" + value['Disease Code']) + '</li>';			
+					if (value['Disease Code']=='other'|| value['Disease Code']=='other-undefined') {
+						html += '<li class="conditionsEntry">' + value['Detailed Disease Name'] + '</li>';	
+						}		
+					else {
+						html += '<li class="conditionsEntry">' + $.t("diseases:" + value['Disease Code']) + '</li>';			
+					};
 				};
 			});
 			html += '</ul>'
-			if (family_member['Health History'].length>2) {
+			if (family_member['Health History'].length>3) {
 				html+= '<div class="readMore"><button class="readMoreButton" value="0">' + $.t('fhh_js.more') + '</button></div></div>';
 			};
 		};