From ccfed34cb1209f3f76d2db67b3545e61ce31f8c9 Mon Sep 17 00:00:00 2001 From: bbimber Date: Mon, 9 Jun 2025 16:11:31 -0700 Subject: [PATCH 1/3] Add metadata for many SIV study queries --- .../queries/study/assignment.query.xml | 28 ++++++++ .../study/demographics.query.xml | 28 ++++++++ .../resources/queries/study/flags.query.xml | 22 +++++++ .../queries/study/immunizations.query.xml | 33 ++++++++++ .../resources/queries/study/labwork.query.xml | 34 ++++++++++ .../resources/queries/study/samples.query.xml | 31 +++++++++ .../study/studyData.query.xml | 0 .../queries/study/treatments.query.xml | 65 +++++++++++++++++++ .../queries/study/viralloads.query.xml | 40 ++++++++++++ .../{query => queries}/study/weight.query.xml | 6 ++ Studies/resources/query/study/flags.query.xml | 43 ------------ .../resources/query/study/samples.query.xml | 11 ---- 12 files changed, 287 insertions(+), 54 deletions(-) create mode 100644 Studies/resources/queries/study/assignment.query.xml rename Studies/resources/{query => queries}/study/demographics.query.xml (53%) create mode 100644 Studies/resources/queries/study/flags.query.xml create mode 100644 Studies/resources/queries/study/immunizations.query.xml create mode 100644 Studies/resources/queries/study/labwork.query.xml create mode 100644 Studies/resources/queries/study/samples.query.xml rename Studies/resources/{query => queries}/study/studyData.query.xml (100%) create mode 100644 Studies/resources/queries/study/treatments.query.xml create mode 100644 Studies/resources/queries/study/viralloads.query.xml rename Studies/resources/{query => queries}/study/weight.query.xml (67%) delete mode 100644 Studies/resources/query/study/flags.query.xml delete mode 100644 Studies/resources/query/study/samples.query.xml diff --git a/Studies/resources/queries/study/assignment.query.xml b/Studies/resources/queries/study/assignment.query.xml new file mode 100644 index 000000000..4885dec2e --- /dev/null +++ b/Studies/resources/queries/study/assignment.query.xml @@ -0,0 +1,28 @@ + + + + + + + + Date Added + Date + + + End Date + Date + + + Study + + + Sub-Group + + + Category + + +
+
+
+
diff --git a/Studies/resources/query/study/demographics.query.xml b/Studies/resources/queries/study/demographics.query.xml similarity index 53% rename from Studies/resources/query/study/demographics.query.xml rename to Studies/resources/queries/study/demographics.query.xml index 9df49a04a..5b516500b 100644 --- a/Studies/resources/query/study/demographics.query.xml +++ b/Studies/resources/queries/study/demographics.query.xml @@ -28,6 +28,34 @@ query.Id~eq=${Id} + + true + true + + + Sex + + + Geographic Origin + + + Birth + + + Death + + + Species + + + Mother + + + Father + + + Status + diff --git a/Studies/resources/queries/study/flags.query.xml b/Studies/resources/queries/study/flags.query.xml new file mode 100644 index 000000000..6e2b23eda --- /dev/null +++ b/Studies/resources/queries/study/flags.query.xml @@ -0,0 +1,22 @@ + + + + + + + + Date Added + Date + + + End Date + Date + + + Flag + + +
+
+
+
diff --git a/Studies/resources/queries/study/immunizations.query.xml b/Studies/resources/queries/study/immunizations.query.xml new file mode 100644 index 000000000..833d0fde2 --- /dev/null +++ b/Studies/resources/queries/study/immunizations.query.xml @@ -0,0 +1,33 @@ + + + + + + + + Date Added + Date + + + Category + + + Treatment + + + Route + + + Quantity + + + Quantity Units + + + Reason + + +
+
+
+
\ No newline at end of file diff --git a/Studies/resources/queries/study/labwork.query.xml b/Studies/resources/queries/study/labwork.query.xml new file mode 100644 index 000000000..0e07d77e1 --- /dev/null +++ b/Studies/resources/queries/study/labwork.query.xml @@ -0,0 +1,34 @@ + + + + + + + + Date + Date + + + Category + + + Test + + + Result + + + Units + + + Qualitative Result + true + + + Method + + +
+
+
+
diff --git a/Studies/resources/queries/study/samples.query.xml b/Studies/resources/queries/study/samples.query.xml new file mode 100644 index 000000000..87ac54943 --- /dev/null +++ b/Studies/resources/queries/study/samples.query.xml @@ -0,0 +1,31 @@ + + + + + + + + Date Added + Date + + + Sample ID + + + Sample Type + + + Preservation + + + Quantity + + + Quantity Units + + + +
+
+
+
\ No newline at end of file diff --git a/Studies/resources/query/study/studyData.query.xml b/Studies/resources/queries/study/studyData.query.xml similarity index 100% rename from Studies/resources/query/study/studyData.query.xml rename to Studies/resources/queries/study/studyData.query.xml diff --git a/Studies/resources/queries/study/treatments.query.xml b/Studies/resources/queries/study/treatments.query.xml new file mode 100644 index 000000000..c92ad7063 --- /dev/null +++ b/Studies/resources/queries/study/treatments.query.xml @@ -0,0 +1,65 @@ + + + + + + + + Date + Date + + + End Date + Date + + + Category + + + Treatment + + + Route + + + Frequency + + + Amount + + + Amount Units + + + Volume + true + + + Volume Units + true + + + Concentration + true + + + Conc. Units + true + + + Dosage + true + + + Dosage Units + true + + + Reason + true + + +
+
+
+
diff --git a/Studies/resources/queries/study/viralloads.query.xml b/Studies/resources/queries/study/viralloads.query.xml new file mode 100644 index 000000000..8699aa8f5 --- /dev/null +++ b/Studies/resources/queries/study/viralloads.query.xml @@ -0,0 +1,40 @@ + + + + + + + + Date + Date + + + Sample Type + + + Assay Type + + + target + + + LOD + + + Result + + + Units + + + Qualitative Result + true + + + true + + +
+
+
+
diff --git a/Studies/resources/query/study/weight.query.xml b/Studies/resources/queries/study/weight.query.xml similarity index 67% rename from Studies/resources/query/study/weight.query.xml rename to Studies/resources/queries/study/weight.query.xml index 929c141e3..24e484dd7 100644 --- a/Studies/resources/query/study/weight.query.xml +++ b/Studies/resources/queries/study/weight.query.xml @@ -3,6 +3,12 @@ + + + + + true + Weight (kg) 0.#### diff --git a/Studies/resources/query/study/flags.query.xml b/Studies/resources/query/study/flags.query.xml deleted file mode 100644 index e8d0348bf..000000000 --- a/Studies/resources/query/study/flags.query.xml +++ /dev/null @@ -1,43 +0,0 @@ - - - -
- - - - Date Added - Date - - - Date Removed - false - Date - - - - - - - - - - - - - - - - - - - - - - Value - true - - -
-
- - diff --git a/Studies/resources/query/study/samples.query.xml b/Studies/resources/query/study/samples.query.xml deleted file mode 100644 index b3f9fa380..000000000 --- a/Studies/resources/query/study/samples.query.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - -
-
-
-
\ No newline at end of file From e7e33097567f45374323965b38148b7c370db472 Mon Sep 17 00:00:00 2001 From: bbimber Date: Mon, 9 Jun 2025 16:19:59 -0700 Subject: [PATCH 2/3] Add genetics table --- .../queries/study/genetics.query.xml | 30 +++++++++++++++++ .../study/datasets/datasets_manifest.xml | 3 ++ .../study/datasets/datasets_metadata.xml | 32 +++++++++++++++++++ 3 files changed, 65 insertions(+) create mode 100644 Studies/resources/queries/study/genetics.query.xml diff --git a/Studies/resources/queries/study/genetics.query.xml b/Studies/resources/queries/study/genetics.query.xml new file mode 100644 index 000000000..54b08daef --- /dev/null +++ b/Studies/resources/queries/study/genetics.query.xml @@ -0,0 +1,30 @@ + + + + + + + + Date Added + Date + + + Category + + + Assay Type + + + Marker/Allele + + + Result + + + Score + + +
+
+
+
diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml index de46c5955..fd5af7222 100644 --- a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml +++ b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml @@ -31,5 +31,8 @@ + + + diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml index 4db53dd2a..14b252198 100644 --- a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml +++ b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml @@ -334,4 +334,36 @@ Samples + + + + varchar + http://cpas.labkey.com/Study#ParticipantId + + + timestamp + http://cpas.labkey.com/laboratory#sampleDate + + + entityid + true + + + varchar + + + varchar + + + varchar + + + varchar + + + double + + + Genetic Data +
From 7ee526a9b619929516c1934bc4cda3f4873d4d91 Mon Sep 17 00:00:00 2001 From: bbimber Date: Mon, 9 Jun 2025 16:49:57 -0700 Subject: [PATCH 3/3] Add additional study tables --- .../queries/study/procedures.query.xml | 22 ++++++++++++++++++ .../study/datasets/datasets_manifest.xml | 5 +++- .../study/datasets/datasets_metadata.xml | 23 +++++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 Studies/resources/queries/study/procedures.query.xml diff --git a/Studies/resources/queries/study/procedures.query.xml b/Studies/resources/queries/study/procedures.query.xml new file mode 100644 index 000000000..b866f8b5f --- /dev/null +++ b/Studies/resources/queries/study/procedures.query.xml @@ -0,0 +1,22 @@ + + + + + + + + + + true + + + Category + + + Procedure + + +
+
+
+
\ No newline at end of file diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml index fd5af7222..346bd0300 100644 --- a/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml +++ b/Studies/resources/referenceStudy/study/datasets/datasets_manifest.xml @@ -31,7 +31,10 @@ - + + + + diff --git a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml index 14b252198..d536f5c76 100644 --- a/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml +++ b/Studies/resources/referenceStudy/study/datasets/datasets_metadata.xml @@ -366,4 +366,27 @@ Genetic Data + + + + varchar + http://cpas.labkey.com/Study#ParticipantId + + + timestamp + http://cpas.labkey.com/laboratory#sampleDate + + + entityid + true + + + varchar + + + varchar + + + Procedures +