[C] add questions to display table

lsst-epo · Mar 7, 2024 · 5fadbe3 · 5fadbe3
1 parent 460a479
commit 5fadbe3
Show file tree

Hide file tree

Showing 4 changed files with 124 additions and 14 deletions.
diff --git a/api/config/project/fields/displayTable--56bdf2e8-b9b4-425d-a189-fc7b22f5d169.yaml b/api/config/project/fields/displayTable--56bdf2e8-b9b4-425d-a189-fc7b22f5d169.yaml
@@ -7,7 +7,7 @@ name: 'Display Table'
 searchable: false
 settings:
   blockTypeFields: 0
-  changedFieldIndicator: 1112726131
+  changedFieldIndicator: 2042855894
   columns:
     __assoc__:
       -
@@ -17,8 +17,15 @@ settings:
             -
               - width
               - ''
-  contentTable: '{{%stc_displaytable_1}}'
-  fieldLayout: table
+      -
+        - 301c4afd-e88a-4847-a0ce-1b134b5c3741 # Previous Question
+        -
+          __assoc__:
+            -
+              - width
+              - ''
+  contentTable: '{{%stc_displaytable}}'
+  fieldLayout: row
   maxRows: null
   minRows: 1
   propagationKeyFormat: null

diff --git a/api/config/project/matrixBlockTypes/tableCell--7c04d87d-2b5d-4ba8-841a-2d4f2a1047dd.yaml b/api/config/project/matrixBlockTypes/tableCell--7c04d87d-2b5d-4ba8-841a-2d4f2a1047dd.yaml
@@ -7,7 +7,7 @@ fieldLayouts:
         elements:
           -
             elementCondition: null
-            fieldUid: 3173102a-6f80-4a4f-954b-1d3e151fb21a # Cell Content
+            fieldUid: 3173102a-6f80-4a4f-954b-1d3e151fb21a # Text
             instructions: null
             label: null
             required: false
@@ -19,7 +19,19 @@ fieldLayouts:
             width: 100
           -
             elementCondition: null
-            fieldUid: 48bc5283-dac6-4340-931a-6c01fa00bfb8 # Row Header
+            fieldUid: 2922f7b5-8979-4fa5-8221-b442515b48c1 # Equation
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 70b4323d-2958-4cf0-8689-63fda09a1102
+            userCondition: null
+            warning: null
+            width: 100
+          -
+            elementCondition: null
+            fieldUid: 48bc5283-dac6-4340-931a-6c01fa00bfb8 # Header
             instructions: null
             label: null
             required: false
@@ -33,13 +45,13 @@ fieldLayouts:
         uid: 1da41301-55e3-4b0e-8ea4-1640d39c0e1f
         userCondition: null
 fields:
-  48bc5283-dac6-4340-931a-6c01fa00bfb8: # Row Header
+  48bc5283-dac6-4340-931a-6c01fa00bfb8: # Header
     columnSuffix: hpuakkch
     contentColumnType: boolean
     fieldGroup: null
     handle: rowHeader
-    instructions: 'Enable if this cell labels is a header for it''s horizontal table row. Only applies to first cell in a row.'
-    name: 'Row Header'
+    instructions: 'Check if this cell is a header. This should only be used for the first cell in each row. The first row of a table is a header by default.'
+    name: Header
     searchable: false
     settings:
       default: false
@@ -48,13 +60,33 @@ fields:
     translationKeyFormat: null
     translationMethod: none
     type: craft\fields\Lightswitch
-  3173102a-6f80-4a4f-954b-1d3e151fb21a: # Cell Content
+  2922f7b5-8979-4fa5-8221-b442515b48c1: # Equation
+    columnSuffix: avhnncix
+    contentColumnType: text
+    fieldGroup: null
+    handle: equation
+    instructions: 'LaTeX format input, reference the Temml documentation for help formatting: https://temml.org/docs/en/supported'
+    name: Equation
+    searchable: false
+    settings:
+      byteLimit: null
+      charLimit: null
+      code: true
+      columnType: null
+      initialRows: 4
+      multiline: false
+      placeholder: null
+      uiMode: normal
+    translationKeyFormat: null
+    translationMethod: none
+    type: craft\fields\PlainText
+  3173102a-6f80-4a4f-954b-1d3e151fb21a: # Text
     columnSuffix: qmgrhddl
     contentColumnType: text
     fieldGroup: null
     handle: cellContent
     instructions: null
-    name: 'Cell Content'
+    name: Text
     searchable: false
     settings:
       byteLimit: null

diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml
@@ -138,7 +138,7 @@ meta:
     42a4cddb-b253-4aeb-b097-2073b5707677: "Object Name" # Object Name
     42e7cc8d-a889-4715-a93e-d6d897644070: "Object Caption" # Object Caption
     43cffcf1-c54b-45c3-b157-9bdefaa3ce36: Label # Label
-    48bc5283-dac6-4340-931a-6c01fa00bfb8: "Row Header" # Row Header
+    48bc5283-dac6-4340-931a-6c01fa00bfb8: Header # Header
     53df9537-d85e-4fd3-9e4c-b203594ada7c: "Reference Modal Block" # Reference Modal Block
     55ef91b0-a2ba-4935-8d49-9e3e1d3dcc91: "Reference Modal Entries" # Reference Modal Entries
     56bdf2e8-b9b4-425d-a189-fc7b22f5d169: "Display Table" # Display Table
