From d89e1038438ae61bfa95bfeaf1d1d5eb513fa5dc Mon Sep 17 00:00:00 2001
From: emelko <ml.kochsiek@mailbox.org>
Date: Fri, 13 Jul 2018 23:00:26 +0200
Subject: [PATCH] Adding computed NFP mucus value to database and do cycle day
 overview

---
 components/cycle-day/cycle-day-overview.js | 4 +++-
 components/cycle-day/labels/labels.js      | 4 +++-
 components/mucus.js                        | 3 ++-
 db.js                                      | 1 +
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/components/cycle-day/cycle-day-overview.js b/components/cycle-day/cycle-day-overview.js
index 98a78808..22036530 100644
--- a/components/cycle-day/cycle-day-overview.js
+++ b/components/cycle-day/cycle-day-overview.js
@@ -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'
diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js
index 83c1afe0..459370b2 100644
--- a/components/cycle-day/labels/labels.js
+++ b/components/cycle-day/labels/labels.js
@@ -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
 }
diff --git a/components/mucus.js b/components/mucus.js
index 4c75148f..c1d47df0 100644
--- a/components/mucus.js
+++ b/components/mucus.js
@@ -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')
diff --git a/db.js b/db.js
index 455acd82..c0533bf3 100644
--- a/db.js
+++ b/db.js
@@ -23,6 +23,7 @@ const MucusSchema = {
   properties: {
     feeling: 'int',
     texture: 'int',
+    computedNfp: 'int',
     exclude: 'bool'
   }
 }
-- 
GitLab