fix: mortality -> mortalities for bulkUpdate

app/src/features/surveys/animals/profile/captures/components/capture-card-details/components/CaptureDetails.tsx

@@ -3,6 +3,7 @@ import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import { DATE_FORMAT } from 'constants/dateTimeFormats';
 import { ICaptureWithSupplementaryData } from 'features/surveys/animals/profile/captures/AnimalCaptureContainer';
+import { combineDateTime } from 'utils/datetime';
 import { getFormattedDate } from 'utils/Utils';
 
 interface ICaptureDetailsProps {
@@ -19,6 +20,7 @@ export const CaptureDetails = (props: ICaptureDetailsProps) => {
   const { capture } = props;
 
   const captureDate = capture.capture_date;
+  const captureTime = capture.capture_time;
   const captureLocation = capture.capture_location;
   const captureComment = capture.capture_comment;
 
@@ -35,10 +37,10 @@ export const CaptureDetails = (props: ICaptureDetailsProps) => {
             fontWeight={700}
             fontSize="0.75rem"
             sx={{ textTransform: 'uppercase', mb: 0.5 }}>
-            Capture time
+            Capture date
           </Typography>
           <Typography color="textSecondary" variant="body2">
-            {getFormattedDate(DATE_FORMAT.MediumDateTimeFormat, captureDate)}
+            {getFormattedDate(DATE_FORMAT.MediumDateTimeFormat, combineDateTime(captureDate, captureTime))}
           </Typography>
         </Box>
 

app/src/features/surveys/animals/profile/captures/components/capture-card-details/components/ReleaseDetails.tsx

@@ -3,6 +3,7 @@ import Stack from '@mui/material/Stack';
 import Typography from '@mui/material/Typography';
 import { DATE_FORMAT } from 'constants/dateTimeFormats';
 import { ICaptureWithSupplementaryData } from 'features/surveys/animals/profile/captures/AnimalCaptureContainer';
+import { combineDateTime } from 'utils/datetime';
 import { getFormattedDate } from 'utils/Utils';
 
 interface IReleaseDetailsProps {
@@ -19,6 +20,7 @@ export const ReleaseDetails = (props: IReleaseDetailsProps) => {
   const { capture } = props;
 
   const releaseDate = capture.release_date;
+  const releaseTime = capture.release_time;
   const releaseLocation = capture.release_location;
   const releaseComment = capture.release_comment;
 
@@ -36,10 +38,10 @@ export const ReleaseDetails = (props: IReleaseDetailsProps) => {
               fontWeight={700}
               fontSize="0.75rem"
               sx={{ textTransform: 'uppercase', mb: 0.5 }}>
-              Release time
+              Release date
             </Typography>
             <Typography color="textSecondary" variant="body2">
-              {getFormattedDate(DATE_FORMAT.MediumDateTimeFormat, releaseDate)}
+              {getFormattedDate(DATE_FORMAT.MediumDateTimeFormat, combineDateTime(releaseDate, releaseTime))}
             </Typography>
           </Box>
         )}

app/src/features/surveys/animals/profile/mortality/mortality-form/edit/EditMortalityPage.tsx

@@ -135,19 +135,21 @@ export const EditMortalityPage = () => {
 
       // Update existing critter information
       const response = await critterbaseApi.critters.bulkUpdate({
-        mortality: {
-          critter_id: critterbaseCritterId,
-          mortality_id: values.mortality.mortality_id,
-          location: mortalityLocation,
-          mortality_timestamp: mortalityTimestamp,
-          mortality_comment: values.mortality.mortality_comment,
-          proximate_cause_of_death_id: values.mortality.proximate_cause_of_death_id,
-          proximate_cause_of_death_confidence: values.mortality.proximate_cause_of_death_confidence,
-          proximate_predated_by_itis_tsn: values.mortality.proximate_predated_by_itis_tsn,
-          ultimate_cause_of_death_id: values.mortality.ultimate_cause_of_death_id,
-          ultimate_cause_of_death_confidence: values.mortality.ultimate_cause_of_death_confidence,
-          ultimate_predated_by_itis_tsn: values.mortality.ultimate_predated_by_itis_tsn
-        },
+        mortalities: [
+          {
+            critter_id: critterbaseCritterId,
+            mortality_id: values.mortality.mortality_id,
+            location: mortalityLocation,
+            mortality_timestamp: mortalityTimestamp,
+            mortality_comment: values.mortality.mortality_comment,
+            proximate_cause_of_death_id: values.mortality.proximate_cause_of_death_id,
+            proximate_cause_of_death_confidence: values.mortality.proximate_cause_of_death_confidence,
+            proximate_predated_by_itis_tsn: values.mortality.proximate_predated_by_itis_tsn,
+            ultimate_cause_of_death_id: values.mortality.ultimate_cause_of_death_id,
+            ultimate_cause_of_death_confidence: values.mortality.ultimate_cause_of_death_confidence,
+            ultimate_predated_by_itis_tsn: values.mortality.ultimate_predated_by_itis_tsn
+          }
+        ],
         markings: [...markingsForUpdate, ...markingsForDelete],
         qualitative_measurements: [...qualitativeMeasurementsForUpdate, ...qualitativeMeasurementsForDelete],
         quantitative_measurements: [...quantitativeMeasurementsForUpdate, ...quantitativeMeasurementsForDelete]

app/src/features/surveys/view/survey-animals/animal.ts

@@ -2,7 +2,6 @@ import { DATE_LIMIT } from 'constants/dateTimeFormats';
 import { default as dayjs } from 'dayjs';
 import {
   ICritterDetailedResponse,
-  ICritterSimpleResponse,
   IQualitativeMeasurementCreate,
   IQualitativeMeasurementUpdate,
   IQuantitativeMeasurementCreate,
@@ -237,10 +236,10 @@ export type ICreateCritterFamily = InferType<typeof CreateCritterFamilySchema>;
 export type ICreateCritterMortality = InferType<typeof CreateCritterMortalitySchema>;
 
 /**
- * Adding data to a critter in bulk
+ * Adding data to a critters in bulk
  */
 export type IBulkCreate = {
-  critter?: ICritterSimpleResponse;
+  critters?: ICreateCritter[];
   qualitative_measurements?: IQualitativeMeasurementCreate[];
   quantitative_measurements?: IQuantitativeMeasurementCreate[];
   captures?: ICreateCritterCapture[];
@@ -250,14 +249,14 @@ export type IBulkCreate = {
 };
 
 /**
- * Editing data for a critter in bulk
+ * Editing data for a critters in bulk
  */
 export type IBulkUpdate = {
-  critter?: ICritterSimpleResponse;
+  critters?: ICreateCritter[];
   qualitative_measurements?: IQualitativeMeasurementUpdate[];
   quantitative_measurements?: IQuantitativeMeasurementUpdate[];
   captures?: ICreateCritterCapture[];
-  mortality?: ICreateCritterMortality;
+  mortalities?: ICreateCritterMortality[];
   markings?: ICreateCritterMarking[];
   collections?: ICreateCritterCollectionUnit[];
 };

app/src/interfaces/useCritterApi.interface.ts

@@ -2,6 +2,16 @@ import { ICreateCritterCollectionUnit } from 'features/surveys/view/survey-anima
 import { Feature } from 'geojson';
 import { ITaxonomy } from './useTaxonomyApi.interface';
 
+export interface ICritterCreate {
+  critter_id?: string;
+  wlh_id?: string | null;
+  animal_id?: string | null;
+  sex: string;
+  itis_tsn: number;
+  responsible_region_nr_id?: string | null;
+  critter_comment?: string | null;
+}
+
 export interface ICreateEditAnimalRequest {
   critter_id?: string;
   nickname: string;
@@ -191,6 +201,10 @@ export type IQuantitativeMeasurementCreate = {
   measured_timestamp?: string | null;
 };
 
+export type ICritterUpdate = ICritterCreate & {
+  critter_id: string;
+};
+
 export type IQualitativeMeasurementUpdate = IQualitativeMeasurementCreate & {
   measurement_qualitative_id: string;
 };

app/src/utils/datetime.ts

@@ -0,0 +1,13 @@
+/**
+ * Combine date and time and return ISO string.
+ *
+ * @param {string} date - String date ie: '2024-01-01'
+ * @param {string | null} [time] - Optional time ie: '00:10:10'
+ * @returns {string} ISO date string
+ */
+export const combineDateTime = (date: string, time?: string | null) => {
+  if (date && time) {
+    return new Date(`${date}T${time}`).toISOString();
+  }
+  return new Date(date).toISOString();
+};