Adds cervix to symptoms:
has 3 properties: opening, firmness and position (which is optional);
This commit is contained in:
@@ -10,6 +10,9 @@ import {
|
||||
mucusFeeling as feelingLabels,
|
||||
mucusTexture as textureLabels,
|
||||
mucusNFP as computeSensiplanMucusLabels,
|
||||
cervixOpening as openingLabels,
|
||||
cervixFirmness as firmnessLabels,
|
||||
cervixPosition as positionLabels
|
||||
} from './labels/labels'
|
||||
import cycleDayModule from '../../lib/get-cycle-day-number'
|
||||
import { bleedingDaysSortedByDate } from '../../db'
|
||||
@@ -49,6 +52,7 @@ export default class DayView extends Component {
|
||||
} else {
|
||||
bleedingLabel = 'edit'
|
||||
}
|
||||
|
||||
const temperatureValue = this.cycleDay.temperature && this.cycleDay.temperature.value
|
||||
let temperatureLabel
|
||||
if (typeof temperatureValue === 'number') {
|
||||
@@ -71,6 +75,17 @@ export default class DayView extends Component {
|
||||
mucusLabel = 'edit'
|
||||
}
|
||||
|
||||
const cervixOpeningValue = this.cycleDay.cervix && this.cycleDay.cervix.opening
|
||||
const cervixFirmnessValue = this.cycleDay.cervix && this.cycleDay.cervix.firmness
|
||||
const cervixPositionValue = this.cycleDay.cervix && this.cycleDay.cervix.position
|
||||
let cervixLabel
|
||||
if (typeof cervixPositionValue === 'number' && typeof cervixOpeningValue === 'number') {
|
||||
cervixLabel = `${openingLabels[cervixOpeningValue]} + ${firmnessLabels[cervixFirmnessValue]} ( ${positionLabels[cervixPositionValue]} )`
|
||||
if (this.cycleDay.cervix.exclude) cervixLabel = "( " + cervixLabel + " )"
|
||||
} else {
|
||||
cervixLabel = 'edit'
|
||||
}
|
||||
|
||||
return (
|
||||
<View style={styles.symptomEditView}>
|
||||
<View style={styles.symptomViewRowInline}>
|
||||
@@ -100,6 +115,17 @@ export default class DayView extends Component {
|
||||
</Button>
|
||||
</View>
|
||||
</View>
|
||||
<View style={ styles.itemsInRowSeparatedView }>
|
||||
<View style={{flex: 1}}>
|
||||
<Text style={styles.symptomDayView}>Cervix</Text>
|
||||
</View>
|
||||
<View style={ styles.singleButtonView }>
|
||||
<Button
|
||||
onPress={() => this.showView('cervixEditView')}
|
||||
title={cervixLabel}>
|
||||
</Button>
|
||||
</View>
|
||||
</View>
|
||||
</View >
|
||||
)
|
||||
}
|
||||
|
||||
@@ -10,6 +10,7 @@ import BleedingEditView from './symptoms/bleeding'
|
||||
import TemperatureEditView from './symptoms/temperature'
|
||||
import MucusEditView from './symptoms/mucus'
|
||||
import { formatDateForViewHeader } from './labels/format'
|
||||
import CervixEditView from './symptoms/cervix'
|
||||
import styles from '../../styles'
|
||||
import actionButtonModule from './action-buttons'
|
||||
|
||||
@@ -48,7 +49,8 @@ export default class Day extends Component {
|
||||
{ dayView: <DayView cycleDay={this.cycleDay} showView={this.showView} />,
|
||||
bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>,
|
||||
temperatureEditView: <TemperatureEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>,
|
||||
mucusEditView: <MucusEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>
|
||||
mucusEditView: <MucusEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>,
|
||||
cervixEditView: <CervixEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons} />
|
||||
}[this.state.visibleComponent]
|
||||
}
|
||||
</View >
|
||||
|
||||
@@ -2,10 +2,16 @@ const bleeding = ['spotting', 'light', 'medium', 'heavy']
|
||||
const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery']
|
||||
const mucusTexture = ['nothing', 'creamy', 'egg white']
|
||||
const mucusNFP = ['t', 'Ø', 'f', 'S', '+S']
|
||||
const cervixOpening = ['closed', 'medium', 'open']
|
||||
const cervixFirmness = ['hard', 'soft']
|
||||
const cervixPosition = ['low', 'medium', 'high']
|
||||
|
||||
export {
|
||||
bleeding,
|
||||
mucusFeeling,
|
||||
mucusTexture,
|
||||
mucusNFP
|
||||
mucusNFP,
|
||||
cervixOpening,
|
||||
cervixFirmness,
|
||||
cervixPosition
|
||||
}
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
import React, { Component } from 'react'
|
||||
import {
|
||||
View,
|
||||
Text,
|
||||
Switch
|
||||
} from 'react-native'
|
||||
import RadioForm from 'react-native-simple-radio-button'
|
||||
import styles from '../../../styles'
|
||||
import { saveSymptom } from '../../../db'
|
||||
import {
|
||||
cervixOpening as openingLabels,
|
||||
cervixFirmness as firmnessLabels,
|
||||
cervixPosition as positionLabels
|
||||
} from '../labels/labels'
|
||||
|
||||
export default class Cervix extends Component {
|
||||
constructor(props) {
|
||||
super(props)
|
||||
this.cycleDay = props.cycleDay
|
||||
this.makeActionButtons = props.makeActionButtons
|
||||
this.state = {
|
||||
exclude: this.cycleDay.cervix ? this.cycleDay.cervix.exclude : false
|
||||
}
|
||||
|
||||
this.state.currentOpeningValue = this.cycleDay.cervix && this.cycleDay.cervix.opening
|
||||
if (typeof this.state.currentOpeningValue !== 'number') {
|
||||
this.state.currentOpeningValue = -1
|
||||
}
|
||||
this.state.currentFirmnessValue = this.cycleDay.cervix && this.cycleDay.cervix.firmness
|
||||
if (typeof this.state.currentFirmnessValue !== 'number') {
|
||||
this.state.currentFirmnessValue = -1
|
||||
}
|
||||
this.state.currentPositionValue = this.cycleDay.cervix && this.cycleDay.cervix.position
|
||||
if (typeof this.state.currentPositionValue !== 'number') {
|
||||
this.state.currentPositionValue = -1
|
||||
}
|
||||
}
|
||||
|
||||
render() {
|
||||
const cervixOpeningRadioProps = [
|
||||
{label: openingLabels[0], value: 0},
|
||||
{label: openingLabels[1], value: 1},
|
||||
{label: openingLabels[2], value: 2}
|
||||
]
|
||||
const cervixFirmnessRadioProps = [
|
||||
{label: firmnessLabels[0], value: 0 },
|
||||
{label: firmnessLabels[1], value: 1 }
|
||||
]
|
||||
const cervixPositionRadioProps = [
|
||||
{label: positionLabels[0], value: 0 },
|
||||
{label: positionLabels[1], value: 1 },
|
||||
{label: positionLabels[2], value: 2 }
|
||||
]
|
||||
return(
|
||||
<View style={ styles.symptomEditView }>
|
||||
<Text style={styles.symptomDayView}>Cervix</Text>
|
||||
<Text style={styles.symptomDayView}>Opening</Text>
|
||||
<View style={styles.radioButtonRow}>
|
||||
<RadioForm
|
||||
radio_props={cervixOpeningRadioProps}
|
||||
initial={this.state.currentOpeningValue}
|
||||
formHorizontal={true}
|
||||
labelHorizontal={false}
|
||||
labelStyle={styles.radioButton}
|
||||
onPress={(itemValue) => {
|
||||
this.setState({currentOpeningValue: itemValue})
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
<Text style={styles.symptomDayView}>Firmness</Text>
|
||||
<View style={styles.radioButtonRow}>
|
||||
<RadioForm
|
||||
radio_props={cervixFirmnessRadioProps}
|
||||
initial={this.state.currentFirmnessValue}
|
||||
formHorizontal={true}
|
||||
labelHorizontal={false}
|
||||
labelStyle={styles.radioButton}
|
||||
onPress={(itemValue) => {
|
||||
this.setState({currentFirmnessValue: itemValue})
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
<Text style={styles.symptomDayView}>Position</Text>
|
||||
<View style={styles.radioButtonRow}>
|
||||
<RadioForm
|
||||
radio_props={cervixPositionRadioProps}
|
||||
initial={this.state.currentPositionValue}
|
||||
formHorizontal={true}
|
||||
labelHorizontal={false}
|
||||
labelStyle={styles.radioButton}
|
||||
onPress={(itemValue) => {
|
||||
this.setState({currentPositionValue: itemValue})
|
||||
}}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.symptomViewRowInline}>
|
||||
<Text style={styles.symptomDayView}>Exclude</Text>
|
||||
<Switch
|
||||
onValueChange={(val) => {
|
||||
this.setState({ exclude: val })
|
||||
}}
|
||||
value={this.state.exclude}
|
||||
/>
|
||||
</View>
|
||||
<View style={styles.actionButtonRow}>
|
||||
{this.makeActionButtons(
|
||||
{
|
||||
symptom: 'cervix',
|
||||
cycleDay: this.cycleDay,
|
||||
saveAction: () => {
|
||||
saveSymptom('cervix', this.cycleDay, {
|
||||
opening: this.state.currentOpeningValue,
|
||||
firmness: this.state.currentFirmnessValue,
|
||||
position: this.state.currentPositionValue,
|
||||
exclude: this.state.exclude
|
||||
})
|
||||
},
|
||||
saveDisabled: this.state.currentOpeningValue === -1 || this.state.currentFirmnessValue === -1
|
||||
}
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user