Skip to content
Snippets Groups Projects
Commit 444991fb authored by bl00dymarie's avatar bl00dymarie
Browse files

Merge branch '92-investigate-error-message-on-master' into 'master'

Resolve "Investigate error message on master"

Closes #92

See merge request bloodyhealth/drip!32
parents cac2e4b6 bae2192a
No related branches found
No related tags found
No related merge requests found
...@@ -47,8 +47,8 @@ export default class DayView extends Component { ...@@ -47,8 +47,8 @@ export default class DayView extends Component {
let bleedingLabel let bleedingLabel
if (this.cycleDay.bleeding) { if (this.cycleDay.bleeding) {
const bleeding = this.cycleDay.bleeding const bleeding = this.cycleDay.bleeding
if (typeof bleeding === 'number') { if (typeof bleeding.value === 'number') {
bleedingLabel = `${bleedingLabels[bleeding]}` bleedingLabel = `${bleedingLabels[bleeding.value]}`
if (bleeding.exclude) bleedingLabel = "( " + bleedingLabel + " )" if (bleeding.exclude) bleedingLabel = "( " + bleedingLabel + " )"
} }
} else { } else {
...@@ -58,8 +58,8 @@ export default class DayView extends Component { ...@@ -58,8 +58,8 @@ export default class DayView extends Component {
let temperatureLabel let temperatureLabel
if (this.cycleDay.temperature) { if (this.cycleDay.temperature) {
const temperature = this.cycleDay.temperature const temperature = this.cycleDay.temperature
if (typeof temperature === 'number') { if (typeof temperature.value === 'number') {
temperatureLabel = `${temperature} °C - ${temperature.time}` temperatureLabel = `${temperature.value} °C - ${temperature.time}`
if (temperature.exclude) { if (temperature.exclude) {
temperatureLabel = "( " + temperatureLabel + " )" temperatureLabel = "( " + temperatureLabel + " )"
} }
...@@ -113,7 +113,7 @@ export default class DayView extends Component { ...@@ -113,7 +113,7 @@ export default class DayView extends Component {
</View> </View>
<View style={ styles.symptomViewRowInline }> <View style={ styles.symptomViewRowInline }>
<Text style={styles.symptomDayView}>Mucus</Text> <Text style={styles.symptomDayView}>Mucus</Text>
<View style={ styles.symptomEditButton }> <View style={styles.symptomEditButton}>
<Button <Button
onPress={() => this.showView('mucusEditView')} onPress={() => this.showView('mucusEditView')}
title={mucusLabel}> title={mucusLabel}>
...@@ -122,7 +122,7 @@ export default class DayView extends Component { ...@@ -122,7 +122,7 @@ export default class DayView extends Component {
</View> </View>
<View style={styles.symptomViewRowInline}> <View style={styles.symptomViewRowInline}>
<Text style={styles.symptomDayView}>Cervix</Text> <Text style={styles.symptomDayView}>Cervix</Text>
<View style={ styles.symptomEditButton }> <View style={styles.symptomEditButton}>
<Button <Button
onPress={() => this.showView('cervixEditView')} onPress={() => this.showView('cervixEditView')}
title={cervixLabel}> title={cervixLabel}>
......
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