Merge pull request #81 from lsst-epo/EPO-9061

[F] light curve tool setup
lsst-epo · Mar 5, 2024 · afbfb86 · afbfb86
2 parents 2c8cbc2 + f822603
commit afbfb86
Show file tree

Hide file tree

Showing 19 changed files with 330 additions and 15 deletions.
diff --git a/api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml b/api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml
@@ -0,0 +1,101 @@
+fieldLayouts:
+  e86a8755-f86d-48b0-9f4f-787d41b33053:
+    tabs:
+      -
+        elementCondition: null
+        elements:
+          -
+            autocapitalize: true
+            autocomplete: false
+            autocorrect: true
+            class: null
+            disabled: false
+            elementCondition: null
+            id: null
+            inputType: null
+            instructions: null
+            label: null
+            max: null
+            min: null
+            name: null
+            orientation: null
+            placeholder: null
+            readonly: false
+            requirable: false
+            size: null
+            step: null
+            tip: null
+            title: null
+            type: craft\fieldlayoutelements\entries\EntryTitleField
+            uid: 2663dfa8-c4ce-413b-b86b-bfa1f3477a22
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: e5142c27-2288-47b7-bfad-14cd6b3a6653 # Display Name
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: c30b1ba2-8069-4629-8bc8-a18519945d31
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset
+            instructions: null
+            label: null
+            required: true
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: facfe9fc-a5c1-4e50-a961-f067cf9474a6
+            userCondition: null
+            warning: null
+            width: 100
+        name: Content
+        uid: 11aa6c30-e830-4439-8291-7d23c7c219e7
+        userCondition: null
+      -
+        elementCondition: null
+        elements:
+          -
+            elementCondition: null
+            fieldUid: 8af07cbd-3ce8-4e4d-818f-261515be5ac7 # Y-axis Minimum
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 9321a2e1-0a2c-42da-a3d8-b14a86bf5ae6
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 8a46f79c-a6d3-45e0-9e2c-3aef24a91f0a
+            userCondition: null
+            warning: null
+            width: 100
+        name: 'Plot Configuration'
+        uid: 0ea412ea-00e0-4ce5-8aef-faa4c92bcc99
+        userCondition: null
+handle: lightCurveTool
+hasTitleField: true
+name: 'Light Curve Tool'
+section: 28704998-935a-423b-a405-d4ad8b38efa2 # Widgets
+showStatusField: true
+slugTranslationKeyFormat: null
+slugTranslationMethod: none
+sortOrder: 3
+titleFormat: null
+titleTranslationKeyFormat: null
+titleTranslationMethod: none
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
@@ -48,13 +48,67 @@ fieldLayouts:
             fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset
             instructions: null
             label: null
-            required: false
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: cc45dfcd-e889-46fe-8ffb-d27de894632a
             userCondition: null
             warning: null
-            width: 100
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+            instructions: 'Check to include the light curve scatterplot'
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 8419c053-d101-476e-bdf4-84634fb53991
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition:
+              class: craft\elements\conditions\entries\EntryCondition
+              conditionRules:
+                -
+                  class: craft\fields\conditions\LightswitchFieldConditionRule
+                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+                  uid: 883b118b-023a-4c20-956e-1717464edd26
+                  value: true
+              elementType: craft\elements\Entry
+              fieldContext: global
+            fieldUid: 8af07cbd-3ce8-4e4d-818f-261515be5ac7 # Y-axis Minimum
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 352316f2-ae0c-42e8-b5d6-329a277e6b8c
+            userCondition: null
+            warning: null
+            width: 50
+          -
+            elementCondition:
+              class: craft\elements\conditions\entries\EntryCondition
+              conditionRules:
+                -
+                  class: craft\fields\conditions\LightswitchFieldConditionRule
+                  fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot
+                  uid: f3cd8447-372b-4498-a9ca-bfc82a6e12e1
+                  value: true
+              elementType: craft\elements\Entry
+              fieldContext: global
+            fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 0e1e1d41-ac17-48fa-b435-8428acc2af44
+            userCondition: null
+            warning: null
+            width: 50
         name: Content
         uid: 897c373a-7e95-45dd-bcb4-8b0d2d51eced
         userCondition: null

diff --git a/...project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml b/...project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml
@@ -45,25 +45,25 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: f5a2bb9c-1491-4439-a169-d9b2891433a1 # Declination
+            fieldUid: 0e914cfb-a2de-4721-b23b-3b1268529baf # Right Ascension
             instructions: null
             label: null
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: 2df6dc1b-e93a-4118-a050-c628c5390253
+            uid: af316f09-67fc-4593-bec1-d37239168d50
             userCondition: null
             warning: null
             width: 50
           -
             elementCondition: null
-            fieldUid: 0e914cfb-a2de-4721-b23b-3b1268529baf # Right Ascension
+            fieldUid: f5a2bb9c-1491-4439-a169-d9b2891433a1 # Declination
             instructions: null
             label: null
             required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
