jcal-zmanim 1.0.9 → 1.1.0

package/dist/Notifications.js

@@ -1,54 +1,34 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Utils_1 = __importDefault(require("./JCal/Utils"));
+exports.getNotifications = void 0;
+const Utils_1 = require("./Utils");
 const jDate_1 = __importDefault(require("./JCal/jDate"));
 const Molad_1 = __importDefault(require("./JCal/Molad"));
 const PirkeiAvos_1 = __importDefault(require("./JCal/PirkeiAvos"));
-const AppUtils_1 = __importStar(require("./AppUtils"));
+const ZmanimUtils_1 = __importDefault(require("./JCal/ZmanimUtils"));
 const dayNotes = [];
 const tefillahNotes = [];
 let showEnglish = false, dayInfo, showGaonShirShelYom = true, israel = true;
 /**
  * Get shul notifications for the given date and location
- * @param {jDate} jdate
- * @param {Date} sdate
- * @param {Time} time
- * @param {Settings} settings
+ * @param date
+ * @param time
+ * @param location
+ * @param english
+ * @param showGaonShir  *
+ * @param showDafYomi
+ * @returns {{ dayNotes: string[], tefillahNotes: string[]}}
  */
-function getNotifications(jdate, sdate, time, settings) {
+function getNotifications(date, time, location, english, showGaonShir, showDafYomi) {
+    const { sdate, jdate } = Utils_1.Utils.bothDates(date);
     dayNotes.length = 0;
     tefillahNotes.length = 0;
-    const month = jdate.Month, day = jdate.Day, dow = jdate.DayOfWeek, { location, showGaonShir, showDafYomi, english } = settings, { chatzosHayom, chatzosHalayla, alos, shkia, } = AppUtils_1.default.getBasicShulZmanim(jdate, sdate, location), isAfterChatzosHayom = Utils_1.default.isTimeAfter(chatzosHayom, time), isAfterChatzosHalayla = (typeof (chatzosHalayla) !== 'undefined') &&
-        (Utils_1.default.isTimeAfter(chatzosHalayla, time) ||
-            (chatzosHalayla.hour > 12 && time.hour < 12)), //Chatzos is before 0:00 and time is after 0:00
-    isAfterAlos = Utils_1.default.isTimeAfter(alos, time), isAfterShkia = Utils_1.default.isTimeAfter(shkia, time), isDaytime = isAfterAlos && !isAfterShkia, isNightTime = !isDaytime, isNotBeinHasmashos = !isAfterShkia ||
-        Utils_1.default.isTimeAfter(Utils_1.default.addMinutes(shkia, 18), time), isMorning = isDaytime && !isAfterChatzosHayom, isAfternoon = isDaytime && isAfterChatzosHayom, isYomTov = jdate.isYomTovOrCholHamoed(location.Israel), isLeapYear = jDate_1.default.isJdLeapY(jdate.Year), noTachnun = isAfternoon && (dow === AppUtils_1.DaysOfWeek.FRIDAY || day === 29);
+    const month = jdate.Month, day = jdate.Day, dow = jdate.DayOfWeek, { chatzosHayom, chatzosHalayla, alos, shkia, } = ZmanimUtils_1.default.getBasicShulZmanim(date, location), isAfterChatzosHayom = Utils_1.Utils.isTimeAfter(chatzosHayom, time), isAfterChatzosHalayla = (typeof (chatzosHalayla) !== 'undefined') &&
+        (Utils_1.Utils.isTimeAfter(chatzosHalayla, time) || (chatzosHalayla.hour > 12 && time.hour < 12)), //Chatzos is before 0:00 and time is after 0:00
+    isAfterAlos = Utils_1.Utils.isTimeAfter(alos, time), isAfterShkia = Utils_1.Utils.isTimeAfter(shkia, time), isDaytime = isAfterAlos && !isAfterShkia, isNightTime = !isDaytime, isNotBeinHasmashos = !isAfterShkia || Utils_1.Utils.isTimeAfter(Utils_1.Utils.addMinutes(shkia, 18), time), isMorning = isDaytime && !isAfterChatzosHayom, isAfternoon = isDaytime && isAfterChatzosHayom, isYomTov = jdate.isYomTovOrCholHamoed(location.Israel), isLeapYear = jDate_1.default.isJdLeapY(jdate.Year), noTachnun = isAfternoon && (dow === Utils_1.DaysOfWeek.FRIDAY || day === 29);
     dayInfo = {
         jdate,
         sdate,
@@ -69,9 +49,9 @@ function getNotifications(jdate, sdate, time, settings) {
         location,
     };
     showEnglish = english;
-    showGaonShirShelYom = showGaonShir;
+    showGaonShirShelYom = showGaonShir === true;
     israel = location.Israel;
-    if (dow === AppUtils_1.DaysOfWeek.SHABBOS) {
+    if (dow === Utils_1.DaysOfWeek.SHABBOS) {
         getShabbosNotifications();
     }
     else {
@@ -79,7 +59,7 @@ function getNotifications(jdate, sdate, time, settings) {
     }
     getAroundTheYearNotifications();
     if (dayInfo.noTachnun && isDaytime && !isYomTov) {
-        if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+        if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
             addTefillahNote('No Tachnun', 'א"א תחנון');
         }
         else if (isAfternoon) {
@@ -99,7 +79,7 @@ function getNotifications(jdate, sdate, time, settings) {
         ((month === 1 && day > 15) || month === 2 || (month === 3 && day < 6))) {
         const dayOfSefirah = jdate.getDayOfOmer();
         if (dayOfSefirah > 0) {
-            addTefillahNote(Utils_1.default.getOmerNusach(dayOfSefirah, 'ashkenaz'));
+            addTefillahNote(Utils_1.Utils.getOmerNusach(dayOfSefirah, 'ashkenaz'));
         }
     }
     //return only unique values
@@ -108,7 +88,7 @@ function getNotifications(jdate, sdate, time, settings) {
         tefillahNotes: [...new Set(tefillahNotes)],
     };
 }
-exports.default = getNotifications;
+exports.getNotifications = getNotifications;
 function getShabbosNotifications() {
     const { month, day, isLeapYear, isMorning, isYomTov, jdate, isDaytime, isAfternoon, } = dayInfo;
     if (month === 1 && day > 7 && day < 15) {
@@ -181,15 +161,15 @@ function getShabbosNotifications() {
         const prakim = PirkeiAvos_1.default.getPrakim(jdate, israel);
         if (prakim.length > 0) {
             addDayNote('Pirkei Avos - ' +
-                prakim.map(s => `Perek ${Utils_1.default.toJNum(s)}`).join(' and '), 'פרקי אבות - ' +
-                prakim.map(s => `פרק ${Utils_1.default.toJNum(s)}`).join(' ו'));
+                prakim.map(s => `Perek ${Utils_1.Utils.toJewishNumber(s)}`).join(' and '), 'פרקי אבות - ' +
+                prakim.map(s => `פרק ${Utils_1.Utils.toJewishNumber(s)}`).join(' ו'));
         }
     }
 }
 function getWeekDayNotifications() {
     const { isNightTime, dow, isYomTov, month, day, isMorning, jdate, location, isDaytime, isAfternoon, } = dayInfo;
     //מוצאי שבת
-    if (isNightTime && dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+    if (isNightTime && dow === Utils_1.DaysOfWeek.SUNDAY) {
         //הבדלה בתפילה for מוצאי שבת
         addTefillahNote((month === 1 && day === 15) || (month === 3 && day === 6)
             ? 'ותודיעינו'
@@ -213,7 +193,7 @@ function getWeekDayNotifications() {
     //when it's not chol hamoed, chanuka, purim, a fast day or rosh chodesh
     if (isMorning &&
         !isYomTov &&
-        (dow === AppUtils_1.DaysOfWeek.MONDAY || dow === AppUtils_1.DaysOfWeek.THURSDAY) &&
+        (dow === Utils_1.DaysOfWeek.MONDAY || dow === Utils_1.DaysOfWeek.THURSDAY) &&
         !hasOwnKriyasHatorah(jdate, location)) {
         const sedra = jdate.getSedra(israel);
         if (sedra.sedras.length > 0) {
@@ -231,15 +211,15 @@ function getWeekDayNotifications() {
         //Rosh Chodesh Teves is during Chanuka
         if (isDaytime && month !== 10 && !(month === 9 && day === 30)) {
             addTefillahNote('Chatzi Hallel', 'חצי הלל');
-            if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+            if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                 noLaminatzeach();
             }
         }
     }
     //Yom Kippur Kattan
     else if (month !== 6 &&
-        ((dow < AppUtils_1.DaysOfWeek.FRIDAY && day === 29) ||
-            (dow === AppUtils_1.DaysOfWeek.THURSDAY && day === 28)) &&
+        ((dow < Utils_1.DaysOfWeek.FRIDAY && day === 29) ||
+            (dow === Utils_1.DaysOfWeek.THURSDAY && day === 28)) &&
         isAfternoon) {
         addTefillahNote('Yom Kippur Kattan', 'יו"כ קטן');
     }
@@ -255,14 +235,14 @@ function getAroundTheYearNotifications() {
             if (day > 15) {
                 addTefillahNote('Morid Hatal', 'מוריד הטל');
             }
-            if (dow !== AppUtils_1.DaysOfWeek.SHABBOS && day > 15 && day !== 21) {
+            if (dow !== Utils_1.DaysOfWeek.SHABBOS && day > 15 && day !== 21) {
                 addTefillahNote('Vesain Bracha', 'ותן ברכה');
             }
             if (isMorning &&
-                dow !== AppUtils_1.DaysOfWeek.SHABBOS &&
+                dow !== Utils_1.DaysOfWeek.SHABBOS &&
                 [14, 16, 17, 18, 19, 20].includes(day)) {
                 addTefillahNote('No Mizmor Lesodah', 'א"א מזמור לתודה');
-                if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                     noLaminatzeach();
                 }
             }
@@ -274,7 +254,7 @@ function getAroundTheYearNotifications() {
                 }
                 if (showGaonShirShelYom &&
                     isDaytime &&
-                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
                     addTefillahNote('שיר של יום - קי"ד - בצאת ישראל');
                 }
                 addTefillahNote('Ya`aleh V`yavo', 'יעלה ויבא');
@@ -285,7 +265,7 @@ function getAroundTheYearNotifications() {
                 addTefillahNote('Morid Hatal', 'מוריד הטל');
                 if (showGaonShirShelYom &&
                     isDaytime &&
-                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
                     addTefillahNote('שיר של יום - קי"ד - בצאת ישראל');
                 }
                 addTefillahNote('Ya`aleh V`yavo', 'יעלה ויבא');
@@ -297,7 +277,7 @@ function getAroundTheYearNotifications() {
                         if (israel) {
                             addTefillahNote('Yizkor', 'יזכור');
                         }
-                        if (showGaonShirShelYom && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (showGaonShirShelYom && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             addTefillahNote('שיר של יום - י"ח - למנצח לעבד ה\'');
                         }
                     }
@@ -305,14 +285,14 @@ function getAroundTheYearNotifications() {
                 else {
                     addDayNote('Chol Ha`moed Pesach', 'פסח - חול המועד');
                     addTefillahNote('Ya`aleh Viyavo', 'יעלה ויבא');
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS)
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS)
                         noLaminatzeach();
                     if (showGaonShirShelYom &&
                         isDaytime &&
-                        dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         switch (day) {
                             case 16:
-                                if (dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                                if (dow === Utils_1.DaysOfWeek.SUNDAY) {
                                     addTefillahNote('שיר של יום - קי"ד - בצאת ישראל');
                                 }
                                 else {
@@ -320,7 +300,7 @@ function getAroundTheYearNotifications() {
                                 }
                                 break;
                             case 17:
-                                if (dow === AppUtils_1.DaysOfWeek.MONDAY) {
+                                if (dow === Utils_1.DaysOfWeek.MONDAY) {
                                     addTefillahNote('שיר של יום - ע"ח - משכיל לאסף');
                                 }
                                 else {
@@ -328,8 +308,8 @@ function getAroundTheYearNotifications() {
                                 }
                                 break;
                             case 18:
-                                if (dow === AppUtils_1.DaysOfWeek.TUESDAY ||
-                                    dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                                if (dow === Utils_1.DaysOfWeek.TUESDAY ||
+                                    dow === Utils_1.DaysOfWeek.SUNDAY) {
                                     addTefillahNote("שיר של יום - פ' - למנצח אל שושנים");
                                 }
                                 else {
@@ -337,7 +317,7 @@ function getAroundTheYearNotifications() {
                                 }
                                 break;
                             case 19:
-                                if (dow === AppUtils_1.DaysOfWeek.THURSDAY) {
+                                if (dow === Utils_1.DaysOfWeek.THURSDAY) {
                                     addTefillahNote('שיר של יום - קל"ה - הללוי-ה הללו את שם');
                                 }
                                 else {
@@ -345,7 +325,7 @@ function getAroundTheYearNotifications() {
                                 }
                                 break;
                             case 20:
-                                if (dow === AppUtils_1.DaysOfWeek.FRIDAY) {
+                                if (dow === Utils_1.DaysOfWeek.FRIDAY) {
                                     addTefillahNote('שיר של יום - ס"ו - למנצח שיר מזמור');
                                 }
                                 else {
@@ -371,11 +351,11 @@ function getAroundTheYearNotifications() {
                     }
                     addTefillahNote('Ya`aleh V`yavo', 'יעלה ויבא');
                 }
-                if (dow !== AppUtils_1.DaysOfWeek.SHABBOS && isMorning) {
+                if (dow !== Utils_1.DaysOfWeek.SHABBOS && isMorning) {
                     noLaminatzeach();
                 }
             }
-            if (dow === AppUtils_1.DaysOfWeek.SHABBOS &&
+            if (dow === Utils_1.DaysOfWeek.SHABBOS &&
                 ([15, 16, 17, 18, 19, 20, 21].includes(day) ||
                     (!israel && day === 22))) {
                 addTefillahNote('Shir Hashirim', 'מגילת שיר השירים');
@@ -384,7 +364,7 @@ function getAroundTheYearNotifications() {
         case 2: //Iyar
             if (day <= 15) {
                 addTefillahNote('Morid Hatal', 'מוריד הטל');
-                if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                     addTefillahNote('V`sain Bracha', 'ותן ברכה');
                 }
             }
@@ -400,9 +380,9 @@ function getAroundTheYearNotifications() {
             }
             //Baha"b
             if (isMorning &&
-                ((dow === AppUtils_1.DaysOfWeek.MONDAY && day > 3 && day < 13) ||
-                    (dow === AppUtils_1.DaysOfWeek.THURSDAY && day > 6 && day < 14) ||
-                    (dow === AppUtils_1.DaysOfWeek.MONDAY &&
+                ((dow === Utils_1.DaysOfWeek.MONDAY && day > 3 && day < 13) ||
+                    (dow === Utils_1.DaysOfWeek.THURSDAY && day > 6 && day < 14) ||
+                    (dow === Utils_1.DaysOfWeek.MONDAY &&
                         day > 10 &&
                         day < 18 &&
                         day !== 14))) {
@@ -431,7 +411,7 @@ function getAroundTheYearNotifications() {
             else if (day === 7) {
                 if (israel) {
                     addDayNote('Issru Chag', 'איסרו חג');
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         noLaminatzeach();
                     }
                 }
@@ -447,8 +427,8 @@ function getAroundTheYearNotifications() {
             break;
         case 4: //Tammuz
             if (isDaytime &&
-                ((day === 17 && AppUtils_1.DaysOfWeek.SHABBOS !== 6) ||
-                    (day === 18 && dow === AppUtils_1.DaysOfWeek.SUNDAY))) {
+                ((day === 17 && Utils_1.DaysOfWeek.SHABBOS !== 6) ||
+                    (day === 18 && dow === Utils_1.DaysOfWeek.SUNDAY))) {
                 if (isDaytime) {
                     addDayNote('Shiva Asar B`Tamuz', 'י"ז בתמוז');
                     addTefillahNote('Avinu Malkeinu', 'אבינו מלכנו');
@@ -460,22 +440,22 @@ function getAroundTheYearNotifications() {
             }
             break;
         case 5: //Av
-            if (isAfternoon && day === 8 && dow !== AppUtils_1.DaysOfWeek.FRIDAY) {
+            if (isAfternoon && day === 8 && dow !== Utils_1.DaysOfWeek.FRIDAY) {
                 dayInfo.noTachnun = true;
             }
-            else if ((day === 9 && dow !== AppUtils_1.DaysOfWeek.SHABBOS) ||
-                (day === 10 && dow === AppUtils_1.DaysOfWeek.SUNDAY)) {
+            else if ((day === 9 && dow !== Utils_1.DaysOfWeek.SHABBOS) ||
+                (day === 10 && dow === Utils_1.DaysOfWeek.SUNDAY)) {
                 addDayNote('Tish B`Av', 'תשעה באב');
                 if (isDaytime) {
                     addTefillahNote('Kinos', 'קינות');
                     addTefillahNote('Aneinu', 'עננו');
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         noLaminatzeach();
                     }
                 }
                 else {
                     addTefillahNote('Megilas Eicha', 'מגילת איכה');
-                    if (isNightTime && dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                    if (isNightTime && dow === Utils_1.DaysOfWeek.SUNDAY) {
                         addTefillahNote('No Vihi Noam', 'א"א ויהי נועם');
                     }
                 }
@@ -492,19 +472,19 @@ function getAroundTheYearNotifications() {
         case 6: //Ellul
             addTefillahNote('L`Dovid Hashem Ori', 'לדוד ה');
             if (day > 20 &&
-                dow !== AppUtils_1.DaysOfWeek.SHABBOS &&
+                dow !== Utils_1.DaysOfWeek.SHABBOS &&
                 (isAfterChatzosHalayla || isMorning)) {
                 let startedSelichos = day >= 26;
                 if (day < 26) {
                     const daysToRH = 30 - day, dowRH = (daysToRH + dow) % 7;
                     switch (dowRH) {
-                        case AppUtils_1.DaysOfWeek.MONDAY:
+                        case Utils_1.DaysOfWeek.MONDAY:
                             startedSelichos = day >= 22;
                             break;
-                        case AppUtils_1.DaysOfWeek.TUESDAY:
+                        case Utils_1.DaysOfWeek.TUESDAY:
                             startedSelichos = day >= 21;
                             break;
-                        case AppUtils_1.DaysOfWeek.SHABBOS:
+                        case Utils_1.DaysOfWeek.SHABBOS:
                             startedSelichos = day >= 24;
                             break;
                     }
@@ -520,16 +500,16 @@ function getAroundTheYearNotifications() {
         case 7: //Tishrei
             if (day < 11) {
                 addTefillahNote('Hamelech Hakadosh', 'המלך הקדוש');
-                if (dow !== AppUtils_1.DaysOfWeek.SHABBOS && day !== 9) {
+                if (dow !== Utils_1.DaysOfWeek.SHABBOS && day !== 9) {
                     addTefillahNote('Avinu Malkeinu', 'אבינו מלכנו');
                 }
             }
             //Days of Rosh Hashana, Tzom Gedaliah and Yom Kippur are dealt with individually below.
-            if (day > 4 && day < 10 && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+            if (day > 4 && day < 10 && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                 addTefillahNote('Selichos', 'סליחות');
                 addTefillahNote('Hamelech Hamishpat', 'המלך המשפט');
             }
-            if (dow === AppUtils_1.DaysOfWeek.SHABBOS && day > 2 && day < 10) {
+            if (dow === Utils_1.DaysOfWeek.SHABBOS && day > 2 && day < 10) {
                 addDayNote('Shabbos Shuva', 'שבת שובה');
             }
             if (day >= 10) {
@@ -538,7 +518,7 @@ function getAroundTheYearNotifications() {
             switch (day) {
                 case 1:
                     addDayNote('Rosh Hashana', 'ראש השנה');
-                    if (dow !== AppUtils_1.DaysOfWeek.SHABBOS && isDaytime) {
+                    if (dow !== Utils_1.DaysOfWeek.SHABBOS && isDaytime) {
                         addTefillahNote('Tekias Shofar', 'תקיעת שופר');
                         if (showGaonShirShelYom) {
                             addTefillahNote('שיר של יום - פ"א - למנצח על הגתית');
@@ -556,14 +536,14 @@ function getAroundTheYearNotifications() {
                         if (showGaonShirShelYom) {
                             addTefillahNote('שיר של יום - פ"א - למנצח על הגתית');
                         }
-                        if (dow === AppUtils_1.DaysOfWeek.SUNDAY && isAfternoon) {
+                        if (dow === Utils_1.DaysOfWeek.SUNDAY && isAfternoon) {
                             addDayNote('Tashlich', 'תשליך');
                         }
                     }
                     addTefillahNote('Ya`aleh V`yavo', 'יעלה ויבא');
                     break;
                 case 3:
-                    if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         if (isDaytime) {
                             addDayNote('Fast of Tzom Gedalya', 'צום גדליה');
                             addTefillahNote('Aneinu', 'עננו');
@@ -575,7 +555,7 @@ function getAroundTheYearNotifications() {
                     }
                     break;
                 case 4:
-                    if (dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                    if (dow === Utils_1.DaysOfWeek.SUNDAY) {
                         if (isDaytime) {
                             addDayNote('Fast of Tzom Gedalya', 'צום גדליה');
                             addTefillahNote('Aneinu', 'עננו');
@@ -585,7 +565,7 @@ function getAroundTheYearNotifications() {
                         }
                         addTefillahNote('Hamelech Hamishpat', 'המלך המשפט');
                     }
-                    else if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    else if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         addTefillahNote('Hamelech Hamishpat', 'המלך המשפט');
                         if (isAfterChatzosHalayla || isMorning) {
                             addTefillahNote('Selichos', 'סליחות');
@@ -596,17 +576,17 @@ function getAroundTheYearNotifications() {
                     addDayNote('Erev Yom Kippur', 'ערב יום כיפור');
                     if (isMorning) {
                         addTefillahNote('No Mizmor L`Sodah', 'א"א מזמור לתודה');
-                        if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             noLaminatzeach();
                         }
-                        if (dow === AppUtils_1.DaysOfWeek.FRIDAY) {
+                        if (dow === Utils_1.DaysOfWeek.FRIDAY) {
                             addTefillahNote('Avinu Malkeinu', 'אבינו מלכנו');
                         }
                     }
                     else if (isAfternoon) {
                         addTefillahNote('Vidduy', 'ודוי בעמידה');
                     }
-                    if (isDaytime && dow !== AppUtils_1.DaysOfWeek.FRIDAY) {
+                    if (isDaytime && dow !== Utils_1.DaysOfWeek.FRIDAY) {
                         addTefillahNote('No Avinu Malkeinu', 'א"א אבינו מלכנו');
                     }
                     dayInfo.noTachnun = true;
@@ -616,7 +596,7 @@ function getAroundTheYearNotifications() {
                     addDayNote("לפני ה' תטהרו");
                     if (isDaytime) {
                         addTefillahNote('Yizkor', 'יזכור');
-                        if (showGaonShirShelYom && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (showGaonShirShelYom && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             addTefillahNote('שיר של יום - ל"ב - לדוד משכיל');
                         }
                     }
@@ -630,7 +610,7 @@ function getAroundTheYearNotifications() {
                     addTefillahNote('Ya`aleh V`yavo', 'יעלה ויבא');
                     if (isDaytime) {
                         addTefillahNote('Full Hallel', 'הלל השלם');
-                        if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             addTefillahNote('Hoshanos - למען אמתך', 'הושענות - למען אמתך');
                             addTefillahNote('Kah Keli', 'קה קלי');
                             if (showGaonShirShelYom) {
@@ -660,27 +640,27 @@ function getAroundTheYearNotifications() {
                         switch (day) {
                             case 16:
                                 addTefillahNote('הושענות - ' +
-                                    (dow === AppUtils_1.DaysOfWeek.SUNDAY
+                                    (dow === Utils_1.DaysOfWeek.SUNDAY
                                         ? 'למען אמתך'
                                         : 'אבן שתיה'));
                                 if (showGaonShirShelYom &&
-                                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                     addTefillahNote('שיר של יום - כ"ט - ..הבו לה\' בני אלים');
                                 }
                                 break;
                             case 17:
                                 addTefillahNote((showEnglish ? 'Hoshanos' : 'הושענות') +
                                     ' - ' +
-                                    (dow === AppUtils_1.DaysOfWeek.SHABBOS
+                                    (dow === Utils_1.DaysOfWeek.SHABBOS
                                         ? 'אום נצורה'
                                         : 'אערוך שועי'));
                                 if (showGaonShirShelYom &&
-                                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                     addTefillahNote("שיר של יום - נ' - מזמור לאסף");
                                 }
                                 break;
                             case 18:
-                                if (dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                                if (dow === Utils_1.DaysOfWeek.SUNDAY) {
                                     addTefillahNote((showEnglish ? 'Hoshanos' : 'הושענות') +
                                         ' - ' +
                                         'אערוך שועי');
@@ -689,21 +669,21 @@ function getAroundTheYearNotifications() {
                                     }
                                 }
                                 else {
-                                    if (dow === AppUtils_1.DaysOfWeek.TUESDAY) {
+                                    if (dow === Utils_1.DaysOfWeek.TUESDAY) {
                                         addTefillahNote((showEnglish
                                             ? 'Hoshanos'
                                             : 'הושענות') +
                                             ' - ' +
                                             'אבן שתיה');
                                     }
-                                    else if (dow === AppUtils_1.DaysOfWeek.THURSDAY) {
+                                    else if (dow === Utils_1.DaysOfWeek.THURSDAY) {
                                         addTefillahNote((showEnglish
                                             ? 'Hoshanos'
                                             : 'הושענות') +
                                             ' - ' +
                                             'אום אני חומה');
                                     }
-                                    else if (dow === AppUtils_1.DaysOfWeek.FRIDAY) {
+                                    else if (dow === Utils_1.DaysOfWeek.FRIDAY) {
                                         addTefillahNote((showEnglish
                                             ? 'Hoshanos'
                                             : 'הושענות') +
@@ -711,7 +691,7 @@ function getAroundTheYearNotifications() {
                                             'א-ל למושעות');
                                     }
                                     if (showGaonShirShelYom &&
-                                        dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                                        dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                         addTefillahNote('שיר של יום - צ"ד - ..מי יקום לי..');
                                     }
                                 }
@@ -719,12 +699,12 @@ function getAroundTheYearNotifications() {
                             case 19:
                                 addTefillahNote((showEnglish ? 'Hoshanos' : 'הושענות') +
                                     ' - ' +
-                                    (dow === AppUtils_1.DaysOfWeek.SHABBOS
+                                    (dow === Utils_1.DaysOfWeek.SHABBOS
                                         ? 'אום נצורה'
                                         : 'א-ל למושעות'));
                                 if (showGaonShirShelYom &&
-                                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
-                                    if (dow === AppUtils_1.DaysOfWeek.MONDAY) {
+                                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
+                                    if (dow === Utils_1.DaysOfWeek.MONDAY) {
                                         addTefillahNote('שיר של יום - צ"ד - ..מי יקום לי..');
                                     }
                                     else {
@@ -735,12 +715,12 @@ function getAroundTheYearNotifications() {
                             case 20:
                                 addTefillahNote((showEnglish ? 'Hoshanos' : 'הושענות') +
                                     ' - ' +
-                                    (dow === AppUtils_1.DaysOfWeek.SHABBOS
+                                    (dow === Utils_1.DaysOfWeek.SHABBOS
                                         ? 'אום נצורה'
                                         : 'אדון המושיע'));
                                 if (showGaonShirShelYom &&
-                                    dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
-                                    if (dow === AppUtils_1.DaysOfWeek.THURSDAY) {
+                                    dow !== Utils_1.DaysOfWeek.SHABBOS) {
+                                    if (dow === Utils_1.DaysOfWeek.THURSDAY) {
                                         addTefillahNote('שיר של יום - פ"א - למנצח על הגתית');
                                     }
                                     else {
@@ -761,7 +741,7 @@ function getAroundTheYearNotifications() {
                         addTefillahNote('Hoshanos', 'הושענות');
                         addTefillahNote('Full Hallel', 'הלל השלם');
                         if (showGaonShirShelYom) {
-                            if (dow === AppUtils_1.DaysOfWeek.FRIDAY) {
+                            if (dow === Utils_1.DaysOfWeek.FRIDAY) {
                                 addTefillahNote('שיר של יום - פ"ב - מזמור לאסף');
                             }
                             else {
@@ -782,7 +762,7 @@ function getAroundTheYearNotifications() {
                         addTefillahNote('Yizkor', 'יזכור');
                         addTefillahNote('Tefilas Geshem', 'תפילת גשם');
                         addTefillahNote('משיב הרוח ומוריד הגשם');
-                        if (showGaonShirShelYom && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (showGaonShirShelYom && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             addTefillahNote('שיר של יום - י"ב - למנצח על השמינית');
                         }
                     }
@@ -800,12 +780,12 @@ function getAroundTheYearNotifications() {
                     if (isNightTime) {
                         addDayNote('א גוטען ווינטער', 'חורף טוב');
                     }
-                    else if (dow !== AppUtils_1.DaysOfWeek.SHABBOS && isMorning) {
+                    else if (dow !== Utils_1.DaysOfWeek.SHABBOS && isMorning) {
                         noLaminatzeach();
                     }
                 }
             }
-            else if (dow === AppUtils_1.DaysOfWeek.SHABBOS &&
+            else if (dow === Utils_1.DaysOfWeek.SHABBOS &&
                 [15, 17, 18, 19, 20].includes(day)) {
                 addTefillahNote('Megilas Koheles', 'מגילת קהלת');
             }
@@ -818,25 +798,25 @@ function getAroundTheYearNotifications() {
             break;
         case 8: //Cheshvan
             if (isDaytime &&
-                ((dow === AppUtils_1.DaysOfWeek.MONDAY && day > 3 && day < 13) ||
-                    (dow === AppUtils_1.DaysOfWeek.THURSDAY && day > 6 && day < 14) ||
-                    (dow === AppUtils_1.DaysOfWeek.MONDAY && day > 10 && day < 18))) {
+                ((dow === Utils_1.DaysOfWeek.MONDAY && day > 3 && day < 13) ||
+                    (dow === Utils_1.DaysOfWeek.THURSDAY && day > 6 && day < 14) ||
+                    (dow === Utils_1.DaysOfWeek.MONDAY && day > 10 && day < 18))) {
                 addTefillahNote('Ba`Hab', 'סליחות בה"ב');
                 addTefillahNote('Avinu Malkeinu', 'אבינו מלכנו');
             }
             if (day <= 22) {
                 addTefillahNote('Mashiv Haruach U`Morid Hageshem', 'משיב הרוח ומוריד הגשם');
             }
-            if (day >= 7 && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+            if (day >= 7 && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                 addTefillahNote('V`sain Tal U`matar', 'ותן טל ומטר');
             }
             break;
         case 9: //Kislev
-            if (day <= 7 && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+            if (day <= 7 && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                 addTefillahNote('V`sain Tal U`matar', 'ותן טל ומטר');
             }
             else if (day === 24 &&
-                dow !== AppUtils_1.DaysOfWeek.SHABBOS &&
+                dow !== Utils_1.DaysOfWeek.SHABBOS &&
                 isAfternoon) {
                 dayInfo.noTachnun = true;
             }
@@ -846,11 +826,11 @@ function getAroundTheYearNotifications() {
                 addTefillahNote('Al Hanissim', 'על הניסים');
                 if (isDaytime) {
                     addTefillahNote('Full Hallel', 'הלל השלם');
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS)
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS)
                         noLaminatzeach();
                     if (showGaonShirShelYom &&
                         day !== 30 &&
-                        dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         addTefillahNote("שיר של יום - ל' - מזמור שיר חנוכת הבית");
                     }
                 }
@@ -863,7 +843,7 @@ function getAroundTheYearNotifications() {
                 addTefillahNote('Al Hanissim', 'על הניסים');
                 if (isDaytime) {
                     addTefillahNote('Full Hallel', 'הלל השלם');
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         noLaminatzeach();
                         if (day !== 1 && showGaonShirShelYom) {
                             addTefillahNote("שיר של יום - ל' - מזמור שיר חנוכת הבית");
@@ -902,7 +882,7 @@ function getAroundTheYearNotifications() {
                             ? 'Shushan Purim Katan'
                             : 'שושן פורים קטן');
                     dayInfo.noTachnun = true;
-                    if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                    if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                         noLaminatzeach();
                     }
                 }
@@ -910,8 +890,8 @@ function getAroundTheYearNotifications() {
             else {
                 //The "real" Adar: the only one in a non-leap-year or Adar Sheini
                 if (isDaytime &&
-                    ((day === 11 && dow === AppUtils_1.DaysOfWeek.THURSDAY) ||
-                        (day === 13 && dow !== AppUtils_1.DaysOfWeek.SHABBOS))) {
+                    ((day === 11 && dow === Utils_1.DaysOfWeek.THURSDAY) ||
+                        (day === 13 && dow !== Utils_1.DaysOfWeek.SHABBOS))) {
                     if (isMorning) {
                         addDayNote('Fast of Ta`anis Esther', 'תענית אסתר');
                         addTefillahNote('Selichos', 'סליחות');
@@ -924,11 +904,11 @@ function getAroundTheYearNotifications() {
                     const isYerushalayim = location.Name === 'ירושלים';
                     if (day === 14) {
                         dayInfo.noTachnun = true;
-                        if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             noLaminatzeach();
                         }
                         //On a Purim Meshulash in Yerushalayim, מגילת אסתר is on י"ד
-                        if (!isYerushalayim || dow === AppUtils_1.DaysOfWeek.FRIDAY) {
+                        if (!isYerushalayim || dow === Utils_1.DaysOfWeek.FRIDAY) {
                             addDayNote('Megilas Esther', 'מגילת אסתר');
                             if (!isYerushalayim) {
                                 addDayNote('Purim', 'פורים');
@@ -948,18 +928,18 @@ function getAroundTheYearNotifications() {
                     }
                     else if (day === 15) {
                         dayInfo.noTachnun = true;
-                        if (isMorning && dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                        if (isMorning && dow !== Utils_1.DaysOfWeek.SHABBOS) {
                             noLaminatzeach();
                         }
                         if (isYerushalayim) {
                             addDayNote('Purim', 'פורים');
                             addTefillahNote('Al Hanissim', 'על הניסים');
-                            if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                            if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                 addDayNote('Megilas Esther', 'מגילת אסתר');
                             }
                             if (showGaonShirShelYom &&
                                 isDaytime &&
-                                dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                                dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                 addTefillahNote('שיר של יום - כ"ב - למנצח על אילת השחר');
                             }
                         }
@@ -975,7 +955,7 @@ function getAroundTheYearNotifications() {
                             'לוד',
                         ].includes(location.Name)) {
                             addDayNote('Purim D`Mukafin', 'פורים דמוקפין');
-                            if (dow !== AppUtils_1.DaysOfWeek.SHABBOS) {
+                            if (dow !== Utils_1.DaysOfWeek.SHABBOS) {
                                 addDayNote('(Megilas Esther)', '(מגילת אסתר)');
                             }
                         }
@@ -985,7 +965,7 @@ function getAroundTheYearNotifications() {
                     }
                     else if (day === 16 &&
                         isYerushalayim &&
-                        dow === AppUtils_1.DaysOfWeek.SUNDAY) {
+                        dow === Utils_1.DaysOfWeek.SUNDAY) {
                         addDayNote('Purim Seuda and Mishloach Manos', 'סעודת פורים ומשלוח מנות');
                     }
                 }