Merge branch 'main' into dev-20221212

DesignSafe-CI · Dec 12, 2023 · ab8aaac · ab8aaac
2 parents f1ab8ff + 4568564
commit ab8aaac
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 31 deletions.
diff --git a/designsafe/apps/api/publications/search_utils.py b/designsafe/apps/api/publications/search_utils.py
@@ -51,9 +51,11 @@ def simulation_type_query(simulation_type):
 
 def nh_type_query(nh_type):
     NON_OTHER_NH_TYPES = [
+        "Drought",
         "Earthquake",
         "Extreme Temperatures",
         "Fire",
+        "Wildfire",
         "Flood",
         "Hurricane/Tropical Storm",
         "Landslide",
@@ -62,7 +64,8 @@ def nh_type_query(nh_type):
         "Thunderstorm",
         "Storm Surge",
         "Pandemic",
-        "Wind"
+        "Wind",
+        "Other"
     ]
     if nh_type == "Other":
         return ~Q({'terms': {'project.value.nhTypes.keyword': NON_OTHER_NH_TYPES}})
@@ -79,28 +82,31 @@ def other_facility_query(facility):
 
 def other_type_query(data_type):
     data_types = [
-            'Benchmark Dataset',
-            'Check Sheet',
-            'Code',
-            'Database',
-            'Dataset',
-            'Field Survey',
-            'Image',
-            'Jupyter Notebook',
-            'Learning Object',
-            'Model',
-            'Paper',
-            'Proceeding',
-            'Poster',
-            'Presentation',
-            'Report',
-            'Reseach Experience for Undergraduates',
-            'SimCenter Testbed',
-            'Social Sciences',
-            'Survey Instrument',
-            'Testbed',
-            'Video',
-            'White Paper',
+            "Archival Materials",
+            "Audio",
+            "Benchmark Dataset",
+            "Check Sheet",
+            "Code",
+            "Database",
+            "Dataset",
+            "Engineering",
+            "Image",
+            "Interdisciplinary",
+            "Jupyter Notebook",
+            "Learning Object",
+            "Model",
+            "Paper",
+            "Proceeding",
+            "Poster",
+            "Presentation",
+            "Report",
+            "Research Experience for Undergraduates",
+            "SimCenter Testbed",
+            "Social Sciences",
+            "Survey Instrument",
+            "Testbed",
+            "Video",
+            "Other"
     ]
     if data_type == 'Other':
         return ~Q({'terms': {'project.value.dataType.keyword': data_types}}) # | ~Q({'exists', {'field': 'project.value.dataType.keyword'}})

diff --git a/designsafe/static/scripts/projects/components/manage-project/manage-project.template.html b/designsafe/static/scripts/projects/components/manage-project/manage-project.template.html
@@ -168,9 +168,16 @@ <h3 class="text-center">
                             style="margin-bottom: 5px;"
                             ng-options="item for item in $ctrl.fieldResearchTypes"
                             ng-model="$ctrl.form.frTypes[$index]"
-                            ng-required="$first">
+                            ng-required="$first"
+                            ng-if="!$ctrl.isOther($ctrl.form.frTypes[$index], $ctrl.fieldResearchTypes)">
                         <option value="">-- Select Field Research Type --</option>
                     </select>
+                    <div ng-if="$ctrl.isOther($ctrl.form.frTypes[$index], $ctrl.fieldResearchTypes)">
+                        <input type="text"
+                            ng-model="$ctrl.form.frTypes[$index]"
+                            class="form-control"
+                        />
+                    </div>
                 </div>
                 <button class="btn-project-add-rm"
                         ng-click="$ctrl.addField($ctrl.form.frTypes)">

diff --git a/designsafe/static/scripts/projects/components/manage-project/project-form-options.json b/designsafe/static/scripts/projects/components/manage-project/project-form-options.json
@@ -9,10 +9,11 @@
         "Cited By"
     ],
     "nhTypes": [
-        "Other",
+        "Drought",
         "Earthquake",
         "Extreme Temperatures",
         "Fire",
+        "Wildfire",
         "Flood",
         "Hurricane/Tropical Storm",
         "Landslide",
@@ -21,26 +22,33 @@
         "Thunderstorm",
         "Storm Surge",
         "Pandemic",
-        "Wind"
+        "Wind",
+        "Other"
     ],
     "frTypes": [
         "Engineering",
-        "Field Experiment",
         "Geosciences",
+        "Public Health",
+        "Social Sciences",
         "Interdisciplinary",
+        "Field Experiment",
+        "Cross-Sectional Study",
         "Longitudinal Study",
         "Reconnaissance",
-        "Something Else",
-        "Social Sciences"
+        "Other"
+
     ],
     "otherTypes": [
+        "Archival Materials",
+        "Audio",
         "Benchmark Dataset",
         "Check Sheet",
         "Code",
         "Database",
         "Dataset",
-        "Field Survery",
+        "Engineering",
         "Image",
+        "Interdisciplinary",
         "Jupyter Notebook",
         "Learning Object",
         "Model",
@@ -55,7 +63,6 @@
         "Survey Instrument",
         "Testbed",
         "Video",
-        "White Paper",
         "Other"
     ]
 }