lightweight/right-tree
1
0
Fork 0
Code Issues 17 Pull requests Projects Releases Packages Wiki Activity Actions

Add forest position data as part of the plant results

Browse source
This commit is contained in:
Dana Lambert 2021-11-10 10:33:34 +13:00
parent 4745ed578a
commit 41d61ce3c5
4 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
backend/right_tree/api/csv_utils.py
View file

@ -7,8 +7,8 @@ from .utils import get_address_from_coordinates, get_point_from_coordinates
CSV_FILENAME = 'plants.csv' CSV_FILENAME = 'plants.csv'
HEADER_FIELDS = ['Names', 'Growth form/max height (m)/spacing (m)', 'Preferred moisture regime', HEADER_FIELDS = ['Names', 'Growth Form / Max Height (m) / Spacing (m) / Forest Position', 'Moisture Preferences',
'Tolerances (Water / Drought / Frost / Salinity)', 'Ecosystem services', 'Carbon Sequestration Rate', 'Planting Stage'] 'Tolerances (Water / Drought / Frost / Salinity)', 'Ecosystem Services', 'Carbon Sequestration Rate', 'Planting Stage']
def get_plant_csv_filepath(): def get_plant_csv_filepath():

8
backend/right_tree/api/models.py
View file

@ -123,6 +123,10 @@ class Plant(models.Model):
soil_variants = models.ManyToManyField(SoilVariant) soil_variants = models.ManyToManyField(SoilVariant)
zones = models.ManyToManyField(Zone) zones = models.ManyToManyField(Zone)
@property
def forest_position(self):
return self.zones.all().filter(name="BUSH PROFILE POSITION", variant__in={"Core", "Border", "Skin"}).values('variant')
@property @property
def display_name(self): def display_name(self):
common_name_str = f' / {str(self.commonname)}' if self.commonname is not None else '' common_name_str = f' / {str(self.commonname)}' if self.commonname is not None else ''
@ -132,7 +136,9 @@ class Plant(models.Model):
@property @property
def display_growth_form(self): def display_growth_form(self):
growth_form_str = f'{str(self.growth_form)} / ' if self.growth_form is not None else '' growth_form_str = f'{str(self.growth_form)} / ' if self.growth_form is not None else ''
return f"{growth_form_str}{self.maxheight} / {self.spacing}" forest_position_values_str = ', '.join([position['variant'][0] for position in self.forest_position])
forest_position_str = f' / {forest_position_values_str}' if self.forest_position is not None else ''
return f"{growth_form_str}{self.maxheight} / {self.spacing}{forest_position_str}"
@property @property
def moisture_preferences(self): def moisture_preferences(self):

2
backend/right_tree/api/views.py
View file

@ -115,5 +115,5 @@ class CSVDownloadView(viewsets.ViewSet):
csv_file = open(get_plant_csv_filepath(), 'rb') csv_file = open(get_plant_csv_filepath(), 'rb')
response = HttpResponse(csv_file, content_type='text/csv') response = HttpResponse(csv_file, content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename="test.csv"' response['Content-Disposition'] = 'attachment; filename="plants.csv"'
return response return response

10
frontend/src/components/steps/results/PlantList.js
View file

@ -78,7 +78,7 @@ TablePaginationActions.propTypes = {
rowsPerPage: PropTypes.number.isRequired, rowsPerPage: PropTypes.number.isRequired,
}; };
export default function CustomPaginationActionsTable(props) { export default function PlantResultsTable(props) {
const [page, setPage] = React.useState(0); const [page, setPage] = React.useState(0);
const [rowsPerPage, setRowsPerPage] = React.useState(5); const [rowsPerPage, setRowsPerPage] = React.useState(5);
@ -101,10 +101,10 @@ export default function CustomPaginationActionsTable(props) {
<TableHead> <TableHead>
<TableRow> <TableRow>
<TableCell>Names</TableCell> <TableCell>Names</TableCell>
<TableCell align="right">Growth form/max height&nbsp;(m)/spacing&nbsp;(m)</TableCell> <TableCell align="right">Growth Form / Max Height (m) / Spacing (m) / Forest Position</TableCell>
<TableCell align="right">Preferred&nbsp;moisture&nbsp;regime</TableCell> <TableCell align="right">Moisture Preferences</TableCell>
<TableCell align="right">Tolerances</TableCell> <TableCell align="right">Tolerances (Water / Drought / Frost / Salinity)</TableCell>
<TableCell align="right">Ecosystem&nbsp;services</TableCell> <TableCell align="right">Ecosystem Services</TableCell>
<TableCell align="right">Carbon Sequestration Rate</TableCell> <TableCell align="right">Carbon Sequestration Rate</TableCell>
<TableCell align="right">Planting Stage</TableCell> <TableCell align="right">Planting Stage</TableCell>
</TableRow> </TableRow>