Changed prior_dx to other_dx

isb-cgc · Aug 10, 2016 · 0da738c · 0da738c
1 parent e1f4236
commit 0da738c
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 12 deletions.
diff --git a/GenespotRE/templatetags/custom_tags.py b/GenespotRE/templatetags/custom_tags.py
@@ -110,7 +110,7 @@
     '0': 'Wild Type',
     '1': 'Mutant',
     'age_at_initial_pathologic_diagnosis': 'Age at Diagnosis',
-    'prior_dx': 'Prior Diagnosis',
+    'other_dx': 'Prior Diagnosis',
     'person_neoplasm_cancer_status': 'Tumor Status',
     'neoplasm_histologic_grade': 'Histological Grade',
     'icd_10': 'ICD-10',
@@ -205,7 +205,7 @@ def get_readable_name(csv_name, attr=None):
         return ATTR_SPECIFIC_TRANSLATION[attr][csv_name]
     elif attr == 'Project' or attr == 'Study':
         return csv_name.upper()
-    elif TRANSLATION_DICTIONARY.get(csv_name) and attr is not 'prior_dx':
+    elif TRANSLATION_DICTIONARY.get(csv_name) and attr is not 'other_dx':
         return TRANSLATION_DICTIONARY.get(csv_name)
     else:
         csv_name = csv_name.replace('_', ' ')

diff --git a/scripts/bigquery/bq_load_filtered_list.py b/scripts/bigquery/bq_load_filtered_list.py
@@ -77,7 +77,7 @@
         'type': 'STRING'
     },
     {
-        'name': 'prior_dx',
+        'name': 'other_dx',
         'type': 'STRING'
     },
     {

diff --git a/scripts/sproc_setup.py b/scripts/sproc_setup.py
@@ -65,7 +65,7 @@ def main():
                 SELECT DISTINCT Project, COUNT(1) as count FROM metadata_samples GROUP BY Project;
                 SELECT DISTINCT pathologic_stage, COUNT(1) as count FROM metadata_samples GROUP BY pathologic_stage;
                 SELECT DISTINCT has_SNP6, COUNT(1) as count FROM metadata_samples GROUP BY has_SNP6;
-                SELECT DISTINCT prior_dx, COUNT(1) as count FROM metadata_samples GROUP BY prior_dx;
+                SELECT DISTINCT other_dx, COUNT(1) as count FROM metadata_samples GROUP BY other_dx;
                 SELECT DISTINCT has_HiSeq_miRnaSeq, COUNT(1) as count FROM metadata_samples GROUP BY has_HiSeq_miRnaSeq;
                 SELECT DISTINCT has_UNC_HiSeq_RNASeq, COUNT(1) as count FROM metadata_samples GROUP BY has_UNC_HiSeq_RNASeq;
                 SELECT DISTINCT Study, COUNT(1) as count FROM metadata_samples GROUP BY Study;

diff --git a/static/js/data_upload.js b/static/js/data_upload.js
@@ -154,7 +154,7 @@ require([
                 "colorectal_cancer": {"displayName": "Colorectal Cancer?","key": "colorectal_cancer","type": "string"},
                 "BMI": {"displayName": "BMI","key": "BMI","type": "float"},
                 "max_percent_lymphocyte_infiltration": {"displayName": "Maximum Percent Lymphocyte Infiltration","key": "max_percent_lymphocyte_infiltration","type": "float"},
-                "prior_dx": {"displayName": "Prior Diagnosis?","key": "prior_dx","type": "string"},
+                "other_dx": {"displayName": "Prior Diagnosis?","key": "other_dx","type": "string"},
                 "histological_type": {"displayName": "Histological Type","key": "histological_type","type": "string"},
                 "Study": {"displayName": "Study","key": "Study","type": "string"},
                 "min_percent_tumor_nuclei": {"displayName": "Minimum Percent Tumor Nuclei","key": "min_percent_tumor_nuclei","type": "float"},

diff --git a/variables/views.py b/variables/views.py
@@ -252,7 +252,7 @@ def initialize_variable_selection_page(request,
         {'name' : "age_at_initial_pathologic_diagnosis",   'code' : 'CLIN:age_at_initial_pathologic_diagnosis',         'type' : 'N'},
         {'name' : "tumor_tissue_site",                     'code' : 'CLIN:tumor_tissue_site',                           'type' : 'C'},
         {'name' : "histological_type",                     'code' : 'CLIN:histological_type',                           'type' : 'C'},
-        {'name' : "prior_diagnosis",                       'code' : 'CLIN:prior_dx',                                    'type' : 'C'},
+        {'name' : "other_diagnosis",                       'code' : 'CLIN:other_dx',                                    'type' : 'C'},
         {'name' : "tumor_status",                          'code' : 'CLIN:person_neoplasm_cancer_status',               'type' : 'C'},
         {'name' : "new_tumor_event_after_initial_treatment", 'code' : 'CLIN:new_tumor_event_after_initial_treatment',   'type' : 'C'},
         {'name' : "histological_grade",                    'code' : 'CLIN:neoplasm_histologic_grade',                   'type' : 'C'},

diff --git a/visualizations/data_request.py b/visualizations/data_request.py
@@ -84,7 +84,7 @@
     'gender':'Gender',
     'history_of_neoadjuvant_treatment':'History of Neoadjuvant Treatment',
     'icd_o_3_histology':'ICD-O-3 Code',
-    'prior_dx':'Prior Diagnosis',
+    'other_dx':'Prior Diagnosis',
     'vital_status':'Vital Status',
     'country':'Country',
     'disease_code':'Disease Code',
@@ -132,7 +132,7 @@
     'gender',
     'history_of_neoadjuvant_treatment',
     'icd_o_3_histology',
-    'prior_dx',
+    'other_dx',
     'vital_status',
     'country',
     'disease_code',

diff --git a/visualizations/plot_enums.py b/visualizations/plot_enums.py
@@ -72,7 +72,7 @@ def get_fm_friendly_name_map():
             'gender':'Gender',
             'history_of_neoadjuvant_treatment':'History of Neoadjuvant Treatment',
             'icd_o_3_histology':'ICD-O-3 Code',
-            'prior_dx':'Prior Diagnosis',
+            'other_dx':'Prior Diagnosis',
             'vital_status':'Vital Status',
             'country':'Country',
             'disease_code':'Disease Code',
@@ -124,7 +124,7 @@ def get_fm_categorical_attributes() :
             'gender',
             'history_of_neoadjuvant_treatment',
             'icd_o_3_histology',
-            'prior_dx',
+            'other_dx',
             'vital_status',
             'country',
             'disease_code',

diff --git a/visualizations/views.py b/visualizations/views.py
@@ -140,7 +140,7 @@ def union_cohort_samples_patients(cohort_ids):
     'gender':'Gender',
     'history_of_neoadjuvant_treatment':'History of Neoadjuvant Treatment',
     'icd_o_3_histology':'ICD-O-3 Code',
-    'prior_dx':'Prior Diagnosis',
+    'other_dx':'Prior Diagnosis',
     'vital_status':'Vital Status',
     'country':'Country',
     'disease_code':'Disease Code',
@@ -188,7 +188,7 @@ def union_cohort_samples_patients(cohort_ids):
     'gender',
     'history_of_neoadjuvant_treatment',
     'icd_o_3_histology',
-    'prior_dx',
+    'other_dx',
     'vital_status',
     'country',
     'disease_code',