Merge pull request #164 from biocore/st_dh_issue_162

St dh issue 162
biocore · May 19, 2020 · edb98da · edb98da
2 parents f0ae452 + 6dae77a
commit edb98da
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/microsetta_private_api/example/client_impl.py b/microsetta_private_api/example/client_impl.py
@@ -487,6 +487,14 @@ def get_source(account_id, source_id):
     if next_state != ALL_DONE:
         return redirect(WORKFLOW_URL)
 
+    # Retrieve the source
+    do_return, source_output, _ = ApiRequest.get(
+        '/accounts/%s/sources/%s' %
+        (account_id, source_id)
+    )
+    if do_return:
+        return source_output
+
     # Retrieve all samples from the source
     do_return, samples_output, _ = ApiRequest.get(
         '/accounts/%s/sources/%s/samples' % (account_id, source_id))
@@ -540,9 +548,11 @@ def get_source(account_id, source_id):
             if answer['survey_template_id'] == VIOSCREEN_ID:
                 sample['ffq'] = True
 
+    is_human = source_output['source_type'] == Source.SOURCE_TYPE_HUMAN
     return render_template('source.jinja2',
                            acct_id=account_id,
                            source_id=source_id,
+                           is_human=is_human,
                            samples=samples_output,
                            surveys=per_source,
                            vioscreen_id=VIOSCREEN_ID)

diff --git a/microsetta_private_api/templates/source.jinja2 b/microsetta_private_api/templates/source.jinja2
@@ -81,7 +81,7 @@
         <div class="container">
             {% if samples|length > 0 %}
                 Samples:
-                {% if samples|length > 1 %}
+                {% if samples|length > 1 and is_human %}
                 <p><i>If collecting all samples on the same day, please only complete a single Food Frequency Questionnaire.</i></p>
                 {% endif %}
                 <div class="list-group">
@@ -98,9 +98,9 @@
                           {{sample.sample_site |e}}
                         </div>
                         <div class="col-sm">
-                          {% if sample.ffq %}
+                          {% if is_human and sample.ffq %}
                             Food Frequency Questionnaire<span class="fa fa-check"/>
-                          {% else %}
+                          {% elif is_human %}
                             <a href="/accounts/{{acct_id}}/sources/{{source_id}}/samples/{{sample.sample_id}}/survey_templates/{{vioscreen_id}}">Food Frequency Questionnaire</a><span class="fa fa-unchecked"/>
                           {% endif %}
                         </div>