Adding computed NFP mucus value to database and do cycle day overview

This commit is contained in:
emelko
2018-07-13 23:00:26 +02:00
parent 7e0456c10f
commit d89e103843
4 changed files with 9 additions and 3 deletions
+3 -1
View File
@@ -9,6 +9,7 @@ import {
bleeding as labels,
mucusFeeling as feelingLabels,
mucusTexture as textureLabels,
mucusNFP as computeSensiplanMucusLabels,
} from '../labels/labels'
import cycleDayModule from '../lib/get-cycle-day-number'
import { bleedingDaysSortedByDate } from '../db'
@@ -61,9 +62,10 @@ export default class DayView extends Component {
const mucusFeelingValue = this.cycleDay.mucus && this.cycleDay.mucus.feeling
const mucusTextureValue = this.cycleDay.mucus && this.cycleDay.mucus.texture
const mucusComputedValue = this.cycleDay.mucus && this.cycleDay.mucus.computedNfp
let mucusLabel
if (typeof mucusFeelingValue === 'number' && typeof mucusTextureValue === 'number') {
mucusLabel = `${feelingLabels[mucusFeelingValue]} + ${textureLabels[mucusTextureValue]}`
mucusLabel = `${feelingLabels[mucusFeelingValue]} + ${textureLabels[mucusTextureValue]} ( ${computeSensiplanMucusLabels[mucusComputedValue]} )`
if (this.cycleDay.mucus.exclude) mucusLabel = "( " + mucusLabel + " )"
} else {
mucusLabel = 'edit'
+3 -1
View File
@@ -1,9 +1,11 @@
const bleeding = ['spotting', 'light', 'medium', 'heavy']
const mucusFeeling = ['dry', 'nothing', 'wet', 'slippery']
const mucusTexture = ['nothing', 'creamy', 'egg white']
const mucusNFP = ['t', 'Ø', 'f', 'S', '+S']
export {
bleeding,
mucusFeeling,
mucusTexture
mucusTexture,
mucusNFP
}
+2 -1
View File
@@ -32,6 +32,7 @@ export default class Mucus extends Component {
this.state = {
currentFeelingValue,
currentTextureValue,
computeSensiplanValue,
exclude: this.cycleDay.mucus ? this.cycleDay.mucus.exclude : false
}
@@ -138,7 +139,7 @@ export default class Mucus extends Component {
saveMucus(this.cycleDay, {
feeling: this.state.currentFeelingValue,
texture: this.state.currentTextureValue,
computedValue: computeSensiplanValue(this.state.currentFeelingValue, this.state.currentTextureValue),
computedNfp: computeSensiplanValue(this.state.currentFeelingValue, this.state.currentTextureValue),
exclude: this.state.exclude
})
this.showView('dayView')
+1
View File
@@ -23,6 +23,7 @@ const MucusSchema = {
properties: {
feeling: 'int',
texture: 'int',
computedNfp: 'int',
exclude: 'bool'
}
}