@@ -153,6 +153,7 @@ meta:
     210fad18-08a1-4042-821c-bf4a09c06ec6: "Question Type" # Question Type
     222de7cf-741d-4d1f-b274-acc85a3c454c: "Link To" # Link To
     297d2268-f298-40a1-bec3-a1c836a69e38: "Source Selector" # Source Selector
+    301c4afd-e88a-4847-a0ce-1b134b5c3741: "Previous Question" # Previous Question
     356c97b0-54e5-44bb-901e-9d92a314134f: FR # FR
     367fe8fa-1963-4fe0-9e02-3c0866c0b5bb: "Color Filter Tool Block" # Color Filter Tool Block
     430f132d-8145-4e49-ba49-e9b839f7898e: "Source Selector Block" # Source Selector Block
@@ -167,6 +168,7 @@ meta:
     986be506-1a98-4a56-9a16-1e2270071a95: isActive # isActive
     1601c7a8-2437-4b8f-b2f2-116f4c043402: "Site Information" # Site Information
     2599f40c-bfbc-4db6-bf56-cb9f48ad01bf: "Question Widgets Block" # Question Widgets Block
+    2922f7b5-8979-4fa5-8221-b442515b48c1: Equation # Equation
     3912a1a0-e71b-44b3-bcf4-976c0564975e: "Filter Tool" # Filter Tool
     4994da56-0831-400d-b1d1-ade611fd5da1: Title # Title
     5548ce5c-5ad4-494e-93be-8ff129618d20: Text # Text
@@ -189,7 +191,7 @@ meta:
     547128fa-4529-4483-9968-66425996b69f: EN # EN
     0601483c-a943-42a3-b1a5-e003b05618dc: "Question Block" # Question Block
     947400f5-3c2d-403a-b94e-68715e48a9c0: "Left Column" # Left Column
-    3173102a-6f80-4a4f-954b-1d3e151fb21a: "Cell Content" # Cell Content
+    3173102a-6f80-4a4f-954b-1d3e151fb21a: Text # Text
     04341069-ff31-4470-970a-8c7e82ec37eb: "Student Schema" # Student Schema
     4941158b-702a-45b4-8da5-12ed4202efae: Name # Name
     7033117c-c3b9-4794-9a6d-cbbbae2010af: "Supernova Distance & Distribution" # Supernova Distance & Distribution

diff --git a/api/config/project/superTableBlockTypes/19f441a5-4dd4-4084-997f-57a9830c3ee7.yaml b/api/config/project/superTableBlockTypes/19f441a5-4dd4-4084-997f-57a9830c3ee7.yaml
@@ -1,4 +1,4 @@
-changedFieldIndicator: null
+changedFieldIndicator: 1074543014
 field: 56bdf2e8-b9b4-425d-a189-fc7b22f5d169 # Display Table
 fieldLayouts:
   5286515a-8954-4555-b8a8-da61ee01b204:
@@ -18,10 +18,79 @@ fieldLayouts:
             userCondition: null
             warning: null
             width: 100
+          -
+            elementCondition: null
+            fieldUid: 301c4afd-e88a-4847-a0ce-1b134b5c3741 # Previous Question
+            instructions: null
+            label: null
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 7139bea6-eea9-432e-a98b-1765cbb9c1fd
+            userCondition: null
+            warning: null
+            width: 100
         name: Content
         uid: 442d40cd-3fe9-44e3-a862-a0245cd4be94
         userCondition: null
 fields:
+  301c4afd-e88a-4847-a0ce-1b134b5c3741: # Previous Question
+    columnSuffix: null
+    contentColumnType: string
+    fieldGroup: null
+    handle: previousQuestion
+    instructions: 'Picking a previous question will display it''s table contents as read-only cells, using the table header from the current table.'
+    name: 'Previous Question'
+    searchable: false
+    settings:
+      allowSelfRelations: false
+      branchLimit: null
+      localizeRelations: false
+      maintainHierarchy: false
+      maxRelations: 1
+      minRelations: null
+      selectionCondition:
+        __assoc__:
+          -
+            - elementType
+            - craft\elements\Entry
+          -
+            - fieldContext
+            - global
+          -
+            - class
+            - craft\elements\conditions\entries\EntryCondition
+          -
+            - conditionRules
+            -
+              -
+                __assoc__:
+                  -
+                    - class
+                    - craft\fields\conditions\OptionsFieldConditionRule
+                  -
+                    - uid
+                    - 4f97a8ea-88d5-4a8d-87d4-ecfcf0380ea1
+                  -
+                    - operator
+                    - in
+                  -
+                    - values
+                    -
+                      - tabular
+                  -
+                    - fieldUid
+                    - a966d509-84b0-43ab-9a5b-42590a5fb537 # Answer Type
+      selectionLabel: null
+      showSiteMenu: false
+      sources:
+        - 'section:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions
+      targetSiteId: null
+      validateRelatedElements: false
+      viewMode: null
+    translationKeyFormat: null
+    translationMethod: site
+    type: craft\fields\Entries
   839bfa4f-5a09-4b32-b1eb-e0fef7b7beda: # Table Row
     columnSuffix: null
     contentColumnType: string
@@ -33,7 +102,7 @@ fields:
     settings:
       contentTable: '{{%matrixcontent_tablerow}}'
       maxBlocks: null
-      minBlocks: 1
+      minBlocks: null
       propagationKeyFormat: null
       propagationMethod: all
     translationKeyFormat: null