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.

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

update branch #75

Merged
merged 80 commits into from
Oct 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
fe2e718
debugging script
allaway Nov 9, 2023
0c8e878
Add files via upload
cconrad8 Sep 3, 2024
366af18
Merge pull request #67 from nf-osi/cconrad8-patch-1
anngvu Sep 3, 2024
be2426b
Update SubmitObservationUiSchema.json
jay-hodgson Sep 10, 2024
1ef224d
Merge pull request #68 from jay-hodgson/patch-1
cconrad8 Sep 10, 2024
b385308
Create submitAnimalModel.json
cconrad8 Sep 11, 2024
bd9aa15
Update submitAnimalModel.json
cconrad8 Sep 13, 2024
6ef1b40
Create SubmitAnimalModelUiSchema.json
cconrad8 Sep 13, 2024
9f36cc1
Create submitGeneticReagant.json
cconrad8 Sep 13, 2024
9202f23
Create submitGeneticReagantUiSchema
cconrad8 Sep 13, 2024
d7f5df2
Create submitAntibody.json
cconrad8 Sep 13, 2024
8e9462e
Create submitAntibodyUiSchema.json
cconrad8 Sep 13, 2024
b0bc9fd
Create submitCellLine.json
cconrad8 Sep 13, 2024
6a4d7db
Create submitCellLineUiSchema.json
cconrad8 Sep 13, 2024
bb4012c
Update submitCellLine.json
cconrad8 Sep 13, 2024
7d3a670
Update submitCellLineUiSchema.json
cconrad8 Sep 13, 2024
66037fc
Update submitCellLineUiSchema.json
cconrad8 Sep 13, 2024
db6dfef
Update submitAntibody.json
cconrad8 Sep 13, 2024
e7f45e6
Update submitAntibodyUiSchema.json
cconrad8 Sep 13, 2024
eca957c
Update submitAnimalModel.json
cconrad8 Sep 13, 2024
95551e7
Update SubmitAnimalModelUiSchema.json
cconrad8 Sep 13, 2024
9fa10ae
Update submitGeneticReagant.json
cconrad8 Sep 13, 2024
7199dc8
Update submitGeneticReagantUiSchema
cconrad8 Sep 13, 2024
210e62d
Rename NF-Tools-Schemas/SubmitObservationSchema.json to NF-Tools-Sche…
cconrad8 Sep 13, 2024
be0e5a9
Rename NF-Tools-Schemas/SubmitObservationUiSchema.json to NF-Tools-Sc…
cconrad8 Sep 13, 2024
a648970
Rename SubmitObservationSchema.json to SubmitObservationSchema.json
cconrad8 Sep 13, 2024
524cb90
Rename submitGeneticReagantUiSchema to submitGeneticReagantUiSchema.json
cconrad8 Sep 13, 2024
0d976e2
Fix wording
anngvu Sep 16, 2024
7c02df9
Fix wording in cellLine schema
anngvu Sep 16, 2024
ac8a95c
Wording for antibody
anngvu Sep 16, 2024
2e65726
Update submitCellLine description
anngvu Sep 16, 2024
4abf71e
Update submitAntibody.json
cconrad8 Sep 25, 2024
3525b5e
Update submitAntibodyUiSchema.json
cconrad8 Sep 25, 2024
dffe269
Update and rename submitGeneticReagant.json to submitGeneticReagent.json
cconrad8 Sep 25, 2024
f6c1069
Rename submitGeneticReagantUiSchema.json to submitGeneticReagentUiSch…
cconrad8 Sep 25, 2024
1a44b49
Update SubmitObservationSchema.json
cconrad8 Sep 25, 2024
f1f8707
Update SubmitObservationUiSchema.json
cconrad8 Sep 25, 2024
a0c25cb
Update SubmitObservationUiSchema.json
cconrad8 Sep 25, 2024
d4d638a
Update SubmitObservationUiSchema.json
cconrad8 Sep 25, 2024
5c8a46e
Update SubmitObservationUiSchema.json
cconrad8 Sep 25, 2024
4b70491
Update submitGeneticReagent.json
cconrad8 Sep 25, 2024
cdc94b2
Update submitGeneticReagentUiSchema.json
cconrad8 Sep 25, 2024
e2b01b8
Update submitGeneticReagent.json
cconrad8 Sep 25, 2024
556cc27
Update submitGeneticReagentUiSchema.json
cconrad8 Sep 25, 2024
c81885e
Update submitAnimalModel.json
anngvu Sep 26, 2024
929a1eb
Update SubmitAnimalModelUiSchema.json
anngvu Sep 26, 2024
56ff5e5
Merge pull request #70 from nf-osi/review-suggestion
cconrad8 Sep 27, 2024
bb3012a
Update submitAntibody.json
cconrad8 Sep 27, 2024
259d5b9
Update submitAnimalModel.json
cconrad8 Sep 27, 2024
0cc1844
update animal model
cconrad8 Sep 30, 2024
2e3eff1
add species
cconrad8 Sep 30, 2024
3d75800
add how to acquire
cconrad8 Sep 30, 2024
7847392
add default
cconrad8 Sep 30, 2024
3d4a12a
developer
cconrad8 Sep 30, 2024
2a4e5fd
remove extra info
cconrad8 Sep 30, 2024
7966c3a
small updates
cconrad8 Sep 30, 2024
79f6ad7
rewrite genetic reagent
cconrad8 Sep 30, 2024
e55f6c5
fix syntax issue
cconrad8 Sep 30, 2024
120fe33
add radop button
cconrad8 Sep 30, 2024
7a725d3
add description
cconrad8 Sep 30, 2024
d7160ef
edit antibody
cconrad8 Sep 30, 2024
698d9ae
erase antibody cell line for now
cconrad8 Sep 30, 2024
1dbbc63
cell line erase
cconrad8 Sep 30, 2024
8bbf10e
rmv cell line antibody
cconrad8 Sep 30, 2024
5e1742e
move gene synbol
cconrad8 Sep 30, 2024
8a317c2
small edits
cconrad8 Oct 1, 2024
f019b95
Update submitGeneticReagent.json
cconrad8 Oct 1, 2024
da9e343
Update submitGeneticReagent.json
cconrad8 Oct 3, 2024
c6d0df8
Merge pull request #69 from nf-osi/additional-models
cconrad8 Oct 3, 2024
b370153
Update submitGeneticReagent.json
cconrad8 Oct 3, 2024
539f986
Update submitGeneticReagent.json
cconrad8 Oct 3, 2024
b282029
fix required
cconrad8 Oct 3, 2024
5775543
add required
cconrad8 Oct 3, 2024
056454f
fix required animalModel
cconrad8 Oct 3, 2024
0c52963
Update submitGeneticReagentUiSchema.json
cconrad8 Oct 3, 2024
21e0d04
Merge pull request #71 from nf-osi/fix-required
cconrad8 Oct 3, 2024
44f8933
remove developer required
cconrad8 Oct 3, 2024
7016d96
Merge pull request #72 from nf-osi/additional-models
allaway Oct 3, 2024
e1c3f8f
unpin schematic version
allaway Oct 14, 2024
f4dde32
Merge pull request #74 from nf-osi/allaway-patch-4
allaway Oct 14, 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
2 changes: 1 addition & 1 deletion .github/workflows/schematic-schema-convert.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Install schematic and convert schema #temporarily revert to this to use edge version of schematic
shell: bash
run: |
pip install git+https://github.com/Sage-Bionetworks/schematic.git@74d3b98f97eb14f70e9f6ad3a02005812b237329
pip install schematicpy
schematic schema convert $schema_filename -o nf-research-tools.jsonld


