Merge pull request #9 from CBIIT/develop

Change the text of the first column to "GDC Term" if no ICD-O code ma…
CBIIT · Dec 12, 2017 · ec70423 · ec70423
2 parents dfc6f02 + 6b2d81e
commit ec70423
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 6 deletions.
diff --git a/client/dist/bundle.js b/client/dist/bundle.js
@@ -1700,6 +1700,7 @@ const func = {
             });
         }
         items.forEach(function(it){
+            if(it.s == undefined) return;
             let cache = {};
             let tmp_s = [];
             it.s.forEach(function(s){
@@ -2130,8 +2131,12 @@ let tmpl = {
           +'<div class="clearfix"></div>'
           +'<div id="gdc-syn-data-list" class="table-container">'
             +'<div class="table-thead row">'
-              +'{{if icdo}}<div class="table-th col-xs-2">ICD-O-3 Code</div>{{/if}}'
+              +'{{if icdo}}'
+              +'<div class="table-th col-xs-2">ICD-O-3 Code</div>'
               +'<div class="table-th col-xs-3">ICD-O-3 Term</div>'
+              +'{{else}}'
+              +'<div class="table-th col-xs-5">GDC Term</div>'
+              +'{{/if}}'
               +'<div class="table-th col-xs-2">NCIt Code</div>'
               +'<div class="table-th col-xs-5">NCIt Terms</div>'
             +'</div>'
@@ -2140,8 +2145,12 @@ let tmpl = {
                 +'{{for items}}'
                   +'{{if e == true || ~root.targets == null}}'
                     +'<div class="table-row row">'
-                      +'{{if ~root.icdo}}<div class="table-td col-xs-2">{{:i_c.c}}</div>{{/if}}'
+                      +'{{if ~root.icdo}}'
+                      +'<div class="table-td col-xs-2">{{:i_c.c}}</div>'
                       +'<div class="table-td col-xs-3">{{:n}}</div>'
+                      +'{{else}}'
+                      +'<div class="table-td col-xs-5">{{:n}}</div>'
+                      +'{{/if}}'
                       +'<div class="table-td col-xs-2">'
                       +'{{if n_c && n_c !== ""}}'
                         +'{{* if((/^C[1-9]/g).test(data.n_c)) { }}<a class="table-td-link" href="javascript:ncitDetails(\'{{:n_c}}\');">{{:n_c}}</a> (NCIt)'
@@ -2155,8 +2164,12 @@ let tmpl = {
                     +'</div>'
                   +'{{else}}'
                     +'<div class="table-row row" style="display: none;">'
-                      +'{{if ~root.icdo}}<div class="table-td col-xs-2">{{:i_c.c}}</div>{{/if}}'
+                      +'{{if ~root.icdo}}'
+                      +'<div class="table-td col-xs-2">{{:i_c.c}}</div>'
                       +'<div class="table-td col-xs-3">{{:n}}</div>'
+                      +'{{else}}'
+                      +'<div class="table-td col-xs-5">{{:n}}</div>'
+                      +'{{/if}}'
                       +'<div class="table-td col-xs-2">'
                       +'{{if n_c && n_c !== ""}}'
                         +'{{* if((/^C[1-9]/g).test(data.n_c)) { }}<a class="table-td-link" href="javascript:ncitDetails(\'{{:n_c}}\');">{{:n_c}}</a> (NCIt)'

diff --git a/client/src/dialog/index.js b/client/src/dialog/index.js
@@ -90,6 +90,7 @@ const func = {
             });
         }
         items.forEach(function(it){
+            if(it.s == undefined) return;
             let cache = {};
             let tmp_s = [];
             it.s.forEach(function(s){

diff --git a/client/src/dialog/view.js b/client/src/dialog/view.js
@@ -75,8 +75,12 @@ let tmpl = {
           +'<div class="clearfix"></div>'
           +'<div id="gdc-syn-data-list" class="table-container">'
             +'<div class="table-thead row">'
-              +'{{if icdo}}<div class="table-th col-xs-2">ICD-O-3 Code</div>{{/if}}'
+              +'{{if icdo}}'
+              +'<div class="table-th col-xs-2">ICD-O-3 Code</div>'
               +'<div class="table-th col-xs-3">ICD-O-3 Term</div>'
+              +'{{else}}'
+              +'<div class="table-th col-xs-5">GDC Term</div>'
+              +'{{/if}}'
               +'<div class="table-th col-xs-2">NCIt Code</div>'
               +'<div class="table-th col-xs-5">NCIt Terms</div>'
             +'</div>'
@@ -85,8 +89,12 @@ let tmpl = {
                 +'{{for items}}'
                   +'{{if e == true || ~root.targets == null}}'
                     +'<div class="table-row row">'
-                      +'{{if ~root.icdo}}<div class="table-td col-xs-2">{{:i_c.c}}</div>{{/if}}'
+                      +'{{if ~root.icdo}}'
+                      +'<div class="table-td col-xs-2">{{:i_c.c}}</div>'
                       +'<div class="table-td col-xs-3">{{:n}}</div>'
+                      +'{{else}}'
+                      +'<div class="table-td col-xs-5">{{:n}}</div>'
+                      +'{{/if}}'
                       +'<div class="table-td col-xs-2">'
                       +'{{if n_c && n_c !== ""}}'
                         +'{{* if((/^C[1-9]/g).test(data.n_c)) { }}<a class="table-td-link" href="javascript:ncitDetails(\'{{:n_c}}\');">{{:n_c}}</a> (NCIt)'
@@ -100,8 +108,12 @@ let tmpl = {
                     +'</div>'
                   +'{{else}}'
                     +'<div class="table-row row" style="display: none;">'
-                      +'{{if ~root.icdo}}<div class="table-td col-xs-2">{{:i_c.c}}</div>{{/if}}'
+                      +'{{if ~root.icdo}}'
+                      +'<div class="table-td col-xs-2">{{:i_c.c}}</div>'
                       +'<div class="table-td col-xs-3">{{:n}}</div>'
+                      +'{{else}}'
+                      +'<div class="table-td col-xs-5">{{:n}}</div>'
+                      +'{{/if}}'
                       +'<div class="table-td col-xs-2">'
                       +'{{if n_c && n_c !== ""}}'
                         +'{{* if((/^C[1-9]/g).test(data.n_c)) { }}<a class="table-td-link" href="javascript:ncitDetails(\'{{:n_c}}\');">{{:n_c}}</a> (NCIt)'