Commit Graph

527 Commits

Author SHA1 Message Date
tina 20c0867422 shows predicted bleeding with red circles, also sets up today formatting 2018-09-14 16:41:27 +02:00
tina ae18e19ffa Merge branch '150-apply-design-to-chart' into 'master'
changes y-ticks and labels, cycle day display and colors of symbols

Closes #146 and #150

See merge request bloodyhealth/drip!72
2018-09-14 12:02:54 +00:00
tina e4b6cfabdc Merge branch '157-apply-design-to-stats-screens' into 'master'
makes stats beautiful

Closes #157

See merge request bloodyhealth/drip!74
2018-09-14 11:29:10 +00:00
tina 1e220ef9e3 Merge branch 'master' into '150-apply-design-to-chart'
# Conflicts:
#   components/calendar.js
#   components/chart/y-axis.js
2018-09-14 11:28:38 +00:00
tina 5218e72daf applies little improvements suggested in review 2018-09-14 13:22:24 +02:00
tina 163f6b5738 little improvements after review 2018-09-14 12:26:11 +02:00
bl00dymarie 856de554d2 Merge branch '83-implement-nfp-logic-for-cervix-mode' into 'master'
Resolve "implement nfp logic for cervix mode"

Closes #83

See merge request bloodyhealth/drip!38
2018-09-14 06:27:12 +00:00
Julia Friesel 3d3a7e33cb Merge branch '148-actually-package-the-app-and-install-it' into 'master'
Resolve "actually package the app and install it"

Closes #148

See merge request bloodyhealth/drip!73
2018-09-13 13:22:45 +00:00
emelko 14989d81d5 Add better test as dummy cervix data 2018-09-13 10:49:42 +02:00
emelko 76056e1db0 Improving cervix:
* adding tempEvalEnd value to cervix tests
* more comments in code for cervix sympto
* better description in cervix temp tests
* take out cervix.value
2018-09-13 09:54:13 +02:00
tina 94d991d868 little improvements to view styling 2018-09-12 18:31:18 +02:00
tina e9ebde9162 makes stats beautiful 2018-09-12 18:01:01 +02:00
tina cc4c1e8ed6 removes 0.2 units as this introduces buggy behaviour in ticks, changes line styles 2018-09-12 15:46:10 +02:00
emelko 3f5c86086d Renaming test cycles for cervix+temp to be more explicit abt what they do 2018-09-10 12:28:54 +02:00
emelko 2f42840faa Revert "Renaming test cycles to be more explicit abt what they do"
This reverts commit 969da1d163.
2018-09-10 12:09:37 +02:00
emelko 21dba52753 Renaming for more precision 2018-09-09 16:35:16 +02:00
emelko 1b0d04dfc0 Fixing cervix unit tests 2018-09-08 14:47:31 +02:00
emelko ab2dd76bf4 Liberating a forgotten .only from tests 2018-09-08 13:27:38 +02:00
emelko 969da1d163 Renaming test cycles to be more explicit abt what they do 2018-09-08 13:22:17 +02:00
emelko e1d6345434 Removing comment & making error comments even more helpful 2018-09-08 12:57:38 +02:00
emelko 9f5eb7c32e Adding when temp and secSymptom evaluation is over at the same day 2018-09-08 12:53:37 +02:00
emelko ef45fd9098 Deleting unused code 2018-09-08 12:45:58 +02:00
emelko d644c880d5 Deletes cervix out of chart 2018-09-07 20:10:32 +02:00
emelko 966af702b1 Merge branch 'master' into 83-implement-nfp-logic-for-cervix-mode 2018-09-07 19:59:55 +02:00
emelko 6192473e53 Merge branch '83-implement-nfp-logic-for-cervix-mode' of gitlab.com:bloodyhealth/drip into 83-implement-nfp-logic-for-cervix-mode 2018-09-07 19:54:29 +02:00
emelko 5cb4c01cec First 9 tests for cervix temp combination 2018-09-07 19:49:52 +02:00
emelko 0b856e298a Symptom values must have exclude: false for tests; consistency for defining functions 2018-09-07 19:49:03 +02:00
emelko e2c8292d7f secondarySymptom as default;
be more explicit for periOvuEnd calculation
2018-09-07 19:45:55 +02:00
tina 1e81cd8298 every symptom has its own row 2018-09-07 19:32:45 +02:00
emelko d16feb6d58 Renaming cervixPeak in cervixPeakBeforeShift bc it mustn't be the highest cervix value 2018-09-05 16:03:27 +02:00
emelko 809b0f438f Adding more error messages for better understanding of failing tests when arguments are wrong <3 2018-09-05 15:31:03 +02:00
emelko abee426337 Renaming nextDays in nextDaysAfterFhm when calculating temperatureShift 2018-09-05 15:30:38 +02:00
emelko 20dc238ea4 Replacing mucus default with secondarySymptom 2018-09-05 15:29:32 +02:00
emelko 1c2c45f8c6 Changes cervix value to check for opening and firmness value 2018-09-05 15:27:04 +02:00
tina 169af952c6 Merge branch '167-calendar-colors-and-slider-in-settings' into 'master'
changes shades of red in calendar, slider in settings has same style as all the other sliders

Closes #167

See merge request bloodyhealth/drip!71
2018-09-05 10:44:42 +00:00
Julia Friesel 7f66081e72 Add config to be able to build (see pull request description as well) 2018-09-04 17:15:00 +02:00
Julia Friesel d0f90ff8c0 Delete drawable assets because release won't build otherwise 2018-09-04 17:14:41 +02:00
Julia Friesel 641c57150f Remove unused dependencies 2018-09-04 09:54:46 +02:00
tina 4d5658119a changes y-ticks and labels, cycle day display and colors of symbols 2018-09-03 20:21:05 +02:00
Julia Friesel 022729ac1e Merge branch '156-make-components-like-prettier-radio-buttons' into 'master'
Resolve "make components like prettier radio buttons"

Closes #156

See merge request bloodyhealth/drip!68
2018-09-03 16:45:51 +00:00
tina d25de32cb4 changes shades of red in calendar, slider in settings has same style as all the other sliders 2018-09-03 15:19:10 +02:00
Julia Friesel dd380cf9ba Merge branch '142-add-back-button-behavior-for-cycle-day-overview' into 'master'
Resolve "add back button behavior for cycle day overview"

Closes #142

See merge request bloodyhealth/drip!67
2018-09-03 12:54:25 +00:00
Julia Friesel ef75a377d0 Fix typo / bug 2018-09-03 13:54:52 +02:00
tina 80cabee66b adds more meaningful messages to assertion errors 2018-09-03 13:07:40 +02:00
emelko 21d6e24f23 Add more details to cervix-temp fixtures and to mucus-temp spec 2018-09-03 11:23:50 +02:00
emelko e81c30f7b9 Better naming for infertile cervix value, matching the actual labels 2018-09-03 11:18:04 +02:00
emelko 9e1393766a Split fixtures into temp & mucus and temp & cervix files
Add first blueprint for temp&cervix tests
2018-09-03 11:16:14 +02:00
emelko 4f3334bef7 cervix has 3 properties
cervix position is now optional;
no computed value needed, therefore no test
2018-09-03 11:14:07 +02:00
emelko 60d6e21c57 Detects cervix shift in one happy path; including test 2018-09-03 11:11:33 +02:00
Julia Friesel 6cf0a9820f Make sympto module mode-aware (WIP) 2018-09-03 11:09:27 +02:00