diff --git a/components/chart/chart.js b/components/chart/chart.js index b8d2142..eb32e74 100644 --- a/components/chart/chart.js +++ b/components/chart/chart.js @@ -23,6 +23,7 @@ const symptomIcons = { desire: , sex: , pain: , + mood: , note: } @@ -62,6 +63,7 @@ export default class CycleChart extends Component { 'sex', 'desire', 'pain', + 'mood', 'note' ].filter((symptomName) => { return this.cycleDaysSortedByDate.some(cycleDay => { diff --git a/components/chart/day-column.js b/components/chart/day-column.js index e9c6f76..4c2244d 100644 --- a/components/chart/day-column.js +++ b/components/chart/day-column.js @@ -44,6 +44,10 @@ export default class DayColumn extends Component { // is any pain documented? acc.pain = cycleDay.pain && Object.values(cycleDay.pain).some(x => x === true) + } else if (symptom === 'mood') { + // is mood documented? + acc.mood = cycleDay.mood && + Object.values(cycleDay.mood).some(x => x === true) } acc[`${symptom}Exclude`] = cycleDay[symptom] && cycleDay[symptom].exclude return acc @@ -214,6 +218,18 @@ export default class DayColumn extends Component { /> ), + mood: ( + + + + ), note: ( this.navigate('MoodEditView')} data={this.getLabel('mood')} disabled={dateInFuture} - iconName='drip-icon-pain' + iconName='circle' > - + {this.props.iconName == 'circle' + ? + : + } {this.props.title.toLowerCase()} diff --git a/components/cycle-day/symptoms/mood.js b/components/cycle-day/symptoms/mood.js index 37b40a0..903d5d9 100644 --- a/components/cycle-day/symptoms/mood.js +++ b/components/cycle-day/symptoms/mood.js @@ -15,8 +15,8 @@ export default class Mood extends Component { constructor(props) { super(props) const cycleDay = props.cycleDay - if (cycleDay && cycleDay.pain) { - this.state = Object.assign({}, cycleDay.pain) + if (cycleDay && cycleDay.mood) { + this.state = Object.assign({}, cycleDay.mood) } else { this.state = {} }