From c2bfcdd91a1d6abf2bf3a1e20833d319ffb31710 Mon Sep 17 00:00:00 2001
From: Michael Ritter <mike.ritter@lyrasis.org>
Date: Thu, 29 Aug 2024 11:58:31 -0600
Subject: [PATCH 1/2] DRYD-1496: Add objectCountUnit

---
 .../recordTypes/collectionobject/fields.js    | 20 +++++++++++++++++++
 .../collectionobject/forms/default.jsx        |  1 +
 .../collectionobject/forms/photo.jsx          |  1 +
 .../collectionobject/forms/public.jsx         |  1 +
 .../collectionobject/forms/timebased.jsx      |  1 +
 5 files changed, 24 insertions(+)

diff --git a/src/plugins/recordTypes/collectionobject/fields.js b/src/plugins/recordTypes/collectionobject/fields.js
index 94183346..4d940e12 100644
--- a/src/plugins/recordTypes/collectionobject/fields.js
+++ b/src/plugins/recordTypes/collectionobject/fields.js
@@ -6318,6 +6318,26 @@ export default (configContext) => {
                 },
               },
             },
+            objectCountUnit: {
+              [config]: {
+                messages: defineMessages({
+                  fullName: {
+                    id: 'field.collectionobjects_common.objectCountUnit.fullName',
+                    defaultMessage: 'Object count unit',
+                  },
+                  name: {
+                    id: 'field.collectionobjects_common.objectCountUnit.name',
+                    defaultMessage: 'Unit',
+                  },
+                }),
+                view: {
+                  type: TermPickerInput,
+                  props: {
+                    source: 'objectcountunit',
+                  },
+                },
+              },
+            },
             objectCountCountedBy: {
               [config]: {
                 messages: defineMessages({
diff --git a/src/plugins/recordTypes/collectionobject/forms/default.jsx b/src/plugins/recordTypes/collectionobject/forms/default.jsx
index f9b81bfd..99f6c6ff 100644
--- a/src/plugins/recordTypes/collectionobject/forms/default.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/default.jsx
@@ -130,6 +130,7 @@ const template = (configContext) => {
           <Field name="objectCountGroup">
             <Field name="objectCount" />
             <Field name="objectCountType" />
+            <Field name="objectCountUnit" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/photo.jsx b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
index 223aa6e4..63ac8285 100644
--- a/src/plugins/recordTypes/collectionobject/forms/photo.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
@@ -91,6 +91,7 @@ const template = (configContext) => {
           <Field name="objectCountGroup">
             <Field name="objectCount" />
             <Field name="objectCountType" />
+            <Field name="objectCountUnit" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/public.jsx b/src/plugins/recordTypes/collectionobject/forms/public.jsx
index f16e15da..6a16e85a 100644
--- a/src/plugins/recordTypes/collectionobject/forms/public.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/public.jsx
@@ -79,6 +79,7 @@ const template = (configContext) => {
           <Field name="objectCountGroup">
             <Field name="objectCount" />
             <Field name="objectCountType" />
+            <Field name="objectCountUnit" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/timebased.jsx b/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
index 6c21b584..c7328d96 100644
--- a/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
@@ -113,6 +113,7 @@ const template = (configContext) => {
           <Field name="objectCountGroup">
             <Field name="objectCount" />
             <Field name="objectCountType" />
+            <Field name="objectCountUnit" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />

From 3ccee41b13201e8c92342e7b02842f25a46ed54d Mon Sep 17 00:00:00 2001
From: Michael Ritter <mike.ritter@lyrasis.org>
Date: Wed, 11 Sep 2024 13:11:12 -0600
Subject: [PATCH 2/2] Reorder objectCountUnit per feedback

---
 src/plugins/recordTypes/collectionobject/forms/default.jsx   | 2 +-
 src/plugins/recordTypes/collectionobject/forms/photo.jsx     | 2 +-
 src/plugins/recordTypes/collectionobject/forms/public.jsx    | 2 +-
 src/plugins/recordTypes/collectionobject/forms/timebased.jsx | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/plugins/recordTypes/collectionobject/forms/default.jsx b/src/plugins/recordTypes/collectionobject/forms/default.jsx
index 99f6c6ff..93a16af2 100644
--- a/src/plugins/recordTypes/collectionobject/forms/default.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/default.jsx
@@ -129,8 +129,8 @@ const template = (configContext) => {
         <Field name="objectCountGroupList">
           <Field name="objectCountGroup">
             <Field name="objectCount" />
-            <Field name="objectCountType" />
             <Field name="objectCountUnit" />
+            <Field name="objectCountType" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/photo.jsx b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
index 63ac8285..ae7933c9 100644
--- a/src/plugins/recordTypes/collectionobject/forms/photo.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/photo.jsx
@@ -90,8 +90,8 @@ const template = (configContext) => {
         <Field name="objectCountGroupList">
           <Field name="objectCountGroup">
             <Field name="objectCount" />
-            <Field name="objectCountType" />
             <Field name="objectCountUnit" />
+            <Field name="objectCountType" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/public.jsx b/src/plugins/recordTypes/collectionobject/forms/public.jsx
index 6a16e85a..86bad9ac 100644
--- a/src/plugins/recordTypes/collectionobject/forms/public.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/public.jsx
@@ -78,8 +78,8 @@ const template = (configContext) => {
         <Field name="objectCountGroupList">
           <Field name="objectCountGroup">
             <Field name="objectCount" />
-            <Field name="objectCountType" />
             <Field name="objectCountUnit" />
+            <Field name="objectCountType" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />
diff --git a/src/plugins/recordTypes/collectionobject/forms/timebased.jsx b/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
index c7328d96..7d33ba88 100644
--- a/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
+++ b/src/plugins/recordTypes/collectionobject/forms/timebased.jsx
@@ -112,8 +112,8 @@ const template = (configContext) => {
         <Field name="objectCountGroupList">
           <Field name="objectCountGroup">
             <Field name="objectCount" />
-            <Field name="objectCountType" />
             <Field name="objectCountUnit" />
+            <Field name="objectCountType" />
             <Field name="objectCountCountedBy" />
             <Field name="objectCountDate" />
             <Field name="objectCountNote" />