Merge pull request #1 from anngvu/review-fixes

Review fixes
ncihtan · Jan 14, 2025 · c7c4175 · c7c4175
2 parents d5fc3bc + 51d0d26
commit c7c4175
Show file tree

Hide file tree

Showing 10 changed files with 64,433 additions and 17 deletions.
diff --git a/HTAN.jsonld b/HTAN.jsonld
diff --git a/modules/Imaging/Imaging.yaml b/modules/Imaging/Imaging.yaml
@@ -201,8 +201,3 @@ enums:
       PHASE:
       MAGNITUDE:
 
-
-
-
-
-
diff --git a/modules/Participant/participant.yaml b/modules/Participant/participant.yaml
@@ -23,9 +23,8 @@ enums:
       Unknown:
       Non-Binary:
       Not Reported:
-      Prefer Not to Answer:
-      Unknown:
-
+      Prefer Not to Answer:  
+
   SexEnum:
     title: sex
     permissible_values:

diff --git a/modules/Tumor/Tumor.yaml b/modules/Tumor/Tumor.yaml
@@ -250,8 +250,8 @@ enums:
   ProgressionOrRecurrenceEnum:
     title: progression_or_recurrence
     permissible_values:
-      yes:
-      no:
+      'yes':
+      'no':
       unknown:
       not reported:
       Not Allowed To Collect:

diff --git a/modules/Worksheets/CollectionInformation.yaml b/modules/Worksheets/CollectionInformation.yaml
@@ -19,19 +19,21 @@ classes:
 
       program_name:
         range: string
-        description: The narrative title used to refer to a broad framework of goals under which related projects or research activities are grouped. Example: Clinical Proteomic Tumor Analysis Consortium.
+
+        description: "The narrative title used to refer to a broad framework of goals under which related projects or research activities are grouped. Example: Clinical Proteomic Tumor Analysis Consortium."
 
       program_short_name:
         range: string
-        description: An acronym or abbreviated form of the program title. Example: CPTAC.
+        description: "An acronym or abbreviated form of the program title. Example: CPTAC."
 
       study_name:
         range: string
-        description: The narrative title used as a textual label for the research data collection. Example: Comparative Molecular Life History of Spontaneous Canine and Human Gliomas.
+        description: "The narrative title used as a textual label for the research data collection. Example: Comparative Molecular Life History of Spontaneous Canine and Human Gliomas."
 
       study_acronym:
         range: string
-        description: The acronym or abbreviated form of the study title. Example: GLIOMA01.
+        description: "The acronym or abbreviated form of the study title. Example: GLIOMA01."
+
 
       number_of_participants:
         range: string

diff --git a/modules/Worksheets/FileSpecificGeneralInformation.yaml b/modules/Worksheets/FileSpecificGeneralInformation.yaml
@@ -1,5 +1,5 @@
 name: FileSpecificGeneralInformation
-id: urn:uuid: aafe1c0b-1794-46f6-86be-da5b590ca332
+id: urn:uuid:aafe1c0b-1794-46f6-86be-da5b590ca332
 
 imports:
   - Modules/Participant/participant

diff --git a/modules/Worksheets/MultiplexMicroscopy.yaml b/modules/Worksheets/MultiplexMicroscopy.yaml
@@ -1,5 +1,5 @@
 name: MultiplexMicroscopy
-id: urn:uuid: 8fdda0d7-22cd-472b-85c2-6560b68d1821
+id: urn:uuid:8fdda0d7-22cd-472b-85c2-6560b68d1821
 
 imports:
   - Modules/Participant/participant

diff --git a/modules/Worksheets/MultiplexMicroscopyChannelMetadata.yaml b/modules/Worksheets/MultiplexMicroscopyChannelMetadata.yaml
@@ -59,4 +59,4 @@ classes:
 
       catalog_number:
         range: string
-        description
+        description: TBD
diff --git a/modules/props.yaml b/modules/props.yaml
@@ -0,0 +1,5 @@
+slots:
+  de-identification_method_type:
+    range: DeIdentificationMethodTypeEnum 
+  license:
+    range: LicenseEnum 
diff --git a/modules/Worksheets/replace.py → replace.py b/modules/Worksheets/replace.py → replace.py