Merge pull request #6 from BIDS-Apps/shotgunosine-patch-1

[FIX] subj_id and warnings bugs

Author: Shotgunosine

reports/group.html

@@ -135,8 +135,8 @@ <h2>Subject {{ config['subj_id'] }} Summary</h2>
   {% if config['warnings'] %}
   <li>Warnings:
     <ul class="sub-simple">
-    {% for warn in config['warnings'] %}
-    <li>{{ warn }}</li>
+    {% for warn_name, warn_text in config['warnings'].items() %}
+      <li>{{ warn_name }}: {{ warn_text }}</li>
     {% endfor %}
     </ul>
   </li>

reports/individual.html

@@ -111,13 +111,13 @@ <h2>Summary</h2>
 
 
 {% if warnings %}
-<li>Warnings:
-  <ul class="sub-simple">
-  {% for warn in warnings %}
-  <li>{{ warn }}</li>
-  {% endfor %}
-  </ul>
-</li>
+  <li>Warnings:
+    <ul class="sub-simple">
+    {% for warn_name, warn_text in warnings.items() %}
+      <li>{{ warn_name }}: {{ warn_text }}</li>
+    {% endfor %}
+    </ul>
+  </li>
 {% endif %}
 
 

run.py

@@ -274,7 +274,7 @@ def run(command, env={}, shell=False):
                 pbd['orientation'] = pbn[3].split('+')[-1]
                 pb_lod.append(pbd)
             pb_df = pd.DataFrame(pb_lod)
-            config['subj'] = pb_df.subj.unique()[0]
+            config['subj_id'] = pb_df.subj.unique()[0]
             config['blocks'] = ' '.join(pb_df.block.unique())
 
             try:
@@ -293,7 +293,7 @@ def run(command, env={}, shell=False):
                 try:
                     if os.path.getsize(wf_path) > 0:
                         with open(wf_path, 'r') as h:
-                            warns['wf'] = h.readlines()
+                            warns[wf] = h.readlines()
                 except FileNotFoundError:
                     pass
             if len(warns) > 0: