Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sample Summary Report Adjustments #109

Merged
merged 1 commit into from
Dec 2, 2024
Merged

Sample Summary Report Adjustments #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions microsetta_admin/server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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',
Expand All @@ -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]
Expand Down
1 change: 1 addition & 0 deletions microsetta_admin/templates/per_sample_summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Loading