Skip to content

Commit 9e45b4b

Browse files
eatyourpeaseatyourpeas
authored
Merge pull request #142 from rcpch/cdc-heights
cdc-heights
2 parents 47abacd + 876bbc0 commit 9e45b4b

22 files changed

+30507
-10072
lines changed

‎package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@rcpch/digital-growth-charts-react-component-library",
3-
"version": "7.3.0",
3+
"version": "7.3.1",
44
"description": "A React component library for the RCPCH digital growth charts using Rollup, TypeScript and Styled-Components",
55
"main": "build/index.js",
66
"module": "build/esm.index.js",

‎src/CentileChart/CentileChart.test.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -610,7 +610,7 @@ describe('All tests relate to rendering the text in the height centile chart for
610610
render(<CentileChart {...props} />);
611611

612612
// the default is to not render centile labels
613-
expect(screen.queryAllByText('99.6th')[0]).toBeUndefined();
613+
expect(screen.queryAllByText('99.6th')[0]).toBeInTheDocument();
614614

615615
// fireEvent.click(screen.getByTestId('gradient-labels-button'));
616616
// expect(screen.getAllByText('99.6th')[0]).toBeInTheDocument();

‎src/CentileChart/CentileChart.tsx

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import tailoredXTickValues from '../functions/tailoredXTickValues';
2222
import defaultToggles from '../functions/defaultToggles';
2323
import { tooltipText } from '../functions/tooltips';
2424
import { delayedPubertyThreshold, makePubertyThresholds, lowerPubertyBorder } from '../functions/DelayedPuberty';
25-
import { nondisjunctionThresholds, makeNonDisjunctionThresholds } from '../functions/nondisjunctionLines';
25+
import { makeNonDisjunctionThresholds } from '../functions/nondisjunctionLines';
2626
import { getFilteredMidParentalHeightData } from '../functions/getFilteredMidParentalHeightData';
2727
import { isCrowded } from '../functions/isCrowded';
2828
import { labelAngle } from '../functions/labelAngle';
@@ -104,7 +104,7 @@ function CentileChart({
104104
const chartRef = useRef<any>();
105105
const [active, setActive] = useState(false);
106106
const [fullScreen, setFullScreen] = useState(true);
107-
const [centileLabels, setCentileLabels] = useState(false);
107+
const [centileLabels, setCentileLabels] = useState(true);
108108

109109
// save & destruct domains and data on initial render and when dependencies change
110110

@@ -160,8 +160,8 @@ function CentileChart({
160160
if (reference === 'uk-who' && measurementMethod === 'height') {
161161
pubertyThresholds = makePubertyThresholds(domains, sex);
162162
}
163-
if (reference === 'uk-who' || reference === 'cdc') {
164-
if (reference === 'cdc' && measurementMethod === 'ofc') {
163+
if (reference === 'uk-who' || reference === 'cdc' || reference === 'who') {
164+
if ((reference === 'cdc' || reference === 'who') && measurementMethod === 'ofc') {
165165
// no nondisjunction lines for CDC OFC
166166
nondisjunctionThresholds = null;
167167
} else {

‎src/RCPCHChart/RCPCHChart.stories.tsx

+22
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import { maleCDCBMIExcess } from '../testParameters/measurements/maleCDCBMIExces
1717
import { childTrisomyAAPData } from '../testParameters/measurements/childTrisomyAAPData.ts';
1818
import { maleWeightT21AAPData } from '../testParameters/measurements/maleWeightT21AAP.ts';
1919
import { whoToNineteenGirlHeight } from '../testParameters/measurements/whoHeightToNineteenGirl.ts';
20+
import { whoOneToFiveBoysHeight } from '../testParameters/measurements/whoHeightBoysOneToFive.ts';
2021
// import { cdcFentonGirlLength } from '../testParameters/measurements/fenton/cdcFentonGirlLength';
2122
// import { cdcFentonGirlWeight } from '../testParameters/measurements/fenton/cdcFentonGirlWeight.ts';
2223

@@ -742,6 +743,27 @@ export const CentileChartTrisomy21AAPBoysHeadCircumference: Story = {
742743
},
743744
};
744745

746+
export const CentileChartWHOBoysHeight: Story = {
747+
args: {
748+
title: 'Patient Name - Hospital Number',
749+
measurementMethod: 'height',
750+
reference: 'who',
751+
sex: 'male',
752+
measurements: {
753+
height: whoOneToFiveBoysHeight,
754+
},
755+
midParentalHeightData: {},
756+
enableZoom: true,
757+
chartType: 'centile',
758+
enableExport: false,
759+
exportChartCallback: () => {},
760+
theme: 'tanner3',
761+
customThemeStyles: {},
762+
clinicianFocus: true,
763+
logoVariant: 'bottom',
764+
},
765+
};
766+
745767
export const CentileChartWHOGirlsHeight: Story = {
746768
args: {
747769
title: 'Patient Name - Hospital Number',

‎src/RCPCHChart/RCPCHChart.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ const RCPCHChart: React.FC<RCPCHChartProps> = ({
122122
);
123123

124124
// uncomment in development
125-
// console.log("loading from locally...");
125+
// console.log('loading from locally...');
126126

127127
// create subtitle from sex, reference and measurementMethod
128128
const subtitleReferenceMeasurementMethod = `${nameForReference(reference)} - ${nameForMeasurementMethod(measurementMethod)}`;

‎src/chartdata/cdc_height_female_centile_data.ts

+2,312-2,268
Large diffs are not rendered by default.

‎src/chartdata/cdc_height_female_centile_data_old.ts

+2,388
Large diffs are not rendered by default.

‎src/chartdata/cdc_height_male_centile_data.ts

+2,312-2,268
Large diffs are not rendered by default.

‎src/chartdata/cdc_height_male_centile_data_old.ts

+2,388
Large diffs are not rendered by default.

‎src/chartdata/cdc_weight_female_centile_data.ts

+2,310-2,266
Large diffs are not rendered by default.

‎src/chartdata/cdc_weight_female_centile_data_old.ts

+2,388
Large diffs are not rendered by default.

‎src/chartdata/cdc_weight_male_centile_data.ts

+2,312-2,268
Large diffs are not rendered by default.

‎src/chartdata/cdc_weight_male_centile_data_old.ts

+2,388
Large diffs are not rendered by default.

‎src/chartdata/who_bmi_female_centile_data.ts

+11
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
961961
sds: -2.33,
962962
centile: 1,
963963
data: [
964+
{ l: 1, x: 5.0, y: 12.4187 },
964965
{ l: 1, x: 5.08, y: 12.4123 },
965966
{ l: 1, x: 5.17, y: 12.4052 },
966967
{ l: 1, x: 5.25, y: 12.3988 },
@@ -1135,6 +1136,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
11351136
sds: -1.88,
11361137
centile: 3,
11371138
data: [
1139+
{ l: 3, x: 5.0, y: 12.8807 },
11381140
{ l: 3, x: 5.08, y: 12.8745 },
11391141
{ l: 3, x: 5.17, y: 12.8675 },
11401142
{ l: 3, x: 5.25, y: 12.8613 },
@@ -1309,6 +1311,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
13091311
sds: -1.64,
13101312
centile: 5,
13111313
data: [
1314+
{ l: 5, x: 5.0, y: 13.1386 },
13121315
{ l: 5, x: 5.08, y: 13.1326 },
13131316
{ l: 5, x: 5.17, y: 13.1258 },
13141317
{ l: 5, x: 5.25, y: 13.1198 },
@@ -1483,6 +1486,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
14831486
sds: -1.28,
14841487
centile: 10,
14851488
data: [
1489+
{ l: 10, x: 5.0, y: 13.5552 },
14861490
{ l: 10, x: 5.08, y: 13.5498 },
14871491
{ l: 10, x: 5.17, y: 13.5436 },
14881492
{ l: 10, x: 5.25, y: 13.5382 },
@@ -1657,6 +1661,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
16571661
sds: -1.04,
16581662
centile: 15,
16591663
data: [
1664+
{ l: 15, x: 5.0, y: 13.8507 },
16601665
{ l: 15, x: 5.08, y: 13.8457 },
16611666
{ l: 15, x: 5.17, y: 13.8402 },
16621667
{ l: 15, x: 5.25, y: 13.8353 },
@@ -1831,6 +1836,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
18311836
sds: 0.0,
18321837
centile: 50,
18331838
data: [
1839+
{ l: 50, x: 5.0, y: 15.2447 },
18341840
{ l: 50, x: 5.08, y: 15.2441 },
18351841
{ l: 50, x: 5.17, y: 15.2434 },
18361842
{ l: 50, x: 5.25, y: 15.2433 },
@@ -2005,6 +2011,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
20052011
sds: 1.04,
20062012
centile: 85,
20072013
data: [
2014+
{ l: 85, x: 5.0, y: 16.9267 },
20082015
{ l: 85, x: 5.08, y: 16.9355 },
20092016
{ l: 85, x: 5.17, y: 16.9453 },
20102017
{ l: 85, x: 5.25, y: 16.9557 },
@@ -2179,6 +2186,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
21792186
sds: 1.28,
21802187
centile: 90,
21812188
data: [
2189+
{ l: 90, x: 5.0, y: 17.3764 },
21822190
{ l: 90, x: 5.08, y: 17.3885 },
21832191
{ l: 90, x: 5.17, y: 17.4021 },
21842192
{ l: 90, x: 5.25, y: 17.4162 },
@@ -2353,6 +2361,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
23532361
sds: 1.64,
23542362
centile: 95,
23552363
data: [
2364+
{ l: 95, x: 5.0, y: 18.0854 },
23562365
{ l: 95, x: 5.08, y: 18.1035 },
23572366
{ l: 95, x: 5.17, y: 18.1238 },
23582367
{ l: 95, x: 5.25, y: 18.1446 },
@@ -2527,6 +2536,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
25272536
sds: 1.88,
25282537
centile: 97,
25292538
data: [
2539+
{ l: 97, x: 5.0, y: 18.5755 },
25302540
{ l: 97, x: 5.08, y: 18.5981 },
25312541
{ l: 97, x: 5.17, y: 18.6237 },
25322542
{ l: 97, x: 5.25, y: 18.6497 },
@@ -2701,6 +2711,7 @@ export const whoBMIFemaleCentileData: ReferenceGroup = {
27012711
sds: 2.33,
27022712
centile: 99,
27032713
data: [
2714+
{ l: 99, x: 5.0, y: 19.572 },
27042715
{ l: 99, x: 5.08, y: 19.6053 },
27052716
{ l: 99, x: 5.17, y: 19.6431 },
27062717
{ l: 99, x: 5.25, y: 19.6813 },

‎src/chartdata/who_bmi_male_centile_data.ts

+11
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
961961
sds: -2.33,
962962
centile: 1,
963963
data: [
964+
{ l: 1, x: 5.0, y: 12.7231 },
964965
{ l: 1, x: 5.08, y: 12.72 },
965966
{ l: 1, x: 5.17, y: 12.7165 },
966967
{ l: 1, x: 5.25, y: 12.7138 },
@@ -1135,6 +1136,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
11351136
sds: -1.88,
11361137
centile: 3,
11371138
data: [
1139+
{ l: 3, x: 5.0, y: 13.1513 },
11381140
{ l: 3, x: 5.08, y: 13.1477 },
11391141
{ l: 3, x: 5.17, y: 13.1435 },
11401142
{ l: 3, x: 5.25, y: 13.1403 },
@@ -1309,6 +1311,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
13091311
sds: -1.64,
13101312
centile: 5,
13111313
data: [
1314+
{ l: 5, x: 5.0, y: 13.3882 },
13121315
{ l: 5, x: 5.08, y: 13.3844 },
13131316
{ l: 5, x: 5.17, y: 13.38 },
13141317
{ l: 5, x: 5.25, y: 13.3766 },
@@ -1483,6 +1486,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
14831486
sds: -1.28,
14841487
centile: 10,
14851488
data: [
1489+
{ l: 10, x: 5.0, y: 13.7676 },
14861490
{ l: 10, x: 5.08, y: 13.7637 },
14871491
{ l: 10, x: 5.17, y: 13.7592 },
14881492
{ l: 10, x: 5.25, y: 13.7558 },
@@ -1657,6 +1661,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
16571661
sds: -1.04,
16581662
centile: 15,
16591663
data: [
1664+
{ l: 15, x: 5.0, y: 14.0343 },
16601665
{ l: 15, x: 5.08, y: 14.0304 },
16611666
{ l: 15, x: 5.17, y: 14.026 },
16621667
{ l: 15, x: 5.25, y: 14.0226 },
@@ -1831,6 +1836,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
18311836
sds: 0.0,
18321837
centile: 50,
18331838
data: [
1839+
{ l: 50, x: 5.0, y: 15.2663 },
18341840
{ l: 50, x: 5.08, y: 15.2641 },
18351841
{ l: 50, x: 5.17, y: 15.2616 },
18361842
{ l: 50, x: 5.25, y: 15.2604 },
@@ -2005,6 +2011,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
20052011
sds: 1.04,
20062012
centile: 85,
20072013
data: [
2014+
{ l: 85, x: 5.0, y: 16.6966 },
20082015
{ l: 85, x: 5.08, y: 16.6995 },
20092016
{ l: 85, x: 5.17, y: 16.7028 },
20102017
{ l: 85, x: 5.25, y: 16.7078 },
@@ -2179,6 +2186,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
21792186
sds: 1.28,
21802187
centile: 90,
21812188
data: [
2189+
{ l: 90, x: 5.0, y: 17.0689 },
21822190
{ l: 90, x: 5.08, y: 17.0737 },
21832191
{ l: 90, x: 5.17, y: 17.0792 },
21842192
{ l: 90, x: 5.25, y: 17.0865 },
@@ -2353,6 +2361,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
23532361
sds: 1.64,
23542362
centile: 95,
23552363
data: [
2364+
{ l: 95, x: 5.0, y: 17.6475 },
23562365
{ l: 95, x: 5.08, y: 17.6558 },
23572366
{ l: 95, x: 5.17, y: 17.6652 },
23582367
{ l: 95, x: 5.25, y: 17.6766 },
@@ -2527,6 +2536,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
25272536
sds: 1.88,
25282537
centile: 97,
25292538
data: [
2539+
{ l: 97, x: 5.0, y: 18.0416 },
25302540
{ l: 97, x: 5.08, y: 18.0525 },
25312541
{ l: 97, x: 5.17, y: 18.065 },
25322542
{ l: 97, x: 5.25, y: 18.0796 },
@@ -2701,6 +2711,7 @@ export const whoBMIMaleCentileData: ReferenceGroup = {
27012711
sds: 2.33,
27022712
centile: 99,
27032713
data: [
2714+
{ l: 99, x: 5.0, y: 18.8283 },
27042715
{ l: 99, x: 5.08, y: 18.8454 },
27052716
{ l: 99, x: 5.17, y: 18.865 },
27062717
{ l: 99, x: 5.25, y: 18.8871 },

‎src/chartdata/who_height_female_centile_data.ts

+11
Original file line numberDiff line numberDiff line change
@@ -961,6 +961,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
961961
sds: -2.33,
962962
centile: 1,
963963
data: [
964+
{ l: 1, x: 5.0, y: 98.0763 },
964965
{ l: 1, x: 5.08, y: 98.4978 },
965966
{ l: 1, x: 5.17, y: 98.9459 },
966967
{ l: 1, x: 5.25, y: 99.3893 },
@@ -1135,6 +1136,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
11351136
sds: -1.88,
11361137
centile: 3,
11371138
data: [
1139+
{ l: 3, x: 5.0, y: 100.1893 },
11381140
{ l: 3, x: 5.08, y: 100.6243 },
11391141
{ l: 3, x: 5.17, y: 101.0869 },
11401142
{ l: 3, x: 5.25, y: 101.5448 },
@@ -1309,6 +1311,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
13091311
sds: -1.64,
13101312
centile: 5,
13111313
data: [
1314+
{ l: 5, x: 5.0, y: 101.3082 },
13121315
{ l: 5, x: 5.08, y: 101.7502 },
13131316
{ l: 5, x: 5.17, y: 102.2206 },
13141317
{ l: 5, x: 5.25, y: 102.6862 },
@@ -1483,6 +1486,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
14831486
sds: -1.28,
14841487
centile: 10,
14851488
data: [
1489+
{ l: 10, x: 5.0, y: 103.0314 },
14861490
{ l: 10, x: 5.08, y: 103.4843 },
14871491
{ l: 10, x: 5.17, y: 103.9666 },
14881492
{ l: 10, x: 5.25, y: 104.4441 },
@@ -1657,6 +1661,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
16571661
sds: -1.04,
16581662
centile: 15,
16591663
data: [
1664+
{ l: 15, x: 5.0, y: 104.1943 },
16601665
{ l: 15, x: 5.08, y: 104.6547 },
16611666
{ l: 15, x: 5.17, y: 105.145 },
16621667
{ l: 15, x: 5.25, y: 105.6305 },
@@ -1831,6 +1836,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
18311836
sds: 0.0,
18321837
centile: 50,
18331838
data: [
1839+
{ l: 50, x: 5.0, y: 109.11 },
18341840
{ l: 50, x: 5.08, y: 109.6016 },
18351841
{ l: 50, x: 5.17, y: 110.1258 },
18361842
{ l: 50, x: 5.25, y: 110.6451 },
@@ -2005,6 +2011,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
20052011
sds: 1.04,
20062012
centile: 85,
20072013
data: [
2014+
{ l: 85, x: 5.0, y: 114.0257 },
20082015
{ l: 85, x: 5.08, y: 114.5485 },
20092016
{ l: 85, x: 5.17, y: 115.1066 },
20102017
{ l: 85, x: 5.25, y: 115.6597 },
@@ -2179,6 +2186,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
21792186
sds: 1.28,
21802187
centile: 90,
21812188
data: [
2189+
{ l: 90, x: 5.0, y: 115.1886 },
21822190
{ l: 90, x: 5.08, y: 115.7189 },
21832191
{ l: 90, x: 5.17, y: 116.285 },
21842192
{ l: 90, x: 5.25, y: 116.8461 },
@@ -2353,6 +2361,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
23532361
sds: 1.64,
23542362
centile: 95,
23552363
data: [
2364+
{ l: 95, x: 5.0, y: 116.9118 },
23562365
{ l: 95, x: 5.08, y: 117.453 },
23572366
{ l: 95, x: 5.17, y: 118.031 },
23582367
{ l: 95, x: 5.25, y: 118.604 },
@@ -2527,6 +2536,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
25272536
sds: 1.88,
25282537
centile: 97,
25292538
data: [
2539+
{ l: 97, x: 5.0, y: 118.0307 },
25302540
{ l: 97, x: 5.08, y: 118.5789 },
25312541
{ l: 97, x: 5.17, y: 119.1647 },
25322542
{ l: 97, x: 5.25, y: 119.7454 },
@@ -2701,6 +2711,7 @@ export const whoHeightFemaleCentileData: ReferenceGroup = {
27012711
sds: 2.33,
27022712
centile: 99,
27032713
data: [
2714+
{ l: 99, x: 5.0, y: 120.1437 },
27042715
{ l: 99, x: 5.08, y: 120.7054 },
27052716
{ l: 99, x: 5.17, y: 121.3057 },
27062717
{ l: 99, x: 5.25, y: 121.9009 },

0 commit comments

Comments
 (0)