diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js index 52fc4bf..d94453e 100644 --- a/components/cycle-day/cycle-day-overview.js +++ b/components/cycle-day/cycle-day-overview.js @@ -21,7 +21,8 @@ import { cervixFirmness as firmnessLabels, cervixPosition as positionLabels, intensity as intensityLabels, - pain as painLabels + pain as painLabels, + sex as sexLabels } from './labels/labels' export default class CycleDayOverView extends Component { @@ -162,15 +163,20 @@ function getLabel(symptomName, symptom) { } }, sex: sex => { - const sexLabel = [] - if ( sex.solo || sex.partner ) { - sexLabel.push('activity') + let sexLabel = [] + if (sex && Object.values(sex).some(val => val)){ + Object.keys(sex).forEach(key => { + if(sex[key] && key !== 'note') { + sexLabel.push(sexLabels[key]) + } + if(key === "note" && sex.note) { + sexLabel.push(sex.note) + } + }) + sexLabel = sexLabel.join(', ') + if (sex.exclude) sexLabel = `(${sexLabel})` } - if (sex.condom || sex.pill || sex.iud || - sex.patch || sex.ring || sex.implant || sex.other) { - sexLabel.push('contraceptive') - } - return sexLabel.join(', ') + return sexLabel }, pain: pain => { let painLabel = [] diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js index 911d326..90faf28 100644 --- a/components/cycle-day/labels/labels.js +++ b/components/cycle-day/labels/labels.js @@ -6,11 +6,9 @@ export const cervixOpening = ['closed', 'medium', 'open'] export const cervixFirmness = ['hard', 'soft'] export const cervixPosition = ['low', 'medium', 'high'] export const intensity = ['low', 'medium', 'high'] -export const sexActivity = { +export const sex = { solo: 'Solo', - partner: 'Partner' -} -export const contraceptives = { + partner: 'Partner', condom: 'Condom', pill: 'Pill', iud: 'IUD', @@ -28,7 +26,8 @@ export const pain = { nausea: 'Nausea', tenderBreasts: 'Tender breasts', migraine: 'Migraine', - other: 'Other' + other: 'Other', + note: 'Note' } export const fertilityStatus = { diff --git a/components/cycle-day/symptoms/sex.js b/components/cycle-day/symptoms/sex.js index 2630c1c..f90db21 100644 --- a/components/cycle-day/symptoms/sex.js +++ b/components/cycle-day/symptoms/sex.js @@ -8,10 +8,7 @@ import { } from 'react-native' import styles from '../../../styles' import { saveSymptom } from '../../../db' -import { - sexActivity as activityLabels, - contraceptives as contraceptiveLabels -} from '../labels/labels' +import { sex as sexLabels } from '../labels/labels' import ActionButtonFooter from './action-button-footer' export default class Sex extends Component { @@ -36,7 +33,7 @@ export default class Sex extends Component { - {activityLabels.solo} + {sexLabels.solo} { @@ -44,7 +41,7 @@ export default class Sex extends Component { }} /> - {activityLabels.partner} + {sexLabels.partner} CONTRACEPTIVES - {contraceptiveLabels.condom} + {sexLabels.condom} - {contraceptiveLabels.pill} + {sexLabels.pill} - {contraceptiveLabels.iud} + {sexLabels.iud} - {contraceptiveLabels.patch} + {sexLabels.patch} - {contraceptiveLabels.ring} + {sexLabels.ring} - {contraceptiveLabels.implant} + {sexLabels.implant} - {contraceptiveLabels.other} + {sexLabels.other}