Expand Down
5 changes: 5 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"githubPullRequests.ignoredPullRequestBranches": [
"main"
]
}
31 changes: 31 additions & 0 deletions NF-Tools-Schemas/animal-model/SubmitAnimalModelUiSchema.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{
"description": {
"ui:widget": "textarea",
"ui:placeholder": "Provide a brief description (~20 words)",
"ui:options": {
"rows": 3
}
},
"basicInfo": {
"species": {
"ui:widget": "radio",
"ui:inline": "true"
}
},
"animalModelDisease": {
"ui:widget": "radio",
"ui:inline": "true"
},
"animalModelManifestation": {
"ui:widget": "radio"
},
"alleleType": {
"ui:widget": "radio"
},
"mutationTypes": {
"ui:widget": "select"
},
"itemAcquisition": {
"ui:widget": "radio"
}
}
323 changes: 323 additions & 0 deletions NF-Tools-Schemas/animal-model/submitAnimalModel.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,323 @@
{
"$schema": "http://json-schema.org/draft-07/schema#",
"title": "Submit Animal Model",
"type": "object",
"properties": {
"userInfo": {
"type": "object",
"title": "Your Information",
"properties": {
"firstandlastName": {
"type": "string",
"title": "First and Last Name"
},
"email": {
"type": "string",
"title": "Contact Email",
"format": "email"
},
"institution": {
"type": "string",
"title": "Institution/Affiliation",
"default": ""
},
"isDeveloper": {
"type": "string",
"title": "Are you the developer?",
"enum": [
"Yes",
"No"
],
"default": "Yes"
}
},
"required": ["firstandlastName", "email", "isDeveloper"]
},
"basicInfo": {
"type": "object",
"title": "",
"properties": {
"animalModelName": {
"type": "string",
"title": "Name of Animal Model"
},
"synonyms": {
"type": "string",
"title": "Synonyms"
},
"description": {
"type": "string",
"title": "Description (~20 words)"
},
"species": {
"type": "string",
"title": "Species",
"enum": [
"Mouse",
"Rat",
"Pig",
"Zebrafish",
"Fruit Fly",
"Other"
]
}
},
"required": ["animalModelName", "description", "species"]
},
"backgroundStrain": {
"type": "string",
"title": "Background Strain",
"examples": [
"C57BL/6"
]
},
"backgroundSubstrain": {
"type": "string",
"title": "Background Substrain",
"examples": [
"C57BL/6J"
]
},
"strainNomenclature": {
"type": "string",
"title": "Strain Nomenclature"
},
"animalModelDisease": {
"type": "string",
"title": "Disease",
"enum": [
"Neurofibromatosis type 1",
"Neurofibromatosis type 2",
"No known disease",
"Schwannomatosis"
]
},
"animalModelManifestation": {
"type": "string",
"title": "Manifestation",
"enum": [
"No Symptoms",
"Acute Myeloid Leukemia",
"Astrocytoma",
"Cognition",
"Growth",
"Heart Malformation",
"High Grade Glioma",
"Malignant Peripheral Nerve Sheath Tumor",
"Metabolic Function",
"Neural Crest Hyperplasia",
"Optic Nerve Glioma",
"Plexiform Neurofibroma",
"Spinal Development",
"Other"
]
},
"alleleType": {
"type": "string",
"title": "Allele Type",
"enum": [
"Conditional ready",
"Constitutively active",
"Dominant negative",
"Humanized sequence",
"Hypomorph",
"Inducible",
"Inserted expressed sequence",
"Knockdown",
"Modified isoform(s)",
"No functional change",
"Null/knockout",
"RMCE-Ready",
"Recombinase",
"Reporter",
"Transactivator",
"Transposase",
"Transposon concatemer",
"Other"
]
},
"affectedGeneSymbol": {
"type": "string",
"title": "Affected Gene Symbol"
},
"mutationTypes": {
"type": "object",
"title": "Mutation Types",
"properties": {
"Disruption caused by insertion of vector": {
"type": "boolean"
},
"Duplication": {
"type": "boolean"
},
"Insertion": {
"type": "boolean"
},
"Insertion of gene trap vector": {
"type": "boolean"
},
"Intergenic deletion": {
"type": "boolean"
},
"Intragenic deletion": {
"type": "boolean"
},
"Inversion": {
"type": "boolean"
},
"Loss of heterozygosity (unspecified mechanism)": {
"type": "boolean"
},
"Nucleotide repeat expansion": {
"type": "boolean"
},
"Nucleotide substitutions": {
"type": "boolean"
},
"Single point mutation": {
"type": "boolean"
},
"Translocation": {
"type": "boolean"
},
"Transposon insertion": {
"type": "boolean"
},
"Viral insertion": {
"type": "boolean"
},
"Other": {
"type": "boolean"
}
}
},
"proteinVariation": {
"type": "string",
"title": "Protein Variation"
},
"sequenceVariation": {
"type": "string",
"title": "Sequence Variation"
},
"publicationDOI": {
"type": "string",
"title": "Publication Link (DOI)"
},
"itemAcquisition": {
"type": "string",
"title": "How to acquire",
"enum": [
"Contact Developer",
"Purchase from Vendor",
"Other"
],
"default": "Contact Developer"
}
},
"required": ["animalModelDisease"],
"allOf": [
{
"if": {
"properties": {
"userInfo": {
"properties": {
"isDeveloper": {
"const": "No"
}
}
}
}
},
"then": {
"properties": {
"userInfo": {
"properties": {
"developerName": {
"type": "string",
"title": "Developer Name"
},
"developerAffiliation": {
"type": "string",
"title": "Developer Affiliation"
}
}
}
},
"required": [
"userInfo.developerName",
"userInfo.developerAffiliation"
]
}
},
{
"if": {
"properties": {
"basicInfo": {
"properties": {
"species": {
"const": "Other"
}
}
}
}
},
"then": {
"properties": {
"basicInfo": {
"properties": {
"otherSpecies": {
"type": "string",
"title": "Other species name"
}
}
}
}
}
},
{
"if": {
"properties": {
"itemAcquisition": {
"const": "Purchase from Vendor"
}
}
},
"then": {
"properties": {
"vendor": {
"type": "string",
"title": "Vendor Name"
},
"catalogNumber": {
"type": "string",
"title": "Catalog Number"
},
"catalogURL": {
"type": "string",
"title": "Link to vendor page"
}
}
}
},
{
"if": {
"properties": {
"itemAcquisition": {
"const": "Other"
}
}
},
"then": {
"properties": {
"additionalDetails": {
"type": "string",
"title": "Please provide additional details."
}
},
"required": [
"additionalDetails"
]
}
}
]
}
Loading
Loading