Merge pull request #10 from CBIIT/develop

Update the order of ICD-O-3 codes and Fix few bugs
CBIIT · Dec 15, 2017 · 7a25d02 · 7a25d02
2 parents ec70423 + 83dbde5
commit 7a25d02
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 106 deletions.
diff --git a/client/dist/bundle.js b/client/dist/bundle.js
@@ -1376,10 +1376,7 @@ const func = {
 
 				}
 
-				if(v.n !== undefined){
-					let tmp = v.n.replace(/<b>/g,"").replace(/<\/b>/g, "");
-					row.tgts_enum_n += tmp + "#";
-				}
+
 
 				let lc = em.n.toLowerCase();
 				if(lc in matched_pv){
@@ -1404,6 +1401,8 @@ const func = {
 				}
 
 				if(v.n !== undefined){
+					let tmp = v.n.replace(/<b>/g,"").replace(/<\/b>/g, "");
+					row.tgts_enum_n += tmp + "#";
 					row.vs.push(v);
 				}
 
@@ -1722,8 +1721,10 @@ const func = {
         //display result in a table
         $(document.body).append(html);
 
-        if(tgts !== null && tgts !== undefined && tgts !== ""){
-            $('#show_all_gdc_syn').bind('click', function(){
+        //if(tgts !== null && tgts !== undefined && tgts !== ""){
+        let element = $('#show_all_gdc_syn');
+        if(element !== undefined){
+            element.bind('click', function(){
                 let v = $(this).prop("checked");
                 if(v){
                     $('#gdc-syn-data-list div.table-row[style="display: none;"]').each(function(){

diff --git a/client/src/dialog/index.js b/client/src/dialog/index.js
@@ -112,8 +112,10 @@ const func = {
         //display result in a table
         $(document.body).append(html);
 
-        if(tgts !== null && tgts !== undefined && tgts !== ""){
-            $('#show_all_gdc_syn').bind('click', function(){
+        //if(tgts !== null && tgts !== undefined && tgts !== ""){
+        let element = $('#show_all_gdc_syn');
+        if(element !== undefined){
+            element.bind('click', function(){
                 let v = $(this).prop("checked");
                 if(v){
                     $('#gdc-syn-data-list div.table-row[style="display: none;"]').each(function(){

diff --git a/client/src/values-table/index.js b/client/src/values-table/index.js
@@ -220,10 +220,7 @@ const func = {
 
 				}
 
-				if(v.n !== undefined){
-					let tmp = v.n.replace(/<b>/g,"").replace(/<\/b>/g, "");
-					row.tgts_enum_n += tmp + "#";
-				}
+
 
 				let lc = em.n.toLowerCase();
 				if(lc in matched_pv){
@@ -248,6 +245,8 @@ const func = {
 				}
 
 				if(v.n !== undefined){
+					let tmp = v.n.replace(/<b>/g,"").replace(/<\/b>/g, "");
+					row.tgts_enum_n += tmp + "#";
 					row.vs.push(v);
 				}