lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Resolve "Investigate error message on master"

Closes #92

See merge request bloodyhealth/drip!32
This commit is contained in:
bl00dymarie
2018-07-24 06:42:44 +00:00
parent cac2e4b6e9 bae2192a60
commit 444991fbec
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/cycle-day/cycle-day-overview.js
+6 -6
View File
@@ -47,8 +47,8 @@ export default class DayView extends Component {
let bleedingLabel
if (this.cycleDay.bleeding) {
const bleeding = this.cycleDay.bleeding
if (typeof bleeding === 'number') {
bleedingLabel = `${bleedingLabels[bleeding]}`
if (typeof bleeding.value === 'number') {
bleedingLabel = `${bleedingLabels[bleeding.value]}`
if (bleeding.exclude) bleedingLabel = "( " + bleedingLabel + " )"
}
} else {
@@ -58,8 +58,8 @@ export default class DayView extends Component {
let temperatureLabel
if (this.cycleDay.temperature) {
const temperature = this.cycleDay.temperature
if (typeof temperature === 'number') {
temperatureLabel = `${temperature} °C - ${temperature.time}`
if (typeof temperature.value === 'number') {
temperatureLabel = `${temperature.value} °C - ${temperature.time}`
if (temperature.exclude) {
temperatureLabel = "( " + temperatureLabel + " )"
}
@@ -113,7 +113,7 @@ export default class DayView extends Component {
</View>
<View style={ styles.symptomViewRowInline }>
<Text style={styles.symptomDayView}>Mucus</Text>
<View style={ styles.symptomEditButton }>
<View style={styles.symptomEditButton}>
<Button
onPress={() => this.showView('mucusEditView')}
title={mucusLabel}>
@@ -122,7 +122,7 @@ export default class DayView extends Component {
</View>
<View style={styles.symptomViewRowInline}>
<Text style={styles.symptomDayView}>Cervix</Text>
<View style={ styles.symptomEditButton }>
<View style={styles.symptomEditButton}>
<Button
onPress={() => this.showView('cervixEditView')}
title={cervixLabel}>