Update Layouts For Multiline Notes (#13)

collectionspace · Jan 17, 2024 · d21b6d1 · d21b6d1
1 parent 097e876
commit d21b6d1
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 28 deletions.
diff --git a/src/plugins/recordTypes/acquisition/forms/default.jsx b/src/plugins/recordTypes/acquisition/forms/default.jsx
@@ -71,11 +71,15 @@ const template = (configContext) => {
 
         <Field name="approvalGroupList">
           <Field name="approvalGroup">
-            <Field name="approvalGroup" />
-            <Field name="approvalIndividual" />
-            <Field name="approvalStatus" />
-            <Field name="approvalDate" />
-            <Field name="approvalNote" />
+            <Panel>
+              <Row>
+                <Field name="approvalGroup" />
+                <Field name="approvalIndividual" />
+                <Field name="approvalStatus" />
+                <Field name="approvalDate" />
+              </Row>
+              <Field name="approvalNote" />
+            </Panel>
           </Field>
         </Field>
         <Field name="acquisitionNote" />

diff --git a/src/plugins/recordTypes/collectionobject/forms/default.jsx b/src/plugins/recordTypes/collectionobject/forms/default.jsx
@@ -77,10 +77,14 @@ const template = (configContext) => {
 
         <Field name="annotationGroupList" subpath="ns2:collectionobjects_annotation">
           <Field name="annotationGroup">
-            <Field name="annotationType" />
-            <Field name="annotationNote" />
-            <Field name="annotationDate" />
-            <Field name="annotationAuthor" />
+            <Panel>
+              <Row>
+                <Field name="annotationType" />
+                <Field name="annotationDate" />
+                <Field name="annotationAuthor" />
+              </Row>
+              <Field name="annotationNote" />
+            </Panel>
           </Field>
         </Field>
 

diff --git a/src/plugins/recordTypes/intake/forms/default.jsx b/src/plugins/recordTypes/intake/forms/default.jsx
@@ -49,11 +49,15 @@ const template = (configContext) => {
 
         <Field name="approvalGroupList">
           <Field name="approvalGroup">
-            <Field name="approvalGroup" />
-            <Field name="approvalIndividual" />
-            <Field name="approvalStatus" />
-            <Field name="approvalDate" />
-            <Field name="approvalNote" />
+            <Panel>
+              <Row>
+                <Field name="approvalGroup" />
+                <Field name="approvalIndividual" />
+                <Field name="approvalStatus" />
+                <Field name="approvalDate" />
+              </Row>
+              <Field name="approvalNote" />
+            </Panel>
           </Field>
         </Field>
 

diff --git a/src/plugins/recordTypes/loanin/fields.js b/src/plugins/recordTypes/loanin/fields.js
@@ -54,9 +54,6 @@ export default (configContext) => {
               repeating: true,
               view: {
                 type: CompoundInput,
-                props: {
-                  tabular: true,
-                },
               },
             },
             loaninStatusLHMC: {
@@ -111,6 +108,9 @@ export default (configContext) => {
                 }),
                 view: {
                   type: TextInput,
+                  props: {
+                    multiline: true,
+                  },
                 },
               },
             },

diff --git a/src/plugins/recordTypes/loanin/forms/default.jsx b/src/plugins/recordTypes/loanin/forms/default.jsx
@@ -23,10 +23,14 @@ const template = (configContext) => {
 
         <Field name="loaninStatusLHMCGroupList" subpath="ns2:loansin_lhmc">
           <Field name="loaninStatusLHMCGroup">
-            <Field name="loaninStatusLHMC" />
-            <Field name="loaninStatusDateLHMC" />
-            <Field name="loaninStatusNoteLHMC" />
-            <Field name="loaninStatusAuthorizerLHMC" />
+            <Panel>
+              <Row>
+                <Field name="loaninStatusLHMC" />
+                <Field name="loaninStatusDateLHMC" />
+                <Field name="loaninStatusAuthorizerLHMC" />
+              </Row>
+              <Field name="loaninStatusNoteLHMC" />
+            </Panel>
           </Field>
         </Field>
 

diff --git a/src/plugins/recordTypes/loanout/fields.js b/src/plugins/recordTypes/loanout/fields.js
@@ -54,9 +54,6 @@ export default (configContext) => {
               repeating: true,
               view: {
                 type: CompoundInput,
-                props: {
-                  tabular: true,
-                },
               },
             },
             loanoutStatusLHMC: {
@@ -111,6 +108,9 @@ export default (configContext) => {
                 }),
                 view: {
                   type: TextInput,
+                  props: {
+                    multiline: true,
+                  },
                 },
               },
             },

diff --git a/src/plugins/recordTypes/loanout/forms/default.jsx b/src/plugins/recordTypes/loanout/forms/default.jsx
@@ -41,10 +41,14 @@ const template = (configContext) => {
 
         <Field name="loanoutStatusLHMCGroupList" subpath="ns2:loansout_lhmc">
           <Field name="loanoutStatusLHMCGroup">
-            <Field name="loanoutStatusLHMC" />
-            <Field name="loanoutStatusDateLHMC" />
-            <Field name="loanoutStatusNoteLHMC" />
-            <Field name="loanoutStatusAuthorizerLHMC" />
+            <Panel>
+              <Row>
+                <Field name="loanoutStatusLHMC" />
+                <Field name="loanoutStatusDateLHMC" />
+                <Field name="loanoutStatusAuthorizerLHMC" />
+              </Row>
+              <Field name="loanoutStatusNoteLHMC" />
+            </Panel>
           </Field>
         </Field>