Sample summary report adjustments

biocore · Dec 2, 2024 · 2950cf6 · 2950cf6
1 parent 43f6674
commit 2950cf6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/microsetta_admin/server.py b/microsetta_admin/server.py
@@ -377,9 +377,18 @@ def per_sample_summary():
 
                 resource = pd.DataFrame(result['samples'])
                 order = ['sampleid', 'project', 'account-email',
+                         'account-first-name', 'account-last-name',
                          'source-type', 'site-sampled', 'sample-date',
                          'sample-time', 'sample-status', 'sample-received',
-                         'ffq-taken', 'ffq-complete', 'vioscreen_username']
+                         'first-scan-status', 'first-scan-timestamp',
+                         'latest-scan-status', 'latest-scan-timestamp',
+                         'sample-has-inconsistencies', 'sample-is-valid',
+                         'no-associated-source', 'no-collection-info',
+                         'no-registered-account', 'received-unknown-validity',
+                         'ffq-taken', 'ffq-complete', 'vioscreen_username',
+                         'kit-id', 'outbound-tracking',
+                         'inbound-tracking', 'daklapack-order-id'
+                         ]
                 order.extend(sorted(set(resource.columns) - set(order)))
                 resource = resource[order]
                 if unprocessed_barcodes:
@@ -436,6 +445,7 @@ def per_sample_summary():
             resource = pd.DataFrame(result['samples'])
             if not resource.empty:
                 order = ['sampleid', 'project', 'account-email',
+                         'account-first-name', 'account-last-name',
                          'source-type', 'site-sampled', 'sample-date',
                          'sample-time', 'sample-status', 'sample-received',
                          'first-scan-status', 'first-scan-timestamp',
@@ -445,7 +455,7 @@ def per_sample_summary():
                          'no-registered-account', 'received-unknown-validity',
                          'ffq-taken', 'ffq-complete', 'vioscreen_username',
                          'kit-id', 'outbound-tracking',
-                         'inbound-tracking'
+                         'inbound-tracking', 'daklapack-order-id'
                          ]
                 order.extend(sorted(set(resource.columns) - set(order)))
                 resource = resource[order]

diff --git a/microsetta_admin/templates/per_sample_summary.html b/microsetta_admin/templates/per_sample_summary.html
@@ -64,6 +64,7 @@ <h5>Retrieve summary for a sample</h5>
                         <option value="emails">Email</option>
                         <option value="outbound_tracking_numbers">Outbound Tracking Number</option>
                         <option value="inbound_tracking_numbers">Inbound Tracking Number</option>
+                        <option value="dak_order_ids">Daklapack Order IDs</option>
                     </select>
                 </td>
             </tr>