Skip to content
Snippets Groups Projects
Commit 79f17644 authored by Julia Friesel's avatar Julia Friesel
Browse files

ComputedNfp => value

parent c96d3d45
No related branches found
No related tags found
No related merge requests found
...@@ -62,7 +62,7 @@ export default class DayView extends Component { ...@@ -62,7 +62,7 @@ export default class DayView extends Component {
const mucusFeelingValue = this.cycleDay.mucus && this.cycleDay.mucus.feeling const mucusFeelingValue = this.cycleDay.mucus && this.cycleDay.mucus.feeling
const mucusTextureValue = this.cycleDay.mucus && this.cycleDay.mucus.texture const mucusTextureValue = this.cycleDay.mucus && this.cycleDay.mucus.texture
const mucusComputedValue = this.cycleDay.mucus && this.cycleDay.mucus.computedNfp const mucusComputedValue = this.cycleDay.mucus && this.cycleDay.mucus.value
let mucusLabel let mucusLabel
if (typeof mucusFeelingValue === 'number' && typeof mucusTextureValue === 'number') { if (typeof mucusFeelingValue === 'number' && typeof mucusTextureValue === 'number') {
mucusLabel = `${feelingLabels[mucusFeelingValue]} + ${textureLabels[mucusTextureValue]} ( ${computeSensiplanMucusLabels[mucusComputedValue]} )` mucusLabel = `${feelingLabels[mucusFeelingValue]} + ${textureLabels[mucusTextureValue]} ( ${computeSensiplanMucusLabels[mucusComputedValue]} )`
......
...@@ -23,7 +23,7 @@ const MucusSchema = { ...@@ -23,7 +23,7 @@ const MucusSchema = {
properties: { properties: {
feeling: 'int', feeling: 'int',
texture: 'int', texture: 'int',
computedNfp: 'int', value: 'int',
exclude: 'bool' exclude: 'bool'
} }
} }
......
...@@ -8,12 +8,12 @@ export default function (dateString) { ...@@ -8,12 +8,12 @@ export default function (dateString) {
const cycle = getCycleDaysBeforeDay(dateString) const cycle = getCycleDaysBeforeDay(dateString)
if (!cycle) return fertilityStatus.unknown if (!cycle) return fertilityStatus.unknown
// we get earliest last, but sympto wants earliest first
cycle.reverse()
const previousCycles = getPreviousCycles(cycle[0]) const previousCycles = getPreviousCycles(cycle[0])
previousCycles.forEach(cycle => cycle.reverse())
const status = getFertilityStatus({cycle, previousCycles}) const status = getFertilityStatus({
cycle: formatCycleForSympto(cycle),
previousCycles: previousCycles.map(formatCycleForSympto)
})
return formatStatusForApp(status) return formatStatusForApp(status)
} }
...@@ -24,4 +24,10 @@ function formatStatusForApp(status) { ...@@ -24,4 +24,10 @@ function formatStatusForApp(status) {
} else { } else {
return fertilityStatus.infertile return fertilityStatus.infertile
} }
}
function formatCycleForSympto(cycle) {
// we get earliest last, but sympto wants earliest first
cycle.reverse()
return cycle
} }
\ No newline at end of file
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