From b973119321216df5dc2facb416d68279a5b1ff36 Mon Sep 17 00:00:00 2001
From: emelko <ml.kochsiek@mailbox.org>
Date: Thu, 20 Sep 2018 22:36:21 +0200
Subject: [PATCH 1/2] Add 'unprotected' and 'diaphragm" to contraceptives

---
 components/cycle-day/labels/labels.js | 2 ++
 components/cycle-day/symptoms/sex.js  | 6 ++++++
 db/schema.js                          | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js
index 5566f73..54db7e7 100644
--- a/components/cycle-day/labels/labels.js
+++ b/components/cycle-day/labels/labels.js
@@ -43,6 +43,8 @@ export const sex = {
   patch: 'Patch',
   ring: 'Ring',
   implant: 'Implant',
+  diaphragm: 'Diaphragm',
+  unprotected: 'Unprotected',
   other: 'Other',
   activityExplainer: 'Were you sexually active today?',
   contraceptiveExplainer: 'Did you use contraceptives?'
diff --git a/components/cycle-day/symptoms/sex.js b/components/cycle-day/symptoms/sex.js
index a51b5c0..3bca232 100644
--- a/components/cycle-day/symptoms/sex.js
+++ b/components/cycle-day/symptoms/sex.js
@@ -37,6 +37,12 @@ const contraceptiveBoxes = [{
 }, {
   label: labels.implant,
   stateKey: 'implant'
+}, {
+  label: labels.diaphragm,
+  stateKey: 'diaphragm'
+}, {
+  label: labels.unprotected,
+  stateKey: 'unprotected'
 }, {
   label: labels.other,
   stateKey: 'other'
diff --git a/db/schema.js b/db/schema.js
index 8e8792a..0928461 100644
--- a/db/schema.js
+++ b/db/schema.js
@@ -67,6 +67,8 @@ const SexSchema = {
     patch: { type: 'bool', optional: true },
     ring: { type: 'bool', optional: true },
     implant: { type: 'bool', optional: true },
+    diaphragm: { type: 'bool', optional: true },
+    unprotected: { type: 'bool', optional: true },
     other: { type: 'bool', optional: true },
     note: { type: 'string', optional: true }
   }

From fc514a793d6c978bfcbe7ab772309d61fa60362a Mon Sep 17 00:00:00 2001
From: emelko <ml.kochsiek@mailbox.org>
Date: Wed, 26 Sep 2018 12:25:44 +0200
Subject: [PATCH 2/2] Rename contraception option 'unprotected' in 'none'

---
 components/cycle-day/labels/labels.js | 2 +-
 components/cycle-day/symptoms/sex.js  | 4 ++--
 db/schema.js                          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/cycle-day/labels/labels.js b/components/cycle-day/labels/labels.js
index 54db7e7..b70d6d9 100644
--- a/components/cycle-day/labels/labels.js
+++ b/components/cycle-day/labels/labels.js
@@ -44,7 +44,7 @@ export const sex = {
   ring: 'Ring',
   implant: 'Implant',
   diaphragm: 'Diaphragm',
-  unprotected: 'Unprotected',
+  none: 'None',
   other: 'Other',
   activityExplainer: 'Were you sexually active today?',
   contraceptiveExplainer: 'Did you use contraceptives?'
diff --git a/components/cycle-day/symptoms/sex.js b/components/cycle-day/symptoms/sex.js
index 3bca232..1e14b06 100644
--- a/components/cycle-day/symptoms/sex.js
+++ b/components/cycle-day/symptoms/sex.js
@@ -41,8 +41,8 @@ const contraceptiveBoxes = [{
   label: labels.diaphragm,
   stateKey: 'diaphragm'
 }, {
-  label: labels.unprotected,
-  stateKey: 'unprotected'
+  label: labels.none,
+  stateKey: 'none'
 }, {
   label: labels.other,
   stateKey: 'other'
diff --git a/db/schema.js b/db/schema.js
index 0928461..96445cc 100644
--- a/db/schema.js
+++ b/db/schema.js
@@ -68,7 +68,7 @@ const SexSchema = {
     ring: { type: 'bool', optional: true },
     implant: { type: 'bool', optional: true },
     diaphragm: { type: 'bool', optional: true },
-    unprotected: { type: 'bool', optional: true },
+    none: { type: 'bool', optional: true },
     other: { type: 'bool', optional: true },
     note: { type: 'string', optional: true }
   }
@@ -139,4 +139,4 @@ export default [
   DesireSchema,
   SexSchema,
   PainSchema
-]
\ No newline at end of file
+]