Merge pull request chop-dbhi#313 from hassanNS/issue-311

Updated Phenotype modal

varify/static/templates/modals/phenotypes.html

@@ -19,13 +19,19 @@ <h5><i class='icon-spinner icon-spin'></i> Loading Phenotypes...</h5>
 
             <div class='row-fluid horizontal-list-display' data-target=personal-info>
                 <div class=span8><h6>Sex:</h6><%= data.sex %></div>
-                <div class=span8><h6>Ethnicity:</h6><%= data.ethnicity %></div>
-                <div class=span8><h6>Chief Complaint:</h6><%= data.chief_complaint %></div>
+                <div class=span8><h6>Ethnicity (Paternal):</h6><%= data.ethnicity_paternal %></div>
+                <div class=span8><h6>Ethnicity (Maternal):</h6><%= data.ethnicity_maternal %></div>
+                <div class=span8><h6>Parental Consanguinity:</h6><%= data.consanguinity %></div>
             </div>
 
+            <div class='row-fluid horizontal-list-display' data-target=personal-info>
+                <div class=span10><h6>Race (Paternal):</h6><%= data.race_paternal %></div>
+                <div class=span10><h6>Race (Maternal):</h6><%= data.race_maternal %></div>
+                <div class=span10><h6>Chief Complaint/Reason for Visit:</h6><%= data.chief_complaint %></div>
+            </div>
             <div class='row-fluid horizontal-list-display' data-target=age>
-                <div class=span5><h6>Initial Evaluation:</h6><%= data.age_at_initial_evaluation + ' ' + data.age_at_initial_evaluation_units %></div>
-                <div class=span5><h6>Last Evaluation:</h6><%= data.age_at_last_evaluation + ' ' + data.age_at_last_evaluation_units %></div>
+                <div class=span5><h6>Initial Evaluation:</h6><%= data.age_at_initial_dx + ' ' + data.age_at_initial_dx_units %></div>
+                <div class=span5><h6>Last Evaluation:</h6><%= data.age_at_enroll + ' ' + data.age_at_enroll_units %></div>
                 <div class=span5><h6>Genetic Testing:</h6><%= data.genetic_testing %></div>
             </div>