From 79f17644d701ab49de65a1b45ea6b1bd144d71d5 Mon Sep 17 00:00:00 2001
From: Julia Friesel <julia.friesel@gmail.com>
Date: Mon, 16 Jul 2018 18:21:58 +0200
Subject: [PATCH] ComputedNfp => value
---
components/cycle-day/cycle-day-overview.js | 2 +-
db.js | 2 +-
lib/sympto-adapter.js | 14 ++++++++++----
3 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js
index d43aab44..a4174a4b 100644
--- a/components/cycle-day/cycle-day-overview.js
+++ b/components/cycle-day/cycle-day-overview.js
@@ -62,7 +62,7 @@ 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
+ const mucusComputedValue = this.cycleDay.mucus && this.cycleDay.mucus.value
let mucusLabel
if (typeof mucusFeelingValue === 'number' && typeof mucusTextureValue === 'number') {
mucusLabel = `${feelingLabels[mucusFeelingValue]} + ${textureLabels[mucusTextureValue]} ( ${computeSensiplanMucusLabels[mucusComputedValue]} )`
diff --git a/db.js b/db.js
index c0533bf3..7f5e3e5c 100644
--- a/db.js
+++ b/db.js
@@ -23,7 +23,7 @@ const MucusSchema = {
properties: {
feeling: 'int',
texture: 'int',
- computedNfp: 'int',
+ value: 'int',
exclude: 'bool'
}
}
diff --git a/lib/sympto-adapter.js b/lib/sympto-adapter.js
index 6d2a489b..79a4742d 100644
--- a/lib/sympto-adapter.js
+++ b/lib/sympto-adapter.js
@@ -8,12 +8,12 @@ export default function (dateString) {
const cycle = getCycleDaysBeforeDay(dateString)
if (!cycle) return fertilityStatus.unknown
- // we get earliest last, but sympto wants earliest first
- cycle.reverse()
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)
}
@@ -24,4 +24,10 @@ function formatStatusForApp(status) {
} else {
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
--
GitLab