[C] add calculator type questions

lsst-epo · Mar 19, 2024 · e83e396 · e83e396
1 parent 5c5b526
commit e83e396
Show file tree

Hide file tree

Showing 13 changed files with 817 additions and 471 deletions.
diff --git a/api/config/project/entryTypes/default--021f7cc6-93ec-4da4-9566-8d05c64d1725.yaml b/api/config/project/entryTypes/default--021f7cc6-93ec-4da4-9566-8d05c64d1725.yaml
@@ -182,6 +182,29 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 100
+          -
+            elementCondition:
+              class: craft\elements\conditions\entries\EntryCondition
+              conditionRules:
+                -
+                  class: craft\fields\conditions\OptionsFieldConditionRule
+                  fieldUid: a966d509-84b0-43ab-9a5b-42590a5fb537 # Answer Type
+                  operator: in
+                  uid: 8ad6bd95-c291-45b9-9fac-4edd4beee636
+                  values:
+                    - calculator
+              elementType: craft\elements\Entry
+              fieldContext: global
+            fieldUid: e28ed79c-82dd-4c7b-b1cf-abdece40ff5e # Equation
+            instructions: null
+            label: null
+            required: true
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 1ddb4a35-2e78-4110-97e9-d1baf7af4260
+            userCondition: null
+            warning: null
+            width: 100
         name: Content
         uid: 38c902fa-7739-496e-a506-0b98d6d480d0
         userCondition: null

diff --git a/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml b/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml
@@ -57,7 +57,7 @@ fieldLayouts:
             width: 50
           -
             elementCondition: null
-            fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+            fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d
             instructions: 'Check to include the light curve scatterplot'
             label: null
             required: false
@@ -73,7 +73,7 @@ fieldLayouts:
               conditionRules:
                 -
                   class: craft\fields\conditions\LightswitchFieldConditionRule
-                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d
                   uid: 883b118b-023a-4c20-956e-1717464edd26
                   value: true
               elementType: craft\elements\Entry
@@ -94,7 +94,7 @@ fieldLayouts:
               conditionRules:
                 -
                   class: craft\fields\conditions\LightswitchFieldConditionRule
-                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d
                   uid: f3cd8447-372b-4498-a9ca-bfc82a6e12e1
                   value: true
               elementType: craft\elements\Entry

diff --git a/api/config/project/fields/answerType--a966d509-84b0-43ab-9a5b-42590a5fb537.yaml b/api/config/project/fields/answerType--a966d509-84b0-43ab-9a5b-42590a5fb537.yaml
@@ -74,6 +74,17 @@ settings:
         -
           - default
           - ''
+    -
+      __assoc__:
+        -
+          - label
+          - Calculator
+        -
+          - value
+          - calculator
+        -
+          - default
+          - ''
 translationKeyFormat: null
 translationMethod: none
 type: craft\fields\Dropdown
diff --git a/api/config/project/fields/equation--e28ed79c-82dd-4c7b-b1cf-abdece40ff5e.yaml b/api/config/project/fields/equation--e28ed79c-82dd-4c7b-b1cf-abdece40ff5e.yaml
@@ -0,0 +1,35 @@
+columnSuffix: nmmhsvza
+contentColumnType: string(21)
+fieldGroup: b0465285-e18b-4739-a3a5-cb0ec0571dd8 # Questions
+handle: equation
+instructions: null
+name: Equation
+searchable: false
+settings:
+  columnType: null
+  options:
+    -
+      __assoc__:
+        -
+          - label
+          - 'Peak Absolute Magnitude'
+        -
+          - value
+          - peakAbsoluteMagnitude
+        -
+          - default
+          - ''
+    -
+      __assoc__:
+        -
+          - label
+          - 'Supernova Distance'
+        -
+          - value
+          - supernovaDistance
+        -
+          - default
+          - ''
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\Dropdown
diff --git a/api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml b/api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml
@@ -40,7 +40,7 @@ settings:
               -
                 - values
                 -
-                  - 24e5bfd8-45a1-4e03-a9ee-e013a26057ec # Light Curve Tool
+                  - 24e5bfd8-45a1-4e03-a9ee-e013a26057ec
   selectionLabel: null
   showSiteMenu: false
   sources:

diff --git a/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml b/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml
@@ -22,7 +22,7 @@ scope:
   - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets
   - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool
   - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector
-  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool
+  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read'
   - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets
   - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information
   - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content

diff --git a/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml b/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml
@@ -22,7 +22,7 @@ scope:
   - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets
   - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool
   - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector
-  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool
+  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read'
   - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets
   - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information
   - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content

diff --git a/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml b/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml
@@ -22,7 +22,7 @@ scope:
   - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets
   - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool
   - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector
-  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool
+  - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read'
   - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets
   - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information
   - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content

diff --git a/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml b/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml
@@ -1,4 +1,4 @@
 - 'blockTypeGroup:6efbdc96-00f5-4e37-953b-d36344f6e1fb' # Configured Widgets
 - 'blockType:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block
 - 'blockType:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block
-- 'blockType:528d82d4-91db-4ee9-9fa2-8d8c7c871c5e' # Light Curve Block
+- 'blockType:528d82d4-91db-4ee9-9fa2-8d8c7c871c5e'
diff --git a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml
@@ -16,5 +16,5 @@
 - 'blockType:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool
 - 'blockType:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool
 - 'blockType:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block
-- 'blockType:a02a930a-9f54-4ae2-8bb2-0e0ab7713759' # Magnitude Scatter Plot
+- 'blockType:a02a930a-9f54-4ae2-8bb2-0e0ab7713759'
 - 'blockType:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution
diff --git a/api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml b/api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml
@@ -11,7 +11,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb # Light Curve Tool
+            fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb
             instructions: null
             label: null
             required: true

diff --git a/...fig/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml b/...fig/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml
@@ -11,7 +11,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb # Light Curve Tool
+            fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb
             instructions: null
             label: null
             required: true