Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
Drip
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
backup
Drip
Commits
c2c0e0c6
Commit
c2c0e0c6
authored
6 years ago
by
Julia Friesel
Browse files
Options
Downloads
Patches
Plain Diff
Add getMensesDaysAfter
parent
2b2e24bb
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/cycle.js
+32
-9
32 additions, 9 deletions
lib/cycle.js
test/cycle.spec.js
+172
-0
172 additions, 0 deletions
test/cycle.spec.js
with
204 additions
and
9 deletions
lib/cycle.js
+
32
−
9
View file @
c2c0e0c6
...
...
@@ -135,23 +135,45 @@ export default function config(opts) {
function
isMensesStart
(
cycleDay
)
{
if
(
!
cycleDay
.
bleeding
||
cycleDay
.
bleeding
.
exclude
)
return
false
const
bleedingDays
=
bleedingDaysSortedByDate
if
(
noBleedingDayWithinThreshold
(
cycleDay
))
{
return
true
}
if
(
noBleedingDayWithinThresholdBefore
(
cycleDay
))
return
true
return
false
function
noBleedingDayWithinThreshold
(
d
ay
)
{
const
localDate
=
LocalDate
.
parse
(
d
ay
.
date
)
function
noBleedingDayWithinThreshold
Before
(
cycleD
ay
)
{
const
localDate
=
LocalDate
.
parse
(
cycleD
ay
.
date
)
const
threshold
=
localDate
.
minusDays
(
maxBreakInBleeding
+
1
).
toString
()
const
bleedingDays
=
bleedingDaysSortedByDate
const
index
=
bleedingDays
.
findIndex
(
day
=>
day
.
date
===
cycleDay
.
date
)
const
previousBleedingDay
s
=
bleedingDays
.
slice
(
index
+
1
)
return
!
previousBleedingDay
s
.
some
(
day
=>
{
const
candidate
s
=
bleedingDays
.
slice
(
index
+
1
)
return
!
candidate
s
.
some
(
day
=>
{
return
day
.
date
>=
threshold
&&
!
day
.
bleeding
.
exclude
})
}
}
function
getMensesDaysAfter
(
bleedingDay
)
{
const
bleedingDays
=
bleedingDaysSortedByDate
.
filter
(
d
=>
{
return
!
d
.
bleeding
.
exclude
})
const
startIndex
=
bleedingDays
.
findIndex
(
day
=>
{
return
day
.
date
===
bleedingDay
.
date
})
return
recurse
(
bleedingDay
,
startIndex
,
[])
function
recurse
(
day
,
i
,
mensesDays
)
{
if
(
i
===
0
)
return
mensesDays
const
next
=
bleedingDays
[
i
-
1
]
if
(
!
isWithinThreshold
(
day
,
next
))
return
mensesDays
mensesDays
.
unshift
(
next
)
return
recurse
(
next
,
i
-
1
,
mensesDays
)
}
function
isWithinThreshold
(
cycleDay
,
nextCycleDay
)
{
const
localDate
=
LocalDate
.
parse
(
cycleDay
.
date
)
const
threshold
=
localDate
.
plusDays
(
maxBreakInBleeding
+
1
).
toString
()
return
nextCycleDay
.
date
<=
threshold
}
}
function
getCycleLength
(
cycleStartDates
)
{
const
cycleLengths
=
[]
for
(
let
i
=
0
;
i
<
cycleStartDates
.
length
-
1
;
i
++
)
{
...
...
@@ -208,6 +230,7 @@ export default function config(opts) {
getAllMensesStarts
,
getCycleLength
,
getPredictedMenses
,
isMensesStart
isMensesStart
,
getMensesDaysAfter
}
}
\ No newline at end of file
This diff is collapsed.
Click to expand it.
test/cycle.spec.js
+
172
−
0
View file @
c2c0e0c6
...
...
@@ -827,4 +827,176 @@ describe('isMensesStart', () => {
const
start
=
isMensesStart
(
cycleDaysSortedByDate
[
2
])
expect
(
start
).
to
.
be
.
true
()
})
})
describe
(
'
getMensesDaysAfter
'
,
()
=>
{
it
(
'
works for simple menses start
'
,
()
=>
{
const
cycleDaysSortedByDate
=
[
{
date
:
'
2018-05-04
'
,
},
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-02
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-01
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-04-30
'
,
}
]
const
{
getMensesDaysAfter
}
=
cycleModule
({
cycleDaysSortedByDate
,
bleedingDaysSortedByDate
:
cycleDaysSortedByDate
.
filter
(
d
=>
d
.
bleeding
)
})
const
days
=
getMensesDaysAfter
(
cycleDaysSortedByDate
[
3
])
expect
(
days
).
to
.
eql
([
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-02
'
,
bleeding
:
{
value
:
1
}
}
])
})
it
(
'
ignores excluded values
'
,
()
=>
{
const
cycleDaysSortedByDate
=
[
{
date
:
'
2018-05-04
'
,
},
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-02
'
,
bleeding
:
{
value
:
1
,
exclude
:
true
}
},
{
date
:
'
2018-05-01
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-04-30
'
,
}
]
const
{
getMensesDaysAfter
}
=
cycleModule
({
cycleDaysSortedByDate
,
bleedingDaysSortedByDate
:
cycleDaysSortedByDate
.
filter
(
d
=>
d
.
bleeding
)
})
const
days
=
getMensesDaysAfter
(
cycleDaysSortedByDate
[
3
])
expect
(
days
).
to
.
eql
([
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
}
])
})
it
(
'
returns empty when there are no bleeding days after
'
,
()
=>
{
const
cycleDaysSortedByDate
=
[
{
date
:
'
2018-05-04
'
,
},
{
date
:
'
2018-05-03
'
,
},
{
date
:
'
2018-05-02
'
,
},
{
date
:
'
2018-05-01
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-04-30
'
,
}
]
const
{
getMensesDaysAfter
}
=
cycleModule
({
cycleDaysSortedByDate
,
bleedingDaysSortedByDate
:
cycleDaysSortedByDate
.
filter
(
d
=>
d
.
bleeding
)
})
const
days
=
getMensesDaysAfter
(
cycleDaysSortedByDate
[
3
])
expect
(
days
).
to
.
eql
([])
})
it
(
'
returns empty when there are no bleeding days within threshold
'
,
()
=>
{
const
cycleDaysSortedByDate
=
[
{
date
:
'
2018-05-04
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-03
'
,
},
{
date
:
'
2018-05-02
'
,
},
{
date
:
'
2018-05-01
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-04-30
'
,
}
]
const
{
getMensesDaysAfter
}
=
cycleModule
({
cycleDaysSortedByDate
,
bleedingDaysSortedByDate
:
cycleDaysSortedByDate
.
filter
(
d
=>
d
.
bleeding
)
})
const
days
=
getMensesDaysAfter
(
cycleDaysSortedByDate
[
3
])
expect
(
days
).
to
.
eql
([])
})
it
(
'
includes days within the treshold
'
,
()
=>
{
const
cycleDaysSortedByDate
=
[
{
date
:
'
2018-05-04
'
,
},
{
date
:
'
2018-05-05
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-01
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-04-30
'
,
}
]
const
{
getMensesDaysAfter
}
=
cycleModule
({
cycleDaysSortedByDate
,
bleedingDaysSortedByDate
:
cycleDaysSortedByDate
.
filter
(
d
=>
d
.
bleeding
)
})
const
days
=
getMensesDaysAfter
(
cycleDaysSortedByDate
[
3
])
expect
(
days
).
to
.
eql
([
{
date
:
'
2018-05-05
'
,
bleeding
:
{
value
:
1
}
},
{
date
:
'
2018-05-03
'
,
bleeding
:
{
value
:
1
}
}
])
})
})
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment