From 17bb23fd917770e94024cb8d6049c110746e50da Mon Sep 17 00:00:00 2001 From: Julia Friesel Date: Thu, 27 Sep 2018 19:29:26 +0200 Subject: [PATCH] Revert early return, fixes gaps in LTL line --- assets/drip_drip.svg | 17 +++++++++++++++++ assets/home-circle.js | 16 ++++++++++++++++ components/chart/chart.js | 29 ++++++++++++++++------------- 3 files changed, 49 insertions(+), 13 deletions(-) create mode 100644 assets/drip_drip.svg create mode 100644 assets/home-circle.js diff --git a/assets/drip_drip.svg b/assets/drip_drip.svg new file mode 100644 index 0000000..2ec99a2 --- /dev/null +++ b/assets/drip_drip.svg @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + diff --git a/assets/home-circle.js b/assets/home-circle.js new file mode 100644 index 0000000..f8c9bc5 --- /dev/null +++ b/assets/home-circle.js @@ -0,0 +1,16 @@ +import React from 'react' +import Svg, { G, Path } from 'react-native-svg' + +export default function HomeCycleIcon() { + return ( + + + + + + + ) +} \ No newline at end of file diff --git a/components/chart/chart.js b/components/chart/chart.js index 97717df..1595a2d 100644 --- a/components/chart/chart.js +++ b/components/chart/chart.js @@ -106,31 +106,34 @@ export default class CycleChart extends Component { const columns = xAxisDates.map(dateString => { const column = { dateString } const cycleDay = getCycleDay(dateString) - if (!cycleDay) return column + let symptoms = {} - const symptoms = chartSymptoms.reduce((acc, symptom) => { - if (symptom === 'bleeding' || + if (cycleDay) { + symptoms = chartSymptoms.reduce((acc, symptom) => { + if (symptom === 'bleeding' || symptom === 'temperature' || symptom === 'mucus' || symptom === 'desire' || symptom === 'note' - ) { - acc[symptom] = cycleDay[symptom] && cycleDay[symptom].value - } else if (symptom === 'cervix') { - acc.cervix = cycleDay.cervix && + ) { + acc[symptom] = cycleDay[symptom] && cycleDay[symptom].value + } else if (symptom === 'cervix') { + acc.cervix = cycleDay.cervix && (cycleDay.cervix.opening + cycleDay.cervix.firmness) - } else if (symptom === 'sex') { + } else if (symptom === 'sex') { // solo = 1 + partner = 2 acc.sex = cycleDay.sex && (cycleDay.sex.solo + 2 * cycleDay.sex.partner) } else if (symptom === 'pain') { // is any pain documented? - acc.pain = cycleDay.pain && + acc.pain = cycleDay.pain && Object.values(cycleDay.pain).some(x => x === true) - } - acc[`${symptom}Exclude`] = cycleDay[symptom] && cycleDay[symptom].exclude - return acc - }, {}) + } + acc[`${symptom}Exclude`] = cycleDay[symptom] && cycleDay[symptom].exclude + return acc + }, {}) + + } const temp = symptoms.temperature if (temp) {