diff --git a/app/src/components/tables/VariableTable.js b/app/src/components/tables/VariableTable.js index 90c76aaa4..9c7a9a2e4 100644 --- a/app/src/components/tables/VariableTable.js +++ b/app/src/components/tables/VariableTable.js @@ -1,6 +1,7 @@ import React, { Component} from 'react' import ReactMarkdown from 'react-markdown' import PropTypes from 'prop-types' +import { isUndefined } from 'lodash' import Sectors from '../badges/Sectors' import { GroupToggleLink, filterGroups, filterField, toggleGroups } from '../../utils' @@ -184,6 +185,36 @@ const VariableTable = function({ config, caption, rows, groups, actions }) { } } + const getUnit = (row) => { + const unit = filterField(config, row.units) + return !isUndefined(unit) && ( + <> +

+ Unit: +

+

+ {unit} +

+ + ) + } + + const getValid = (row) => { + const valid_min = filterField(config, row.valid_min) + const valid_max = filterField(config, row.valid_max) + return !isUndefined(valid_min) && !isUndefined(valid_max) && ( + <> +
+

+ Valid range: +

+

+ {valid_min} - {valid_max} +

+ + ) + } + return (
@@ -194,7 +225,7 @@ const VariableTable = function({ config, caption, rows, groups, actions }) { - + - +
Variable long name Variable specifierUnitUnit / Valid range Resolution Comments @@ -223,7 +254,10 @@ const VariableTable = function({ config, caption, rows, groups, actions }) {
{row.long_name} {getSpecifier(row)}{row.units} + {getUnit(row)} + {getValid(row)} +
    {getResolution(row)} diff --git a/assets/style.css b/assets/style.css index 8f5e62782..0f4220b88 100644 --- a/assets/style.css +++ b/assets/style.css @@ -144,6 +144,7 @@ td :last-child { } td > ul { padding-left: 1.2rem; + margin-bottom: 0.5rem; } td > ul > li { margin-bottom: 0.5rem; @@ -401,6 +402,12 @@ td.nowrap > div { margin-bottom: 0; } +div.separator { + border-top: 1px solid #dee2e6; + margin-top: 0.75rem; + padding-top: 0.75rem; +} + @media print { body { /* fix colors in printing */ diff --git a/definitions/variable/hydrological.yaml b/definitions/variable/hydrological.yaml index 27d850cca..35a3fa706 100644 --- a/definitions/variable/hydrological.yaml +++ b/definitions/variable/hydrological.yaml @@ -376,14 +376,8 @@ - peat - permafrost - water_global - valid_max: - other: 1000.0 - lakes_local: 5.0 - lakes_global: 5.0 - valid_min: - other: 0.0 - lakes_local: 0.0 - lakes_global: 0.0 + valid_max: 1000.0 + valid_min: 0.0 - specifier: snm long_name: Snow Melt