‼️📅 Rewrite - notifScheduler.ts

www/index.js

@@ -9,7 +9,6 @@ import './js/splash/pushnotify.js';
 import './js/splash/storedevicesettings.js';
 import './js/splash/localnotify.js';
 import './js/splash/remotenotify.js';
-import './js/splash/notifScheduler.js';
 import './js/controllers.js';
 import './js/services.js';
 import './js/i18n-utils.js';

www/js/control/ProfileSettings.jsx

@@ -32,7 +32,13 @@ import { shareQR } from '../components/QrCode';
 import { storageClear } from '../plugin/storage';
 import { getAppVersion } from '../plugin/clientStats';
 import { getConsentDocument } from '../splash/startprefs';
-import { logDebug } from '../plugin/logger';
+import { displayErrorMsg, logDebug } from '../plugin/logger';
+import {
+  updateScheduledNotifs,
+  getScheduledNotifs,
+  getReminderPrefs,
+  setReminderPrefs,
+} from '../splash/notifScheduler';
 
 //any pure functions can go outside
 const ProfileSettings = () => {
@@ -45,7 +51,6 @@ const ProfileSettings = () => {
   //angular services needed
   const CarbonDatasetHelper = getAngularService('CarbonDatasetHelper');
   const EmailHelper = getAngularService('EmailHelper');
-  const NotificationScheduler = getAngularService('NotificationScheduler');
   const ControlHelper = getAngularService('ControlHelper');
 
   //functions that come directly from an Angular service
@@ -141,6 +146,15 @@ const ProfileSettings = () => {
       tempUiConfig.opcode.autogen = tempUiConfig?.intro.program_or_study == 'study';
     }
 
+    // Update the scheduled notifs
+    updateScheduledNotifs(tempUiConfig.reminderSchemes)
+      .then(() => {
+        logDebug('updated scheduled notifs');
+      })
+      .catch((err) => {
+        displayErrorMsg('Error while updating scheduled notifs', err);
+      });
+
     // setTemplateText(tempUiConfig.intro.translated_text);
     // console.log("translated text is??", templateText);
     setUiConfig(tempUiConfig);
@@ -187,13 +201,13 @@ const ProfileSettings = () => {
     const newNotificationSettings = {};
 
     if (uiConfig?.reminderSchemes) {
-      const prefs = await NotificationScheduler.getReminderPrefs();
+      const prefs = await getReminderPrefs(uiConfig.reminderSchemes);
       const m = moment(prefs.reminder_time_of_day, 'HH:mm');
       newNotificationSettings.prefReminderTimeVal = m.toDate();
       const n = moment(newNotificationSettings.prefReminderTimeVal);
       newNotificationSettings.prefReminderTime = n.format('LT');
       newNotificationSettings.prefReminderTimeOnLoad = prefs.reminder_time_of_day;
-      newNotificationSettings.scheduledNotifs = await NotificationScheduler.getScheduledNotifs();
+      newNotificationSettings.scheduledNotifs = await getScheduledNotifs();
       updatePrefReminderTime(false);
     }
 
@@ -264,7 +278,7 @@ const ProfileSettings = () => {
     if (storeNewVal) {
       const m = moment(newTime);
       // store in HH:mm
-      NotificationScheduler.setReminderPrefs({ reminder_time_of_day: m.format('HH:mm') }).then(
+      setReminderPrefs({ reminder_time_of_day: m.format('HH:mm') }, uiConfig.reminderSchemes).then(
         () => {
           refreshNotificationSettings();
         },

www/js/main.js

@@ -6,7 +6,6 @@ angular
   .module('emission.main', [
     'emission.main.diary',
     'emission.i18n.utils',
-    'emission.splash.notifscheduler',
     'emission.main.metrics.factory',
     'emission.main.metrics.mappings',
     'emission.services',