Commit Graph

55 Commits

Author SHA1 Message Date
Julia Friesel 083e55eee8 Apply select tab group to pain edit view 2018-09-01 20:12:44 +02:00
Julia Friesel 4ed3aa48e0 Merge branch 'master' into 156-make-components-like-prettier-radio-buttons 2018-09-01 19:59:30 +02:00
Julia Friesel 8b37fa3ca4 Add app text component and remove radio button dep 2018-09-01 18:11:55 +02:00
emelko ea83d6eb6b Merge branch 'master' into 117-implement-pain 2018-08-31 20:59:23 +02:00
emelko a664b6dfa8 Fixing pain and sex label for entering "other" and "note", displayed as:
- Other 
or if note is true
- Other (This is a note.)
2018-08-31 20:55:51 +02:00
Julia Friesel 1ba41c934f Use style arrays 2018-08-31 14:51:41 +02:00
tina a3c02d30a0 disables entries for future datas except note, puts note at the end of the symptom list 2018-08-31 13:00:39 +02:00
emelko ab4149373f If sex.other and/or pain.other gets a note, label will only display the note itself 2018-08-30 23:45:40 +02:00
emelko b5e58c176a Merge branch 'master' into 117-implement-pain 2018-08-30 21:40:37 +02:00
emelko 7c1cd18b1c SexLabel on cycle day overview now shows all the selected values 2018-08-30 21:39:21 +02:00
Bl00dyMarie c258ad9e01 Implements 2 improvements from MR comments:
- Moves title of symptom in the header
- Deletes additional comma out of cycle day overview
2018-08-30 11:47:15 +02:00
Julia Friesel 398c726d94 Replace binds with lambdas 2018-08-28 08:40:09 +02:00
Bl00dyMarie d711b411c7 Adds value of note to pain label on cycle day overview 2018-08-27 18:06:21 +02:00
Bl00dyMarie ad9997f73b Putting all the labels of selected pain keys in the cycle day overview 2018-08-27 18:06:21 +02:00
Bl00dyMarie e68b8f5460 Adding "other" as pain option and link text input to it 2018-08-27 18:05:53 +02:00
Bl00dyMarie 30752a05c2 Adding pain with 7 boolean values to track 2018-08-27 18:05:53 +02:00
Julia Friesel fde9a6cbc3 Remove unneeded imports 2018-08-20 17:13:03 +02:00
Julia Friesel 90e0cdffea Fix go to next cycle day 2018-08-20 17:00:44 +02:00
Julia Friesel d53b8029dc Make scrolling work again 2018-08-20 16:46:42 +02:00
Julia Friesel d897c3b89f On temperature view, replace menu with action buttons 2018-08-20 13:36:11 +02:00
Julia Friesel 86f26e3814 Position footer and fix navigating to cycle day view 2018-08-19 15:02:01 +02:00
Julia Friesel 39d598f3aa Improve symptom data display 2018-08-19 13:53:55 +02:00
Julia Friesel 51629f67e2 Place header as component 2018-08-17 16:26:00 +02:00
Julia Friesel 636e5e2f9d Use navigator for symptom views also 2018-08-17 10:17:17 +02:00
Julia Friesel 1c390f784c Use realistic icon and set active state 2018-08-17 08:59:44 +02:00
Julia Friesel fae278435a Add navigation arrows 2018-08-17 08:05:15 +02:00
Julia Friesel a59aa86dbf Fix key 2018-08-16 21:45:17 +02:00
Julia Friesel ff60db089c Align grid 2018-08-16 21:32:55 +02:00
Julia Friesel 29a82fca9f Start styling the day overview 2018-08-16 19:43:56 +02:00
Bl00dyMarie a64bfbcd50 Implement Sex \o/:
* Offers tracking sex activities and contraceptives as much as you want
* "Other" contraceptive allows to specify with text input
2018-08-13 16:47:19 +02:00
Julia Friesel c525812a0e Reduce line lengths 2018-08-06 13:10:59 +02:00
Julia Friesel 310683c5f8 Programmatically add props to cycle day views 2018-08-06 13:10:59 +02:00
emelko 8e56fc0b23 Adds new set of labels for chosing intensity of a tracking category 2018-08-03 13:28:10 +02:00
emelko e42d25a087 Revert "Renames cervixPosition labels into more universal positionOrIntensity"
This reverts commit f7efadb08a.
2018-08-03 13:22:34 +02:00
emelko 30839b5589 Adds desire as a tracking category to our app;
no exclude, no fancy nothing else, only pure desire tracking.
2018-08-02 17:19:21 +02:00
emelko f7efadb08a Renames cervixPosition labels into more universal positionOrIntensity 2018-08-02 17:18:19 +02:00
emelko 5f840aa669 For the sake of not exceeding max line length 2018-07-30 18:29:35 +02:00
emelko 20d1af4cdd Fix mucus.value instead of mucus.computedNfp; additional check for mucus.value 2018-07-30 16:39:10 +02:00
Julia Friesel d44b6c348e Add note symptom view 2018-07-25 11:11:57 +02:00
Julia Friesel 2d3c74db02 Merge branch '73-implement-nfp-logic-for-mucus-mode' into 'master'
Resolve "implement NFP logic for mucus mode"

Closes #73

See merge request bloodyhealth/drip!20
2018-07-25 08:56:34 +00:00
Julia Friesel e3b8e5d717 Fix label, replace old property 2018-07-24 17:52:44 +02:00
Julia Friesel 5468c8051d Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode 2018-07-23 19:00:49 +02:00
emelko bae2192a60 Consistency of no space in {} 2018-07-23 18:16:22 +02:00
emelko bcc901c061 Fixing bleeding and temperature button label on cycle day overview 2018-07-23 18:15:57 +02:00
Julia Friesel 32c08c8df7 Fix cycle day overview categories inline 2018-07-20 18:58:30 +02:00
emelko b8e99194d9 Reorganise labels for cylce day overview 2018-07-20 18:25:20 +02:00
emelko 4a2b99f9d5 Adds cervix to symptoms:
has 3 properties: opening, firmness and position (which is optional);
2018-07-20 18:24:04 +02:00
Julia Friesel 79f17644d7 ComputedNfp => value 2018-07-16 18:21:58 +02:00
Julia Friesel c96d3d4550 Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode 2018-07-16 13:55:07 +02:00
emelko 6f755c55dc Post refactor clean-up 2018-07-16 12:39:11 +02:00