-            uid: af316f09-67fc-4593-bec1-d37239168d50
+            uid: 2df6dc1b-e93a-4118-a050-c628c5390253
             userCondition: null
             warning: null
             width: 50
@@ -72,7 +72,7 @@ fieldLayouts:
             fieldUid: ad74ba83-53f4-4102-94e9-e9eea0d31171 # Galactic longitude
             instructions: null
             label: null
-            required: true
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: 32cd02b9-680f-43bc-bcfa-cdeceb86c463
@@ -84,7 +84,7 @@ fieldLayouts:
             fieldUid: 693f669b-ba6e-4c91-adad-2543fcd62554 # Galactic Latitude
             instructions: null
             label: null
-            required: true
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: 77aaa931-33c4-45e6-9783-420dd22903f4
@@ -96,7 +96,7 @@ fieldLayouts:
             fieldUid: 6dbf8441-fd70-4b44-a2f8-7b9ba10b20d9 # Distance
             instructions: null
             label: null
-            required: true
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: 45c9e0b9-fc28-4dec-8bd6-f8b0b7bb835f
@@ -136,9 +136,9 @@ fieldLayouts:
           -
             elementCondition: null
             fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album
-            instructions: null
+            instructions: 'Images must be included to be used in a Source Selector'
             label: null
-            required: true
+            required: false
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: df335b0d-254e-41c4-aa02-bd147b6bf3c5

diff --git a/api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml b/api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml
@@ -0,0 +1,14 @@
+columnSuffix: gjnqolwr
+contentColumnType: boolean
+fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets
+handle: includeScatterPlot
+instructions: null
+name: 'Include Scatter Plot'
+searchable: false
+settings:
+  default: false
+  offLabel: null
+  onLabel: null
+translationKeyFormat: null
+translationMethod: none
+type: craft\fields\Lightswitch
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
@@ -0,0 +1,53 @@
+columnSuffix: null
+contentColumnType: string
+fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets
+handle: lightCurveTool
+instructions: null
+name: 'Light Curve Tool'
+searchable: false
+settings:
+  allowSelfRelations: false
+  branchLimit: null
+  localizeRelations: false
+  maintainHierarchy: false
+  maxRelations: 1
+  minRelations: 1
+  selectionCondition:
+    __assoc__:
+      -
+        - elementType
+        - craft\elements\Entry
+      -
+        - fieldContext
+        - global
+      -
+        - class
+        - craft\elements\conditions\entries\EntryCondition
+      -
+        - conditionRules
+        -
+          -
+            __assoc__:
+              -
+                - class
+                - craft\elements\conditions\entries\TypeConditionRule
+              -
+                - uid
+                - 19948eb4-3899-42a0-997b-de2e4dce4ea5
+              -
+                - operator
+                - in
+              -
+                - values
+                -
+                  - 24e5bfd8-45a1-4e03-a9ee-e013a26057ec # Light Curve Tool
+  selectionLabel: null
+  showSiteMenu: false
+  sources:
+    - 'section:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets
+  targetSiteId: null
+  validateRelatedElements: false
+  viewMode: null
+translationKeyFormat: null
+translationMethod: site
+type: craft\fields\Entries
diff --git a/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml b/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml
@@ -12,7 +12,7 @@ settings:
   min: null
   prefix: null
   previewCurrency: null
-  previewFormat: decimal
+  previewFormat: none
   size: null
   suffix: null
 translationKeyFormat: null

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,6 +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
   - '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,6 +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
   - '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,6 +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
   - '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,3 +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
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,4 +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:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution
diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml
@@ -12,6 +12,7 @@ childBlocks:
   - scatterplotTool
   - cameraFilterTool
   - colorFilterToolBlock
+  - magnitudeScatterPlot
   - supernovaDistanceDistribution
 conditions: null
 description: ''

diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml
@@ -12,6 +12,7 @@ childBlocks:
   - scatterplotTool
   - cameraFilterTool
   - colorFilterToolBlock
+  - magnitudeScatterPlot
   - supernovaDistanceDistribution
 conditions: null
 description: ''

diff --git a/...fig/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml b/...fig/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml
@@ -14,7 +14,7 @@ fieldLayouts:
             fieldUid: b9fc39fa-b5b7-4c0d-ab6d-b2f035451482 # Color Filter Tool
             instructions: null
             label: null
-            required: false
+            required: true
             tip: null
             type: craft\fieldlayoutelements\CustomField
             uid: 291f8bfa-50c4-4f89-bfc9-0a44f33d40fe

diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml
@@ -11,6 +11,7 @@ childBlocks:
   - scatterplotTool
   - cameraFilterTool
   - colorFilterToolBlock
+  - magnitudeScatterPlot
   - supernovaDistanceDistribution
 conditions: null
 description: ''