From 03022ffa88aefa36b079599e70d7f73426531969 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Mon, 17 Sep 2018 20:24:28 +0200
Subject: [PATCH] Pass in symptoms as flat properties, not object
---
components/chart/chart.js | 3 ++-
components/chart/day-column.js | 21 ++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/components/chart/chart.js b/components/chart/chart.js
index 5fb03da2..4ee6dd6a 100644
--- a/components/chart/chart.js
+++ b/components/chart/chart.js
@@ -62,6 +62,7 @@ export default class CycleChart extends Component {
jsDate.getDate()
).toString()
})
+
const chartSymptoms = [
'bleeding',
'temperature',
@@ -103,7 +104,7 @@ export default class CycleChart extends Component {
return {
dateString,
y: temp ? normalizeToScale(temp, columnHeight) : null,
- symptoms,
+ ...symptoms,
...getFhmAndLtlInfo(dateString, temp, columnHeight)
}
})
diff --git a/components/chart/day-column.js b/components/chart/day-column.js
index 47c41269..0e64d88e 100644
--- a/components/chart/day-column.js
+++ b/components/chart/day-column.js
@@ -31,7 +31,6 @@ export default class DayColumn extends Component {
dateString,
y,
temperatureExclude,
- symptoms,
drawFhmLine,
drawLtlAt,
rightY,
@@ -116,36 +115,36 @@ export default class DayColumn extends Component {
>
<View height={symptomHeight}>
<View style={styles.symptomRow}>
- {typeof symptoms.bleeding === 'number' &&
+ {typeof this.props.bleeding === 'number' &&
<Icon
name='drop'
size={12}
- color={styles.bleedingIconShades[symptoms.bleeding]}
+ color={styles.bleedingIconShades[this.props.bleeding]}
key='bleeding'
/>
}
</View>
<View style={styles.symptomRow}>
- {typeof symptoms.mucus === 'number' &&
+ {typeof this.props.mucus === 'number' &&
<View
{...styles.mucusIcon}
- backgroundColor={styles.mucusIconShades[symptoms.mucus]}
+ backgroundColor={styles.mucusIconShades[this.props.mucus]}
key='mucus'
/>
}
</View>
<View style={styles.symptomRow}>
- {typeof symptoms.cervix === 'number' &&
+ {typeof this.props.cervix === 'number' &&
<View
{...styles.mucusIcon}
// cervix is sum of openess and firmness - fertile only when closed and hard (=0)
- backgroundColor={symptoms.cervix > 0 ? 'blue' : 'green'}
+ backgroundColor={this.props.cervix > 0 ? 'blue' : 'green'}
key='cervix'
/>
}
</View>
<View style={styles.symptomRow}>
- {typeof symptoms.sex === 'number' &&
+ {typeof this.props.sex === 'number' &&
<View
{...styles.mucusIcon}
backgroundColor='orange'
@@ -154,7 +153,7 @@ export default class DayColumn extends Component {
}
</View>
<View style={styles.symptomRow}>
- {typeof symptoms.desire === 'number' &&
+ {typeof this.props.desire === 'number' &&
<View
{...styles.mucusIcon}
backgroundColor='red'
@@ -163,7 +162,7 @@ export default class DayColumn extends Component {
}
</View>
<View style={styles.symptomRow}>
- {symptoms.pain &&
+ {this.props.pain &&
<View
{...styles.mucusIcon}
backgroundColor='blue'
@@ -172,7 +171,7 @@ export default class DayColumn extends Component {
}
</View>
<View style={styles.symptomRow}>
- {symptoms.note &&
+ {this.props.note &&
<View
{...styles.mucusIcon}
backgroundColor='green'
--
GitLab