diff --git a/microsetta_admin/server.py b/microsetta_admin/server.py index f1530d4..22b0f2f 100644 --- 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 index be90368..5030e17 100644 --- a/microsetta_admin/templates/per_sample_summary.html +++ b/microsetta_admin/templates/per_sample_summary.html @@ -64,6 +64,7 @@