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

Feat 77: add metadata_dir field to excel template and validated jobs table #88

Merged
merged 3 commits into from
Apr 5, 2024
Merged

Feat 77: add metadata_dir field to excel template and validated jobs table #88

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5126a6
Feat 77: add metadata_dir field to excel template and validated jobs …
helen-m-lin Apr 3, 2024
ee1b82d
Merge branch 'main' into feat-77-xlsx-metadata_dir
helen-m-lin Apr 4, 2024
85fb6c0
add metadata_dir to xlsx template in test/resources
helen-m-lin Apr 4, 2024
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
4 changes: 4 additions & 0 deletions src/aind_data_transfer_service/configs/job_upload_template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class JobUploadTemplate:
"platform",
"acq_datetime",
"subject_id",
"metadata_dir",
"modality0",
"modality0.source",
"modality1",
Expand All @@ -31,6 +32,7 @@ class JobUploadTemplate:
Platform.BEHAVIOR.abbreviation,
datetime.datetime(2023, 10, 4, 4, 0, 0),
"123456",
"/allen/aind/stage/fake/metadata_dir",
Modality.BEHAVIOR_VIDEOS.abbreviation,
"/allen/aind/stage/fake/dir",
Modality.BEHAVIOR.abbreviation,
Expand All @@ -40,13 +42,15 @@ class JobUploadTemplate:
Platform.SMARTSPIM.abbreviation,
datetime.datetime(2023, 3, 4, 16, 30, 0),
"654321",
"/allen/aind/stage/fake/Config",
Modality.SPIM.abbreviation,
"/allen/aind/stage/fake/dir",
],
[
Platform.ECEPHYS.abbreviation,
datetime.datetime(2023, 1, 30, 19, 1, 0),
"654321",
None,
Modality.ECEPHYS.abbreviation,
"/allen/aind/stage/fake/dir",
Modality.BEHAVIOR_VIDEOS.abbreviation,
Expand Down
3 changes: 2 additions & 1 deletion src/aind_data_transfer_service/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ <h2>Submit Jobs</h2>
let jobsLength = jobs.length;
var table = document.createElement('table'), tr, td, row;
addTableRow(
[ "s3_bucket", "platform", "subject_id", "acq_datetime", "modality", "modality.source" ],
[ "s3_bucket", "platform", "subject_id", "acq_datetime", "metadata_dir", "modality", "modality.source" ],
table, tr, td, true
);
for (row = 0; row < jobsLength; row++) {
Expand All @@ -151,6 +151,7 @@ <h2>Submit Jobs</h2>
{ value: job.platform.abbreviation, rowspan: modalitiesLength },
{ value: job.subject_id, rowspan: modalitiesLength },
{ value: job.acq_datetime, rowspan: modalitiesLength },
{ value: job.metadata_dir ?? "", rowspan: modalitiesLength },
modalities ? modalities[0].modality.abbreviation : "",
modalities ? modalities[0].source : ""
], table, tr, td, false
Expand Down
Binary file modified tests/resources/job_upload_template.xlsx
View file
Open in desktop
Binary file not shown.
Loading