Commit Graph

1938 Commits

Author SHA1 Message Date
Julia Friesel 8bbf122d12 Ignore 0 -> 1 mucus shift 2018-08-02 11:12:01 +02:00
Julia Friesel 6ac642b91c Merge branch '95-bug-ignore-mucus-values-in-irrelevant-phase' into 'master'
Resolve "bug: ignore mucus values in irrelevant phase"

Closes #95

See merge request bloodyhealth/drip!42
2018-08-02 08:36:04 +00:00
Julia Friesel 574e7ed854 Ignore highest quality after end of eval 2018-08-01 16:45:41 +02:00
tina bc28d28331 Merge branch '96-write-function-for-period-length-evaluation' into 'master'
Resolve "write function for period length evaluation"

Closes #96

See merge request bloodyhealth/drip!40
2018-08-01 14:01:05 +00:00
tina 00a7de0faf little improvements and test for array of one element 2018-08-01 15:49:44 +02:00
tina 9664984e72 rounds period stats, adds tests 2018-08-01 15:19:59 +02:00
tina cceecc071d computes the stats about the period lengths, started tests 2018-07-31 15:06:16 +02:00
bl00dymarie ac8d383729 Merge branch 'Fix-label-on-cycle-day-overview' into 'master'
Bugfix

See merge request bloodyhealth/drip!39
2018-07-31 07:00:56 +00: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
bl00dymarie 3a4ce79ea2 Merge branch '53-update-readme' into 'master'
Resolve "update readme"

Closes #53

See merge request bloodyhealth/drip!36
2018-07-25 12:25:51 +00:00
emelko 6855a905fe Small update of README 2018-07-25 11:59:58 +02:00
bl00dymarie 7033f72333 Merge branch 'Missing-android-files' into 'master'
Adding missing android res files

See merge request bloodyhealth/drip!35
2018-07-25 09:26:15 +00:00
emelko edc701873e Adding missing android res files 2018-07-25 11:23:08 +02:00
Julia Friesel 2950abf047 Merge branch '70-implement-note-2' into 'master'
Resolve "implement note"

Closes #70

See merge request bloodyhealth/drip!33
2018-07-25 09:14:58 +00: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 a2400983cf Move status labels to cycle day labels 2018-07-24 14:30:20 +02:00
Julia Friesel 5ce6bc8cfc Handle cycle with mucus on first cycle day 2018-07-24 14:21:10 +02:00
bl00dymarie 444991fbec Merge branch '92-investigate-error-message-on-master' into 'master'
Resolve "Investigate error message on master"

Closes #92

See merge request bloodyhealth/drip!32
2018-07-24 06:42:44 +00:00
Julia Friesel 5468c8051d Merge branch 'master' into 73-implement-nfp-logic-for-mucus-mode 2018-07-23 19:00:49 +02:00
Julia Friesel cac2e4b6e9 Merge branch '90-show-mucus-on-chart' into 'master'
Resolve "show mucus on chart"

Closes #90

See merge request bloodyhealth/drip!30
2018-07-23 16:44:54 +00: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
bl00dymarie fb56fe4c2e Merge branch 'adding-cervix-symptom' into 'master'
Adding cervix symptom

See merge request bloodyhealth/drip!31
2018-07-23 12:01:23 +00:00
Julia Friesel 201a0d0ae1 Re-add delete all button 2018-07-23 12:59:40 +02:00
Julia Friesel f52401d05d Add button to add dummy data 2018-07-23 12:22:27 +02:00
emelko 0f6f28e8e4 Implementing Julia's suggestion to remove repetition 2018-07-20 19:11:24 +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 c184485c1d Add mucus icon to chart 2018-07-20 12:52:10 +02:00
Julia Friesel fc014f3ee2 Merge branch '89-make-symptom-views-vertically-scrollable' into 'master'
Resolve "make symptom views vertically scrollable"

Closes #89

See merge request bloodyhealth/drip!29
2018-07-20 10:08:11 +00:00
Julia Friesel 2a2f91fc55 Make everything scrollable 2018-07-20 11:54:47 +02:00
Julia Friesel 48aba2bbaf Merge branch '66-add-local-time-to-temp' into 'master'
Resolve "add local time to temp"

Closes #66

See merge request bloodyhealth/drip!26
2018-07-20 05:58:09 +00:00
Julia Friesel 44c31b197e Use time picker for time field 2018-07-19 18:27:46 +02:00
Julia Friesel b63a9560df Draw horizontal line only during temp measuring phase 2018-07-19 07:51:28 +02:00
Julia Friesel 4b5f4f905a Extract styles and move vertical line a bit so it's completely visible 2018-07-19 07:29:54 +02:00
Julia Friesel 955207ed8d Draw vertical and horizontal line in chart for completed sympto eval 2018-07-19 07:17:30 +02:00
Julia Friesel 8afbaa485c Only activate save button when time is a valid one 2018-07-18 16:51:49 +02:00
Julia Friesel 67ebacfdd7 Fix whitespace 2018-07-18 16:39:52 +02:00
Julia Friesel 58aa0c4b8d Remove assumeFertility from status, derive from phases instead 2018-07-18 14:18:04 +02:00
Julia Friesel ebf18dac22 Refactor getStatusAsString 2018-07-18 14:14:43 +02:00
Julia Friesel 42a96da69d Change cycle module API, add getCycleForDay, remove unused functions 2018-07-18 13:32:40 +02:00
Julia Friesel 1fb6c24629 Update directories to be linted 2018-07-18 13:31:44 +02:00
Julia Friesel 52b6e5de0a Make previousCycle explicit in signature 2018-07-18 10:02:11 +02:00
Julia Friesel ce87dda091 Make time field visible for new temps also 2018-07-16 19:01:45 +02:00
Julia Friesel e3ddcaa0b1 Save time when first entering temp 2018-07-16 18:54:09 +02:00
Julia Friesel b455a030cc Label last day of post-ovu phase differently 2018-07-16 18:39:40 +02:00