Skip to content
Snippets Groups Projects
Commit 4a2b99f9 authored by emelko's avatar emelko
Browse files

Adds cervix to symptoms:

has 3 properties: opening, firmness and position (which is optional);
parent fc014f3e
No related branches found
No related tags found
No related merge requests found
import React, { Component } from 'react'
import {
View,
Button,
Text,
Switch
} from 'react-native'
import RadioForm from 'react-native-simple-radio-button'
import { saveCervix } from '../db'
import styles from '../styles/index'
import {
cervixPosition as positionLabels,
cervixConsistency as consistencyLabels
} from '../labels/labels'
import computeSensiplanValue from '../lib/sensiplan-cervix'
export default class Cervix extends Component {
constructor(props) {
super(props)
this.cycleDay = props.cycleDay
this.showView = props.showView
let currentPositionValue = this.cycleDay.cervix && this.cycleDay.cervix.position
if (typeof currentPositionValue !== 'number') {
currentPositionValue = -1
}
let currentConsistencyValue = this.cycleDay.cervix && this.cycleDay.cervix.consistency
if (typeof currentConsistencyValue !== 'number') {
currentConsistencyValue = -1
}
this.state = {
currentPositionValue,
currentConsistencyValue,
computeSensiplanValue,
exclude: this.cycleDay.cervix ? this.cycleDay.cervix.exclude : false
}
}
render() {
const cervixPositionRadioProps = [
{label: positionLabels[0], value: 0 },
{label: positionLabels[1], value: 1 },
{label: positionLabels[2], value: 2 }
]
const cervixConsistencyRadioProps = [
{label: consistencyLabels[0], value: 0 },
{label: consistencyLabels[1], value: 1 }
]
return(
<View style={ styles.symptomEditView }>
<View style={ styles.symptomEditSplitSymptomsAndLastRowButtons }>
<View style={ styles.symptomEditListedSymptomView }>
<View style={{flex: 1}}>
<Text style={styles.symptomDayView}>Cervix</Text>
</View>
<View style={{flex: 1}}>
<Text style={styles.symptomDayView}>Position</Text>
</View>
<View style={{flex: 1}}>
<RadioForm
radio_props={cervixPositionRadioProps}
initial={this.state.currentPositionValue}
formHorizontal={true}
labelHorizontal={false}
labelStyle={styles.radioButton}
onPress={(itemValue) => {
this.setState({currentPositionValue: itemValue})
}}
/>
</View>
<View style={{flex: 1}}>
<Text style={styles.symptomDayView}>Consistency</Text>
</View>
<View style={{flex: 1}}>
<RadioForm
radio_props={cervixConsistencyRadioProps}
initial={this.state.currentConsistencyValue}
formHorizontal={true}
labelHorizontal={false}
labelStyle={styles.radioButton}
onPress={(itemValue) => {
this.setState({currentConsistencyValue: itemValue})
}}
/>
</View>
</View>
<View style={ styles.itemsInRowSeparatedView }>
<View style={ styles.singleButtonView }>
<Text style={ styles.symptomDayView }>Exclude</Text>
</View>
<View style={ styles.singleButtonView }>
<Switch
onValueChange={(val) => {
this.setState({exclude: val})
}}
value={this.state.exclude}
/>
</View>
</View>
</View>
<View style={ styles.itemsInRowSeparatedView }>
<View style={ styles.singleButtonView }>
<Button
onPress={() => this.showView('dayView')}
title="Cancel">
</Button>
</View>
<View style={ styles.singleButtonView }>
<Button
onPress={() => {
saveCervix(this.cycleDay)
this.showView('dayView')
}}
title="Delete">
</Button>
</View>
<View style={ styles.singleButtonView }>
<Button
onPress={() => {
saveCervix(this.cycleDay, {
position: this.state.currentPositionValue,
consistency: this.state.currentConsistencyValue,
computedNfp: computeSensiplanValue(this.state.currentPositionValue, this.state.currentConsistencyValue),
exclude: this.state.exclude
})
this.showView('dayView')
}}
disabled={ this.state.currentPositionValue === -1 || this.state.currentConsistencyValue === -1 }
title="Save">
</Button>
</View>
</View>
</View>
)
}
}
...@@ -10,6 +10,9 @@ import { ...@@ -10,6 +10,9 @@ import {
mucusFeeling as feelingLabels, mucusFeeling as feelingLabels,
mucusTexture as textureLabels, mucusTexture as textureLabels,
mucusNFP as computeSensiplanMucusLabels, mucusNFP as computeSensiplanMucusLabels,
cervixOpening as openingLabels,
cervixFirmness as firmnessLabels,
cervixPosition as positionLabels
} from './labels/labels' } from './labels/labels'
import cycleDayModule from '../../lib/get-cycle-day-number' import cycleDayModule from '../../lib/get-cycle-day-number'
import { bleedingDaysSortedByDate } from '../../db' import { bleedingDaysSortedByDate } from '../../db'
...@@ -49,6 +52,7 @@ export default class DayView extends Component { ...@@ -49,6 +52,7 @@ export default class DayView extends Component {
} else { } else {
bleedingLabel = 'edit' bleedingLabel = 'edit'
} }
const temperatureValue = this.cycleDay.temperature && this.cycleDay.temperature.value const temperatureValue = this.cycleDay.temperature && this.cycleDay.temperature.value
let temperatureLabel let temperatureLabel
if (typeof temperatureValue === 'number') { if (typeof temperatureValue === 'number') {
...@@ -71,6 +75,17 @@ export default class DayView extends Component { ...@@ -71,6 +75,17 @@ export default class DayView extends Component {
mucusLabel = 'edit' 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 ( return (
<View style={styles.symptomEditView}> <View style={styles.symptomEditView}>
<View style={styles.symptomViewRowInline}> <View style={styles.symptomViewRowInline}>
...@@ -100,6 +115,17 @@ export default class DayView extends Component { ...@@ -100,6 +115,17 @@ export default class DayView extends Component {
</Button> </Button>
</View> </View>
</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 > </View >
) )
} }
......
...@@ -10,6 +10,7 @@ import BleedingEditView from './symptoms/bleeding' ...@@ -10,6 +10,7 @@ import BleedingEditView from './symptoms/bleeding'
import TemperatureEditView from './symptoms/temperature' import TemperatureEditView from './symptoms/temperature'
import MucusEditView from './symptoms/mucus' import MucusEditView from './symptoms/mucus'
import { formatDateForViewHeader } from './labels/format' import { formatDateForViewHeader } from './labels/format'
import CervixEditView from './symptoms/cervix'
import styles from '../../styles' import styles from '../../styles'
import actionButtonModule from './action-buttons' import actionButtonModule from './action-buttons'
...@@ -48,7 +49,8 @@ export default class Day extends Component { ...@@ -48,7 +49,8 @@ export default class Day extends Component {
{ dayView: <DayView cycleDay={this.cycleDay} showView={this.showView} />, { dayView: <DayView cycleDay={this.cycleDay} showView={this.showView} />,
bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>, bleedingEditView: <BleedingEditView cycleDay={this.cycleDay} makeActionButtons={this.makeActionButtons}/>,
temperatureEditView: <TemperatureEditView 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] }[this.state.visibleComponent]
} }
</View > </View >
......
...@@ -2,10 +2,16 @@ const bleeding = ['spotting', 'light', 'medium', 'heavy'] ...@@ -2,10 +2,16 @@ const bleeding = ['spotting', 'light', 'medium', 'heavy']
const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery'] const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery']
const mucusTexture = ['nothing', 'creamy', 'egg white'] const mucusTexture = ['nothing', 'creamy', 'egg white']
const mucusNFP = ['t', 'Ø', 'f', 'S', '+S'] const mucusNFP = ['t', 'Ø', 'f', 'S', '+S']
const cervixOpening = ['closed', 'medium', 'open']
const cervixFirmness = ['hard', 'soft']
const cervixPosition = ['low', 'medium', 'high']
export { export {
bleeding, bleeding,
mucusFeeling, mucusFeeling,
mucusTexture, mucusTexture,
mucusNFP mucusNFP,
cervixOpening,
cervixFirmness,
cervixPosition
} }
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>
)
}
}
...@@ -32,6 +32,16 @@ const MucusSchema = { ...@@ -32,6 +32,16 @@ const MucusSchema = {
} }
} }
const CervixSchema = {
name: 'Cervix',
properties: {
opening: 'int',
firmness: 'int',
position: {type: 'int', optional: true },
exclude: 'bool'
}
}
const CycleDaySchema = { const CycleDaySchema = {
name: 'CycleDay', name: 'CycleDay',
primaryKey: 'date', primaryKey: 'date',
...@@ -48,6 +58,10 @@ const CycleDaySchema = { ...@@ -48,6 +58,10 @@ const CycleDaySchema = {
mucus: { mucus: {
type: 'Mucus', type: 'Mucus',
optional: true optional: true
},
cervix: {
type: 'Cervix',
optional: true
} }
} }
} }
...@@ -57,7 +71,8 @@ const db = new Realm({ ...@@ -57,7 +71,8 @@ const db = new Realm({
CycleDaySchema, CycleDaySchema,
TemperatureSchema, TemperatureSchema,
BleedingSchema, BleedingSchema,
MucusSchema MucusSchema,
CervixSchema
], ],
// we only want this in dev mode // we only want this in dev mode
deleteRealmIfMigrationNeeded: true deleteRealmIfMigrationNeeded: true
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment