Exclude excluded bleedings
This commit is contained in:
@@ -42,5 +42,5 @@ function findLastFirstBleedingDay(cycleDays) {
|
|||||||
function isBleedingDay(cycleDay) {
|
function isBleedingDay(cycleDay) {
|
||||||
return cycleDay.bleeding
|
return cycleDay.bleeding
|
||||||
&& cycleDay.bleeding.value
|
&& cycleDay.bleeding.value
|
||||||
&& !cycleDay.exclude
|
&& !cycleDay.bleeding.exclude
|
||||||
}
|
}
|
||||||
@@ -109,6 +109,34 @@ describe('getCycleDay returns the cycle day', () => {
|
|||||||
const result = getCycleDayNumber(cycleDays, targetDate)
|
const result = getCycleDayNumber(cycleDays, targetDate)
|
||||||
expect(result).to.eql(9)
|
expect(result).to.eql(9)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('if some bleedings are exluded', function () {
|
||||||
|
const cycleDays = [{
|
||||||
|
date: moment([2018, 5, 2])
|
||||||
|
}, {
|
||||||
|
date: moment([2018, 5, 3]),
|
||||||
|
bleeding: {
|
||||||
|
value: 2
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
date: moment([2018, 5, 4])
|
||||||
|
}, {
|
||||||
|
date: moment([2018, 5, 9]),
|
||||||
|
bleeding: {
|
||||||
|
value: 2,
|
||||||
|
exclude: true
|
||||||
|
}
|
||||||
|
}, {
|
||||||
|
date: moment([2018, 5, 10]),
|
||||||
|
bleeding: {
|
||||||
|
value: 2,
|
||||||
|
exclude: true
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
const targetDate = moment([2018, 5, 17])
|
||||||
|
const result = getCycleDayNumber(cycleDays, targetDate)
|
||||||
|
expect(result).to.eql(15)
|
||||||
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
describe('getCycleDay returns undefined', () => {
|
describe('getCycleDay returns undefined', () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user