From 74df5c13cf4e49a3e89067732269110c65cf34c6 Mon Sep 17 00:00:00 2001
From: Manuel Holtgrewe <manuel.holtgrewe@bihealth.de>
Date: Tue, 30 Mar 2021 20:19:32 +0200
Subject: [PATCH] Bugfix when pulling phenotypes from more than one individual.

---
 variants/sync_upstream.py                     |  3 +-
 .../templates/variants/case_update_terms.html | 30 ++++++++-----------
 2 files changed, 14 insertions(+), 19 deletions(-)

diff --git a/variants/sync_upstream.py b/variants/sync_upstream.py
index a87d402db..c9e38ef9f 100644
--- a/variants/sync_upstream.py
+++ b/variants/sync_upstream.py
@@ -148,7 +148,7 @@ def _isa_helper_get_term_field(fields, key):
                 lst.append(value.name)
         elif ontology_name:
             lst.append(value.name)
-        else:
+        elif value.name or value.accession or value.ontology_name:
             lst.append(str(value))
     return lst
 
@@ -208,7 +208,6 @@ def fetch_remote_pedigree(source, project, add_log_entry=_nolog):
                 )
                 add_log_entry("new member: %s" % member)
                 remote_pedigree[material.name] = member
-
     return remote_pedigree
 
 
diff --git a/variants/templates/variants/case_update_terms.html b/variants/templates/variants/case_update_terms.html
index eacc1f13b..49979b933 100644
--- a/variants/templates/variants/case_update_terms.html
+++ b/variants/templates/variants/case_update_terms.html
@@ -100,37 +100,33 @@ <h3>Update Terms for Case {{ object.name }}</h3>
               $("#load-upstream-indicator").toggleClass("fa-cloud-download fa-spinner fa-spin");
               btn.data("state", "loading");
               // Perform AJAX call.
-              let ajaxCall = $.ajax({
+              $.ajax({
                 type: "GET",
                 dataType: "json",
                 url: "{% url "variants:case-fetch-upstream-terms" project=project.sodar_uuid case=object.sodar_uuid %}",
                 success: function (result) {
-                  console.log("SUCCESS")
-                  console.log(result);
                   let lines = [];
-                  $.each(result, function (index, value) {
-                    console.log("index " + index);
+                  const sampleIds = Object.keys(result)
+                  for (let index = 0; index < sampleIds.length; index++) {
+                    const value = result[sampleIds[index]]
                     if (lines.length > 0) {
                       lines.push("")
-                    } else {
-                      lines.push("### " + index + " ###");
-                      lines.push("");
-                      let keys = ["hpo_terms", "omim_diseases", "orphanet_diseases"];
-                      for (let i = 0; i < keys.length; ++i) {
-                        for (let j = 0; j < value[keys[i]].length; ++j) {
-                          let term = value[keys[i]][j];
-                          lines.push(term.id + " - " + (term.description || "UNKNOWN TERM"));
-                        }
+                    }
+                    lines.push("### " + value.name + " ###");
+                    lines.push("");
+                    const keys = ["hpo_terms", "omim_diseases", "orphanet_diseases"];
+                    for (let i = 0; i < keys.length; ++i) {
+                      for (let j = 0; j < value[keys[i]].length; ++j) {
+                        let term = value[keys[i]][j];
+                        lines.push(term.id + " - " + (term.description || "UNKNOWN TERM"));
                       }
                     }
-                  });
+                  }
                   $("#load-upstream-indicator").toggleClass("fa-cloud-download fa-spinner fa-spin");
                   btn.data("state", "initial");
                   $("#upstream-terms").val(lines.join("\n"))
                 },
                 error: function (jqXHR, textStatus, errorThrown) {
-                  console.log("ERROR")
-                  console.log(result);
                   $("#upstream-terms").val("ERROR\n\nA problem occured while trying to query SODAR: " + textStatus + "\n\nERROR")
                   $("#load-upstream-indicator").toggleClass("fa-cloud-download fa-spinner fa-spin");
                   btn.data("state", "initial");