Skip to content
Snippets Groups Projects
Commit 0e73ab18 authored by Julia Friesel's avatar Julia Friesel
Browse files

Merge branch '292-bug-cycle-day-shows-undefined-for-bleeding-value' into 'master'

Fix label reference

Closes #292

See merge request bloodyhealth/drip!163
parents a9e22c94 1aad11b5
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ import * as labels from '../../i18n/en/cycle-day' ...@@ -14,7 +14,7 @@ import * as labels from '../../i18n/en/cycle-day'
import AppText from '../app-text' import AppText from '../app-text'
import DripIcon from '../../assets/drip-icons' import DripIcon from '../../assets/drip-icons'
const bleedingLabels = labels.bleeding const bleedingLabels = labels.bleeding.labels
const feelingLabels = labels.mucus.feeling.categories const feelingLabels = labels.mucus.feeling.categories
const textureLabels = labels.mucus.texture.categories const textureLabels = labels.mucus.texture.categories
const openingLabels = labels.cervix.opening.categories const openingLabels = labels.cervix.opening.categories
...@@ -56,7 +56,7 @@ export default class CycleDayOverView extends Component { ...@@ -56,7 +56,7 @@ export default class CycleDayOverView extends Component {
const l = { const l = {
bleeding: bleeding => { bleeding: bleeding => {
if (isNumber(bleeding.value)) { if (isNumber(bleeding.value)) {
let bleedingLabel = `${bleedingLabels[bleeding.value]}` let bleedingLabel = bleedingLabels[bleeding.value]
if (bleeding.exclude) bleedingLabel = "( " + bleedingLabel + " )" if (bleeding.exclude) bleedingLabel = "( " + bleedingLabel + " )"
return bleedingLabel return bleedingLabel
} }
......
...@@ -2,15 +2,15 @@ export const mucusNFP = ['t', 'Ø', 'f', 'S', 'S+'] ...@@ -2,15 +2,15 @@ export const mucusNFP = ['t', 'Ø', 'f', 'S', 'S+']
export const intensity = ['low', 'medium', 'high'] export const intensity = ['low', 'medium', 'high']
export const bleeding = { export const bleeding = {
labels: ['spotting', 'light', 'medium', 'heavy'], labels: ['spotting', 'light', 'medium', 'heavy'],
heaviness: { heaviness: {
header: "Heaviness", header: "Heaviness",
explainer: "How heavy is the bleeding?", explainer: "How heavy is the bleeding?",
}, },
exclude: { exclude: {
header: "Exclude", header: "Exclude",
explainer: "You can exclude this value if it's not menstrual bleeding" explainer: "You can exclude this value if it's not menstrual bleeding"
} }
} }
export const cervix = { export const cervix = {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment