Skip to content

Merge discvr-22.11 to develop #160

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

Merged
bbimber merged 8 commits into from
Feb 3, 2023
Merged

Merge discvr-22.11 to develop #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4f0f95b
Allow MCC transfer workflow to work within one container
bbimber Jan 16, 2023
c0dd48c
Bugfix to MCC transfer window and test
bbimber Jan 19, 2023
aabeb71
Bugfix to MCC MarkShippedWindow
bbimber Jan 19, 2023
3dd2a5c
Add MCC feature to remove missing IDs (#93)
bbimber Jan 20, 2023
9fbf5d1
Bump json5 from 1.0.1 to 1.0.2 in /mcc (#92)
dependabot[bot] Jan 20, 2023
afb78aa
Add support for demuxmix in cell hashing
bbimber Jan 30, 2023
1f59a3b
Refine MCC process to mark status of missing census IDs (#95)
bbimber Feb 1, 2023
6ae8d7d
Merge discvr-22.11 to develop
bbimber Feb 3, 2023
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
30 changes: 12 additions & 18 deletions mcc/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions mcc/resources/data/death_cause.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
value title category description sort_order date_disabled
Spontaneous Death 1
Sudden Infant Death 5
Accidental Death 13
Death Due to Fight 14
Acute Surgical Death 6
Postoperative Death 7
Dead On Arrival 15
Unplanned Experimental Death 8
Perinatal Death 2
Postpartum Death 9
Death in Quarantine 12
Undetermined Cause 10
Unclassified Cause 11
Abortion ( < 130 days gestation ) 17
Spontaneous Death, Experimental subject 22
Neonatal death (<28 days of age, breathed once) 28
Spontaneous Death in quarantine 24
Stillbirth ( > 130 days gestation, never breathed) 16
Cause of Death Unknown 99
EUTHANASIA, EXPERIMENTAL 3
EUTHANASIA, NONEXPERIMENTAL 4
EUTHANASIA, QUARANTINE 3
Medical Termination 30
Miscarriage 32
Biochemical Pregnancy 35
4 changes: 2 additions & 2 deletions mcc/resources/referenceStudy/study/datasets/datasets_manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@
<dataset name="transfers" id="1001" category="Colony Management" type="Standard">
<tags/>
</dataset>
<dataset name="deaths" id="1048" showByDefault="false" category="Colony Management" demographicData="true" type="Standard">
<dataset name="deaths" id="1048" showByDefault="true" category="Colony Management" demographicData="true" type="Standard">
<tags/>
</dataset>
<dataset name="demographics" id="1012" category="Colony Management" demographicData="true" type="Standard">
<tags/>
</dataset>
<dataset name="departure" id="1013" showByDefault="false" category="Colony Management" type="Standard">
<dataset name="departure" id="1013" showByDefault="true" category="Colony Management" type="Standard">
<tags/>
</dataset>
<dataset name="assignment" id="1002" category="Colony Management" type="Standard">
Expand Down
7 changes: 7 additions & 0 deletions mcc/resources/views/populateData.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,13 @@
schemaName: 'ehr_lookups',
queryName: 'conc_units',
pk: 'rowid'
},{
label: 'Death Cause',
populateFn: 'populateFromFile',
moduleName: 'mcc',
schemaName: 'ehr_lookups',
queryName: 'death_cause',
pk: 'rowid'
},{
label: 'Dosage Units',
populateFn: 'populateFromFile',
Expand Down
Loading