lori/drip
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename to predictedBleeding

Browse Source
This commit is contained in:
emelko
2019-04-25 10:58:04 +02:00
parent 93abaf99be
commit 6577038f22
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/home.js
+14 -14
View File
@@ -182,22 +182,22 @@ export default class Home extends Component {
function determinePredictionText(bleedingPrediction) { function determinePredictionText(bleedingPrediction) {
if (!bleedingPrediction.length) return predictLabels.noPrediction if (!bleedingPrediction.length) return predictLabels.noPrediction
const todayDate = LocalDate.now() const todayDate = LocalDate.now()
const bleedingStart = LocalDate.parse(bleedingPrediction[0][0]) const predictedBleedingStart = LocalDate.parse(bleedingPrediction[0][0])
const bleedingEnd = LocalDate.parse( const predictedBleedingEnd = LocalDate.parse(
bleedingPrediction[0][ bleedingPrediction[0].length - 1 ] bleedingPrediction[0][ bleedingPrediction[0].length - 1 ]
) )
if (todayDate.isBefore(bleedingStart)) { if (todayDate.isBefore(predictedBleedingStart)) {
return predictLabels.predictionInFuture( return predictLabels.predictionInFuture(
todayDate.until(bleedingStart, ChronoUnit.DAYS), todayDate.until(predictedBleedingStart, ChronoUnit.DAYS),
todayDate.until(bleedingEnd, ChronoUnit.DAYS) todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)
) )
} }
if (todayDate.isAfter(bleedingEnd)) { if (todayDate.isAfter(predictedBleedingEnd)) {
return predictLabels.predictionInPast( return predictLabels.predictionInPast(
dateForShortDescription(bleedingStart), dateForShortDescription(bleedingEnd) dateForShortDescription(predictedBleedingStart), dateForShortDescription(predictedBleedingEnd)
) )
} }
const daysToEnd = todayDate.until(bleedingEnd, ChronoUnit.DAYS) const daysToEnd = todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)
if (daysToEnd === 0) { if (daysToEnd === 0) {
return predictLabels.predictionStartedNoDaysLeft return predictLabels.predictionStartedNoDaysLeft
} else if (daysToEnd === 1) { } else if (daysToEnd === 1) {
@@ -210,15 +210,15 @@ function determinePredictionText(bleedingPrediction) {
function getBleedingPredictionRange(prediction) { function getBleedingPredictionRange(prediction) {
if (!prediction.length) return labels.unknown if (!prediction.length) return labels.unknown
const todayDate = LocalDate.now() const todayDate = LocalDate.now()
const bleedingStart = LocalDate.parse(prediction[0][0]) const predictedBleedingStart = LocalDate.parse(prediction[0][0])
const bleedingEnd = LocalDate.parse(prediction[0][ prediction[0].length - 1 ]) const predictedBleedingEnd = LocalDate.parse(prediction[0][ prediction[0].length - 1 ])
if (todayDate.isBefore(bleedingStart)) { if (todayDate.isBefore(predictedBleedingStart)) {
return `${todayDate.until(bleedingStart, ChronoUnit.DAYS)}-${todayDate.until(bleedingEnd, ChronoUnit.DAYS)}` return `${todayDate.until(predictedBleedingStart, ChronoUnit.DAYS)}-${todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)}`
} }
if (todayDate.isAfter(bleedingEnd)) { if (todayDate.isAfter(predictedBleedingEnd)) {
return labels.unknown return labels.unknown
} }
const daysToEnd = todayDate.until(bleedingEnd, ChronoUnit.DAYS) const daysToEnd = todayDate.until(predictedBleedingEnd, ChronoUnit.DAYS)
if (daysToEnd === 0) { if (daysToEnd === 0) {
return '0' return '0'
} else { } else {
lib/notifications.js
+2 -2
View File
@@ -58,9 +58,9 @@ export default function setupNotifications(navigate) {
function setupPeriodReminder() { function setupPeriodReminder() {
const bleedingPrediction = cycleModule().getPredictedMenses() const bleedingPrediction = cycleModule().getPredictedMenses()
if (bleedingPrediction.length > 0) { if (bleedingPrediction.length > 0) {
const bleedingStart = Moment(bleedingPrediction[0][0], "YYYY-MM-DD") const predictedBleedingStart = Moment(bleedingPrediction[0][0], "YYYY-MM-DD")
// 3 days before and at 6 am // 3 days before and at 6 am
const reminderDate = bleedingStart const reminderDate = predictedBleedingStart
.subtract(3, 'days') .subtract(3, 'days')
.hours(6) .hours(6)
.minutes(0) .minutes(0)