From b3aebebe88a548c1c2cb668b350c09952de48189 Mon Sep 17 00:00:00 2001 From: Matthew Northcott Date: Fri, 5 Aug 2022 13:37:22 +1200 Subject: [PATCH 1/3] Add tooltips to Stepper component --- frontend/src/components/Stepper.js | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/frontend/src/components/Stepper.js b/frontend/src/components/Stepper.js index a8594bd..b914f72 100644 --- a/frontend/src/components/Stepper.js +++ b/frontend/src/components/Stepper.js @@ -4,6 +4,7 @@ import Stepper from '@mui/material/Stepper'; import Step from '@mui/material/Step'; import StepLabel from '@mui/material/StepLabel'; import Button from '@mui/material/Button'; +import Tooltip from '@mui/material/Tooltip'; import LocationStep from './steps/location/LocationStep' import SoilStep from './steps/soilvariant/SoilStep' @@ -13,12 +14,12 @@ import SummaryStep from './steps/summary/SummaryStep'; import ResultsStep from './steps/results/ResultsStep' const steps = [ - { 'label': 'Select location', 'component': LocationStep }, - { 'label': 'Choose soil', 'component': SoilStep }, - { 'label': 'Choose habitat', 'component': HabitatStep }, - { 'label': 'Select zone', 'component': ZoneStep }, - { 'label': 'Summary', 'component': SummaryStep }, - { 'label': 'Results', 'component': ResultsStep } + { 'label': 'Select location', 'component': LocationStep, 'tooltip': "Click on a location on the map" }, + { 'label': 'Choose soil', 'component': SoilStep, 'tooltip': "Describe the moisture content of your soil" }, + { 'label': 'Choose habitat', 'component': HabitatStep, 'tooltip': "Specify type of landscape to be planted" }, + { 'label': 'Select zone', 'component': ZoneStep, 'tooltip': "Specify geographical detail" }, + { 'label': 'Summary', 'component': SummaryStep, 'tooltip': "Check your inputs" }, + { 'label': 'Results', 'component': ResultsStep, 'tooltip': "List of plant species and user guide" } ]; export default function StepperWizard(props) { @@ -58,9 +59,11 @@ export default function StepperWizard(props) { {steps.map((step) => { return ( - - {step.label} - + + + {step.label} + + ); })} -- 2.45.2 From 3a013511aa3a854a46c221573f24d7e37716af25 Mon Sep 17 00:00:00 2001 From: Matthew Northcott Date: Fri, 5 Aug 2022 13:37:46 +1200 Subject: [PATCH 2/3] Display 25 results in table by default --- frontend/src/components/steps/results/PlantList.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/steps/results/PlantList.js b/frontend/src/components/steps/results/PlantList.js index df8058c..78d7e20 100644 --- a/frontend/src/components/steps/results/PlantList.js +++ b/frontend/src/components/steps/results/PlantList.js @@ -84,7 +84,7 @@ TablePaginationActions.propTypes = { export default function PlantResultsTable(props) { const [page, setPage] = React.useState(0); - const [rowsPerPage, setRowsPerPage] = React.useState(5); + const [rowsPerPage, setRowsPerPage] = React.useState(25); // Avoid a layout jump when reaching the last page with empty rows. const emptyRows = -- 2.45.2 From 436075f11c45cac84f21b4f34198388485171ee8 Mon Sep 17 00:00:00 2001 From: Matthew Northcott Date: Fri, 5 Aug 2022 13:39:53 +1200 Subject: [PATCH 3/3] Update homepage title text --- frontend/src/assets/data/staticText.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/frontend/src/assets/data/staticText.json b/frontend/src/assets/data/staticText.json index 16be5fc..ce6155e 100644 --- a/frontend/src/assets/data/staticText.json +++ b/frontend/src/assets/data/staticText.json @@ -1,7 +1,7 @@ { "steps": { "location": { - "title": "Right Plant Right Place Plant Selector Tool for New Zealand.", + "title": "Right Plant Right Place Right Time\nPlant Selector Tool for New Zealand.", "description": "Your native plant selection starts here! Use the map to select a planting site location within New Zealand. On the following pages you will provide more details on your project until the system has enough information to create your plant species list and planting plan. To start, click on the map and pan and zoom to the site location. Once the location is selected, click on the “next step” button to complete the process. Repeat this process for sites at different locations." }, "soil": { @@ -33,4 +33,4 @@ "forestDiagramDescription": "Forest Position Information Diagram" } } -} \ No newline at end of file +} -- 2.45.2