lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
528 Commits 31 Branches 14 Tags
b01fdbb4731007d82b03238cfa301d4e10ac7b23
Commit Graph
58 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tina b01fdbb473 places todayString outside of reduce 2018-09-15 15:42:49 +02:00
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
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
tina 1e81cd8298 every symptom has its own row 2018-09-07 19:32:45 +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
tina 4d5658119a changes y-ticks and labels, cycle day display and colors of symbols 2018-09-03 20:21:05 +02: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
tina 80cabee66b adds more meaningful messages to assertion errors 2018-09-03 13:07:40 +02:00
tina edf9b04b45 Merge branch '158-change-default-app-color' into 'master' 
Resolve "research default app color, can we change it away from turqiouse ?"

Closes #158

See merge request bloodyhealth/drip!69
 2018-08-31 17:07:07 +00:00
tina 0a51bfc40b makes the default colors easily exchangable 2018-08-31 17:43:13 +02:00
tina f19a51d4ba Merge branch '155-add-temperature-note' into 'master' 
Resolve "add temperature note"

Closes #155

See merge request bloodyhealth/drip!66
 2018-08-31 15:15:38 +00:00
tina ed5d7e544b changes text input parameters for temperature note 2018-08-31 17:05:55 +02:00
tina 6b547abee2 Merge branch '143-don-t-allow-future-entries-except-note' into 'master' 
Resolve "don't allow future entries except note"

Closes #137 and #143

See merge request bloodyhealth/drip!65
 2018-08-31 14:37:26 +00:00
tina b119f1da93 removes package-lock from pr 2018-08-31 16:25:16 +02:00
tina 3bd5770c33 adds note to temperature 2018-08-31 14:01:48 +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
tina 54a3db4096 Merge branch '98-function-to-get-predicted-bleeding-dates' into 'master' 
Resolve "write function to get predicted bleeding dates (and use it in calendar)"

Closes #97 and #98

See merge request bloodyhealth/drip!60
 2018-08-31 09:48:30 +00:00
tina 8a9e23055d Update cycle.spec.js 2018-08-29 16:50:28 +00:00
tina b411b67473 Merge branch 'master' into '98-function-to-get-predicted-bleeding-dates' 
# Conflicts:
#   components/calendar.js
#   test/cycle.spec.js
 2018-08-29 15:58:20 +00:00
tina 432c56c0c6 information about bleeding data is shown on home screen 2018-08-29 17:29:33 +02:00
tina e047440068 changs output of getpredictedmenses, adds days to calendar 2018-08-23 17:28:53 +02:00
tina 497a3a3ff5 adds more tests for period predictions, moves getcycleslength into cycle module 2018-08-23 11:36:57 +02:00
tina ea21fc92a2 moves getCycleLength to corresponding files, adds function to get next menses (not finished) with first tests 2018-08-22 18:21:57 +02:00
tina 7fcaa4af52 Merge branch '136-add-tests-for-getallmensesstarts' into 'master' 
Resolve "add tests for getAllMensesStarts"

Closes #136

See merge request bloodyhealth/drip!58
 2018-08-22 13:59:40 +00:00
tina 48484843df adds more tests for getcyclelengthstats with more realistic data 2018-08-22 15:08:08 +02:00
tina d751aaf891 adds tests for getallmensesstarts 2018-08-22 14:37:51 +02:00
tina c6ea128c82 Merge branch '129-extract-text-from-stats-and-layout' into 'master' 
Resolve "extract text from stats and layout"

Closes #129

See merge request bloodyhealth/drip!51
 2018-08-22 10:10:25 +00:00
tina 04476769f1 Merge branch 'master' into '129-extract-text-from-stats-and-layout' 
# Conflicts:
#   components/labels.js
 2018-08-22 10:07:47 +00:00
tina 392e09fb8d extracts stats strings and improves copy 2018-08-15 18:49:45 +02:00
tina b998ef546f Merge branch '109-display-stats-about-period-length' into 'master' 
Resolve "add stats button on home screen and show stats about period length"

Closes #109

See merge request bloodyhealth/drip!41
 2018-08-14 12:36:57 +00:00
tina f2b8723fb9 resolves some of the suggested improvements, renames the term period with cycle 2018-08-09 18:31:14 +02:00
tina c99aa7509d improves functions and stats are displayed in a nicer format 2018-08-09 14:02:17 +02:00
tina 6135c92268 possible to get all cycle lengths, which get evaluated in stats 2018-08-08 16:10:09 +02:00
tina 897e99e6af adds stats button on home screen, and creates stats screen, length still needs to be calculated 2018-08-08 16:10:09 +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
tina c73d7cced6 Merge branch '76-change-day-view-layout' into 'master' 
Resolve "change day view layout"

Closes #76

See merge request bloodyhealth/drip!17
 2018-06-18 17:11:27 +00:00
tina feb642aa92 put view styles in styles.js 2018-06-18 14:06:32 +02:00
tina 4a5afd4662 change layouts of cycle-day, edit symptoms screens and home 2018-06-15 19:31:29 +02:00
tina cd3cc3c7ea Merge branch 'master' into '28-edit-temperature-screen' 
# Conflicts:
#   home.js
 2018-06-13 11:11:25 +00:00
tina 73c5785fc0 Merge branch '52-add-edit-symptoms-for-today-button' into 'master' 
Resolve "add edit symptoms for today button"

Closes #52

See merge request bloodyhealth/drip!14
 2018-06-13 11:06:21 +00:00
tina 30304bb1b5 button 'edit symptoms for today' actually goes to dayview of today 2018-06-13 12:28:23 +02:00
tina 933b64056a Merge branch '54-check-what-happens-when-saving-bleeding-screen-with-nothing-selected' into 'master' 
Resolve "check what happens when saving bleeding screen with nothing selected"

Closes #54

See merge request bloodyhealth/drip!11
 2018-06-11 10:02:14 +00:00
tina 1f67d22a80 disable save button if no bleeding type was selected 2018-06-11 11:29:49 +02:00
tina 7852123d77 Merge branch '46-replace-picker-in-bleeding' into 'master' 
Resolve "replace picker in bleeding"

Closes #46

See merge request bloodyhealth/drip!7
 2018-06-08 09:01:08 +00:00
tina e53cd03b73 type of bleeding is already a number, deleted redundent step. also included package-lock 2018-06-07 14:27:18 +02:00
tina 3bf9416438 change bleeding input from picker to radio buttons 2018-06-06 19:45:47 +02:00
tina bcda3259e4 delete log statements 2018-05-29 13:41:09 +02:00
tina 2f443c7743 replace require with import 2018-05-29 13:37:49 +02:00