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

fixes bugs on ios where entered symptoms were not displayed

Browse Source
This commit is contained in:
tina
2019-02-18 20:33:05 +01:00
parent 6592d742af
commit 0a8dcf87a4
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/chart/day-column.js
+2 -2
View File
@@ -43,11 +43,11 @@ export default class DayColumn extends Component {
} else if (symptom === 'pain') { } else if (symptom === 'pain') {
// is any pain documented? // is any pain documented?
acc.pain = cycleDay.pain && acc.pain = cycleDay.pain &&
Object.values(cycleDay.pain).some(x => x === true) Object.values({...cycleDay.pain}).some(x => x === true)
} else if (symptom === 'mood') { } else if (symptom === 'mood') {
// is mood documented? // is mood documented?
acc.mood = cycleDay.mood && acc.mood = cycleDay.mood &&
Object.values(cycleDay.mood).some(x => x === true) Object.values({...cycleDay.mood}).some(x => x === true)
} }
acc[`${symptom}Exclude`] = cycleDay[symptom] && cycleDay[symptom].exclude acc[`${symptom}Exclude`] = cycleDay[symptom] && cycleDay[symptom].exclude
return acc return acc
components/cycle-day/cycle-day-overview.js
+3 -3
View File
@@ -106,7 +106,7 @@ export default class CycleDayOverView extends Component {
}, },
sex: sex => { sex: sex => {
let sexLabel = [] let sexLabel = []
if (sex && Object.values(sex).some(val => val)){ if (sex && Object.values({...sex}).some(val => val)){
Object.keys(sex).forEach(key => { Object.keys(sex).forEach(key => {
if(sex[key] && key !== 'other' && key !== 'note') { if(sex[key] && key !== 'other' && key !== 'note') {
sexLabel.push( sexLabel.push(
@@ -128,7 +128,7 @@ export default class CycleDayOverView extends Component {
}, },
pain: pain => { pain: pain => {
let painLabel = [] let painLabel = []
if (pain && Object.values(pain).some(val => val)){ if (pain && Object.values({...pain}).some(val => val)){
Object.keys(pain).forEach(key => { Object.keys(pain).forEach(key => {
if(pain[key] && key !== 'other' && key !== 'note') { if(pain[key] && key !== 'other' && key !== 'note') {
painLabel.push(painLabels[key]) painLabel.push(painLabels[key])
@@ -147,7 +147,7 @@ export default class CycleDayOverView extends Component {
}, },
mood: mood => { mood: mood => {
let moodLabel = [] let moodLabel = []
if (mood && Object.values(mood).some(val => val)){ if (mood && Object.values({...mood}).some(val => val)){
Object.keys(mood).forEach(key => { Object.keys(mood).forEach(key => {
if(mood[key] && key !== 'other' && key !== 'note') { if(mood[key] && key !== 'other' && key !== 'note') {
moodLabel.push(moodLabels[key]) moodLabel.push(moodLabels[key])