Skip to content

Commit

Permalink
change padding and margins, miscellaneous styling
Browse files Browse the repository at this point in the history
  • Loading branch information
mauberti-bc committed Sep 24, 2024
1 parent e21624d commit 33186e5
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,7 @@ export const ObservationQuantitativeMeasurementColDef = (props: {
hasError: (params: GridCellParams) => boolean;
}): GridColDef<IObservationTableRow> => {
const { measurement, hasError } = props;
console.log(measurement.measurement_desc)
console.log(measurement.measurement_desc);

Check warning on line 310 in app/src/features/surveys/observations/observations-table/grid-column-definitions/GridColumnDefinitions.tsx

View check run for this annotation

Codecov / codecov/patch

app/src/features/surveys/observations/observations-table/grid-column-definitions/GridColumnDefinitions.tsx#L310

Added line #L310 was not covered by tests
return {
field: measurement.taxon_measurement_id,
headerName: measurement.measurement_name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export const SamplingSiteListSite = (props: ISamplingSiteListSiteProps) => {
);
})}
</List>
<Box height="300px" flex="1 1 auto" mx={1} my={2}>
<Box height="250px" flex="1 1 auto" mx={1} m={2}>
<SurveyMap staticLayers={staticLayers} isLoading={false} />
</Box>
</AccordionDetails>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const SurveyObservationTabularDataContainer = (props: ISurveyObservationTabularD
</ToggleButtonGroup>
</Box>
<Divider />
<Box flex="1 1 auto" overflow="hidden">
<Box flex="1 1 auto" overflow="hidden" mt={1}>
{activeDataView === SurveyObservationTabularDataContainerViewEnum.COUNTS && (
<SurveySpatialObservationTable isLoading={isLoading} />
)}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ export const SurveySamplingTabs = () => {

<Divider />

<Box p={2} position="relative">
<Box px={2} position="relative">
{activeView === SurveySamplingView.TECHNIQUES && (
<>
<LoadingGuard
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { mdiEye, mdiPaw, mdiWifiMarker } from '@mdi/js';
import Paper from '@mui/material/Paper';
import { TelemetryDataContextProvider } from 'contexts/telemetryDataContext';
import { SurveySpatialAnimal } from 'features/surveys/view/survey-spatial/components/animal/SurveySpatialAnimal';
import { SurveySpatialObservation } from 'features/surveys/view/survey-spatial/components/observation/SurveySpatialObservation';
Expand Down Expand Up @@ -44,7 +43,7 @@ export const SurveySpatialContainer = (): JSX.Element => {
}, [observationsContext.observationsDataLoader.data]);

return (
<Paper>
<>
{/* Toolbar for switching between different dataset views */}
<SurveySpatialToolbar
activeView={activeView}
Expand Down Expand Up @@ -79,6 +78,6 @@ export const SurveySpatialContainer = (): JSX.Element => {
</TelemetryDataContextProvider>
)}
{isEqual(SurveySpatialDatasetViewEnum.ANIMALS, activeView) && <SurveySpatialAnimal />}
</Paper>
</>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export const SurveySpatialObservation = () => {
</Box>

{/* Display data table with observation details */}
<Box height="500px" display="flex" flexDirection="column" p={2}>
<Box height="500px" display="flex" flexDirection="column" px={2} pt={2}>
<SurveyObservationTabularDataContainer isLoading={observationsGeometryDataLoader.isLoading} />
</Box>
</>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export const SurveySpatialObservationTable = (props: ISurveyDataObservationTable
hasNoData={!rows.length}
hasNoDataFallback={
<NoDataOverlay
height="250px"
height="100%"
title="Add Observations"
subtitle="After adding sampling information, upload observations and link them to sampling efforts"
icon={mdiArrowTopRight}
Expand Down

0 comments on commit 33186e5

Please sign in to comment.