decided to re-add the usesSubquadrats property to the PlotRDS type to…

… avoid cascading issues. Value has been defaulted to false. Additionally updating API endpoints for Personnel table to use RoleID instead of Role
Smithsonian · Jul 5, 2024 · 5715810 · 5715810
1 parent c08b6a3
commit 5715810
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/frontend/app/api/formsearch/personnelblock/route.ts b/frontend/app/api/formsearch/personnelblock/route.ts
@@ -28,8 +28,7 @@ export async function GET(request: NextRequest): Promise<NextResponse<PersonnelR
       personnelID: row.PersonnelID,
       firstName: row.FirstName,
       lastName: row.LastName,
-      role: row.Role
-      // ... other fields as needed
+      roleID: row.RoleID
     }));
 
     // Properly mapping results to return an array of { label, code }

diff --git a/frontend/components/datagrids/applications/quadratsdatagrid.tsx b/frontend/components/datagrids/applications/quadratsdatagrid.tsx
@@ -49,7 +49,7 @@ export default function QuadratsDataGrid() {
     editable: true,
     type: 'singleSelect',
     valueOptions: unitSelectionOptions
-  }
+  };
 
   const addNewRowToGrid = () => {
     const id = randomId();

diff --git a/frontend/components/datagrids/msvdatagrid.tsx b/frontend/components/datagrids/msvdatagrid.tsx
@@ -1,6 +1,6 @@
 "use client";
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { GridActionsCellItem, GridCellParams, GridColDef, GridEventListener, GridFilterModel, GridRowEditStopReasons, GridRowId, GridRowModel, GridRowModes, GridRowModesModel, GridSortModel, GridToolbar, GridToolbarContainer, GridToolbarProps, GridValidRowModel, ToolbarPropsOverrides, useGridApiRef } from '@mui/x-data-grid';
+import { GridActionsCellItem, GridCellParams, GridColDef, GridEventListener, GridFilterModel, GridRowEditStopReasons, GridRowId, GridRowModel, GridRowModes, GridRowModesModel, GridSortModel, GridToolbar, GridToolbarContainer, GridToolbarProps, ToolbarPropsOverrides, useGridApiRef } from '@mui/x-data-grid';
 import { Alert, Button, Checkbox, FormControlLabel, FormGroup, Snackbar } from '@mui/material';
 import AddIcon from '@mui/icons-material/Add';
 import EditIcon from '@mui/icons-material/Edit';
@@ -23,7 +23,6 @@ import { useLockAnimation } from '@/app/contexts/lockanimationcontext';
 import CheckIcon from '@mui/icons-material/Check';
 import ErrorIcon from '@mui/icons-material/Error';
 import HourglassEmptyIcon from '@mui/icons-material/HourglassEmpty';
-import BlockIcon from '@mui/icons-material/Block';
 import { CensusDateRange, OrgCensusRDS } from '@/config/sqlrdsdefinitions/orgcensusrds';
 import { HTTPResponses, unitSelectionOptions } from '@/config/macros';
 import { gridColumnsArrayMSVRDS } from '@/config/sqlrdsdefinitions/views/measurementssummaryviewrds';

diff --git a/frontend/components/forms/personnelautocompletemultiselect.tsx b/frontend/components/forms/personnelautocompletemultiselect.tsx
@@ -91,7 +91,7 @@ export const PersonnelAutocompleteMultiSelect: React.FC<PersonnelAutocompleteMul
         onOpen={() => setOpen(true)}
         onClose={() => setOpen(false)}
         options={options}
-        getOptionLabel={(option) => `${option.lastName}, ${option.firstName} | ${option.role}`}
+        getOptionLabel={(option) => `${option.lastName}, ${option.firstName} | ${option.roleID}`}
         isOptionEqualToValue={(option, value) => JSON.stringify(option) === JSON.stringify(value)}
         loading={loading}
         value={undefined}

diff --git a/frontend/config/sqlrdsdefinitions/tables/coremeasurementsrds.ts b/frontend/config/sqlrdsdefinitions/tables/coremeasurementsrds.ts
@@ -1,6 +1,6 @@
 import {GridColDef} from '@mui/x-data-grid';
 import {IDataMapper, parseDate} from "../../datamapper";
-import {bitToBoolean, booleanToBit, unitSelectionOptions} from '@/config/macros';
+import {bitToBoolean, booleanToBit} from '@/config/macros';
 
 export type CoreMeasurementsRDS = {
   id?: number;

diff --git a/frontend/config/sqlrdsdefinitions/tables/plotrds.ts b/frontend/config/sqlrdsdefinitions/tables/plotrds.ts
@@ -1,6 +1,6 @@
 import {GridColDef} from '@mui/x-data-grid';
 import {IDataMapper} from '../../datamapper';
-import {bitToBoolean, booleanToBit, unitSelectionOptions} from '@/config/macros';
+import { unitSelectionOptions} from '@/config/macros';
 
 export type PlotRDS = {
   id?: number;
@@ -20,6 +20,7 @@ export type PlotRDS = {
   plotShape?: string;
   plotDescription?: string;
   numQuadrats?: number;
+  usesSubquadrats?: boolean;
 };
 
 export type Plot = PlotRDS | undefined;
@@ -63,6 +64,7 @@ export class PlotsMapper implements IDataMapper<PlotsResult, PlotRDS> {
       plotShape: item.PlotShape != null ? String(item.PlotShape) : undefined,
       plotDescription: item.PlotDescription != null ? String(item.PlotDescription) : undefined,
       numQuadrats: item.NumQuadrats !== null ? Number(item.NumQuadrats) : undefined,
+      usesSubquadrats: false
     }));
   }
 

diff --git a/frontend/config/sqlrdsdefinitions/tables/quadratrds.ts b/frontend/config/sqlrdsdefinitions/tables/quadratrds.ts
@@ -1,6 +1,6 @@
 import { GridColDef } from '@mui/x-data-grid';
 import { IDataMapper } from "../../datamapper";
-import { ColumnStates, unitSelectionOptions } from '@/config/macros';
+import { ColumnStates } from '@/config/macros';
 import { ValidationFunction, RowValidationErrors } from '@/config/macros/formdetails';
 
 export type QuadratRDS = {