Merge branch '172-add-unprotected-to-contraceptives' into 'master'

Add 'unprotected' and 'diaphragm" to contraceptives

Closes #172

See merge request bloodyhealth/drip!81

components/cycle-day/labels/labels.js

@@ -43,6 +43,8 @@ export const sex = {
   patch: 'Patch',
   ring: 'Ring',
   implant: 'Implant',
+  diaphragm: 'Diaphragm',
+  none: 'None',
   other: 'Other',
   activityExplainer: 'Were you sexually active today?',
   contraceptiveExplainer: 'Did you use contraceptives?'

components/cycle-day/symptoms/sex.js

@@ -37,6 +37,12 @@ const contraceptiveBoxes = [{
 }, {
   label: labels.implant,
   stateKey: 'implant'
+}, {
+  label: labels.diaphragm,
+  stateKey: 'diaphragm'
+}, {
+  label: labels.none,
+  stateKey: 'none'
 }, {
   label: labels.other,
   stateKey: 'other'

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 },
+    none: { type: 'bool', optional: true },
     other: { type: 'bool', optional: true },
     note: { type: 'string', optional: true }
   }
@@ -137,4 +139,4 @@ export default [
   DesireSchema,
   SexSchema,
   PainSchema
-]
+]