expose sunset in prayerTimes #107
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
z3bi
requested changes
May 10, 2022
Adhan.d.ts
Outdated
| @@ -134,6 +136,7 @@ export enum Prayer { | |||
| Sunrise, | |||
| Dhuhr, | |||
| Asr, | |||
| Sunset, | |||
There was a problem hiding this comment.
we can add sunset to the PrayerTimes object but I don't want to change the Prayer enum.
src/Prayer.js
Outdated
| @@ -3,6 +3,7 @@ const Prayer = { | |||
| Sunrise: 'sunrise', | |||
| Dhuhr: 'dhuhr', | |||
| Asr: 'asr', | |||
| Sunset: 'sunset', | |||
There was a problem hiding this comment.
Should be removed as we are not changing this.
src/PrayerTimes.js
Outdated
| @@ -120,13 +120,15 @@ export default class PrayerTimes { | |||
| const sunriseAdjustment = (calculationParameters.adjustments.sunrise || 0) + (calculationParameters.methodAdjustments.sunrise || 0); | |||
| const dhuhrAdjustment = (calculationParameters.adjustments.dhuhr || 0) + (calculationParameters.methodAdjustments.dhuhr || 0); | |||
| const asrAdjustment = (calculationParameters.adjustments.asr || 0) + (calculationParameters.methodAdjustments.asr || 0); | |||
| const sunsetAdjustment = (calculationParameters.adjustments.sunset || 0) + (calculationParameters.methodAdjustments.sunset || 0); | |||
There was a problem hiding this comment.
i thought the point was to expose the true sunset value, why would we add adjustments?
src/PrayerTimes.js
Outdated
| @@ -144,6 +146,9 @@ export default class PrayerTimes { | |||
| else if (prayer === Prayer.Asr) { | |||
| return this.asr; | |||
| } | |||
| else if (prayer === Prayer.Sunset) { | |||
src/PrayerTimes.js
Outdated
| const maghribAdjustment = (calculationParameters.adjustments.maghrib || 0) + (calculationParameters.methodAdjustments.maghrib || 0); | ||
| const ishaAdjustment = (calculationParameters.adjustments.isha || 0) + (calculationParameters.methodAdjustments.isha || 0); | ||
|
|
||
| this.fajr = roundedMinute(dateByAddingMinutes(fajrTime, fajrAdjustment), calculationParameters.rounding); | ||
| this.sunrise = roundedMinute(dateByAddingMinutes(sunriseTime, sunriseAdjustment), calculationParameters.rounding); | ||
| this.dhuhr = roundedMinute(dateByAddingMinutes(dhuhrTime, dhuhrAdjustment), calculationParameters.rounding); | ||
| this.asr = roundedMinute(dateByAddingMinutes(asrTime, asrAdjustment), calculationParameters.rounding); | ||
| this.sunset = roundedMinute(dateByAddingMinutes(sunsetTime, sunsetAdjustment), calculationParameters.rounding); |
There was a problem hiding this comment.
we should remove the call to dateByAddingMinutes and only do the rounding to preserve true sunset time.
src/PrayerTimes.js
Outdated
| @@ -165,6 +170,9 @@ export default class PrayerTimes { | |||
| else if (date >= this.maghrib) { | |||
| return Prayer.Maghrib; | |||
| } | |||
| else if (date >= this.sunset && this.sunset !== this.maghrib) { | |||
src/PrayerTimes.js
Outdated
| @@ -192,9 +200,12 @@ export default class PrayerTimes { | |||
| else if (date >= this.maghrib) { | |||
| return Prayer.Isha; | |||
| } | |||
| else if (date >= this.asr) { | |||
| else if (date >= this.sunset) { | |||
src/PrayerTimes.js
Outdated
| return Prayer.Maghrib; | ||
| } | ||
| else if (date >= this.asr && this.sunset !== this.maghrib) { |
This reverts commit 9d0bf0f.
|
is it okay now ? |
|
This pull requests needs to be against the develop branch, which is in typescript instead of javascript. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
closes #105
since it was remained open, I thought maybe create a pull request