schedclock: handle firstDayOfWeek; set last day on fired alarms; display 12h format

Author: kidneyhex

apps/schedclock/lib.js

@@ -5,7 +5,7 @@ const APP_ID = "schedclock";
  * Called directly by an alarm to load a specific clock face
  * @param {string} faceSrc - Source file of the clock face to load (e.g. "myclock.js")
  **/ 
-exports.loadFace = function(faceSrc) {
+const setClock = function(faceSrc) {
   const settings = require("Storage").readJSON("setting.json", 1) || {};
   // Only change the clock if it's different
   if (faceSrc && settings.clock !== faceSrc) {
@@ -22,6 +22,23 @@ exports.loadFace = function(faceSrc) {
   }
 };
 
+/**
+ * Handle alarms and resetting them
+ * @param {number} index Index of the alarm that went off
+ * @param {string} clock Clockface
+ */
+exports.onAlarm = function(index, clock) {
+  const date = new Date();
+  const Sched = require("sched");
+  const alarm = Sched.getAlarm(`${APP_ID}.${index}`);
+  alarm.last = date.getDate(); // prevent second run on the same day
+  // -- Don't think alarm.date is required, but just in case
+  //date.setDate(alarm.last + 1);
+  //alarm.date = date.toLocalISOString().slice(0,10);
+  Sched.setAlarm(alarm.id, alarm);
+  setClock(clock);
+};
+
 /**
  * Function to sync all alarms in the scheduler with the settings file.
  * Called every time settings are changed; maybe a bit excessive, but keeps things simple.
@@ -39,21 +56,28 @@ exports.syncAlarms = function() {
   // If the app is disabled, we're done.
   if (!settings.enabled) return;
 
+  const time = new Date();
+  const currentTime = (time.getHours()*3600000)+(time.getMinutes()*60000)+(time.getSeconds()*1000);
+  
   // Add a new alarm for each setting item
   settings.sched.forEach((item, index) => {
 
     if (item.hour === undefined) return;
 
+    const schedTime = (item.hour * 3600000) + (item.minute * 60000);
+    const today = time.getDate();
+    const tomorrow = today + 1;
+
     // Create the new alarm object and save it using a unique ID.
     Sched.setAlarm(`${APP_ID}.${index}`, {
+      t: schedTime, // time in milliseconds since midnight
       on: true,
-      appid: APP_ID,
-      t: (item.hour * 3600000) + (item.minute * 60000), // time in milliseconds since midnight
+      rp: true,
+      last: (schedTime > currentTime) ? today : tomorrow,
       dow: item.dow,
       hidden: true,
-      rp: {interval: "week"},
-      js: `require('${APP_ID}.lib.js').loadFace('${item.face}')`,
+      appid: APP_ID,
+      js: `require('${APP_ID}.lib.js').onAlarm(${index},'${item.face}')`,
     });
   });
 };
-

apps/schedclock/settings.js

@@ -13,7 +13,6 @@
    */
 
   const SETTINGS_FILE = "schedclock.settings.json";
-  const daysOfWeek = require("date_utils").dows(1).concat([/*LANG*/"Every Day", /*LANG*/"Weekdays", /*LANG*/"Weekends"]);
   // Bitmasks for special day selection for sched.json 
   const BIN_WORKDAYS = 0b0111110; // 62 - MTWTF
   const BIN_WEEKEND = 0b1000001; // 65 - SuSa
@@ -23,6 +22,16 @@
   const IND_WORKDAYS = 8; 
   const IND_WEEKEND = 9;
 
+  const daysOfWeek = (function() {
+    const firstDayOfWeek = (require("Storage").readJSON("setting.json", true) || {}).firstDayOfWeek || 0;
+    const daysOfWeek = require("date_utils").dows(1);
+    if (!firstDayOfWeek) {
+      // Move Sunday from end to start of week
+      daysOfWeek.unshift(daysOfWeek.splice(-1, 1)[0]);
+    }
+    return daysOfWeek.concat([/*LANG*/"Every Day", /*LANG*/"Weekdays", /*LANG*/"Weekends"]);
+  })();
+
   /**
    * Function to load settings
    * @returns {SettingsType} settings object
@@ -99,7 +108,7 @@
       const faceName = (clockFaces.find(f => f.src === item.face) || {name: /*LANG*/"Unknown"}).name;
       const dow = binaryToDow(item.dow);
       const dayName = daysOfWeek[dow === undefined ? IND_EVERY_DAY : dow];
-      const timeStr = ("0"+item.hour).slice(-2) + ":" + ("0"+item.minute).slice(-2);
+      const timeStr = require("locale").time(new Date(1999, 1, 1, item.hour, item.minute, 0),1)
       menu[`${dayName} ${timeStr} - ${faceName}`] = () => editScheduleItem(index);
     });
 
@@ -119,9 +128,9 @@
       case IND_WORKDAYS:  return BIN_WORKDAYS;
       case IND_WEEKEND:   return BIN_WEEKEND;
       default:
-        return 1 << index; // Single day (0=Sun, 1=Mon, ..., 6=Sat)
+        return 1 << (index + 1); // Single day (0=Sun, 1=Mon, ..., 6=Sat)
     }
-  }
+  };
 
   /**
    * Get the index in daysOfWeek from a binary day-of-week bitmask
@@ -133,14 +142,17 @@
       case BIN_EVERY_DAY: return IND_EVERY_DAY;
       case BIN_WORKDAYS:  return IND_WORKDAYS;
       case BIN_WEEKEND:   return IND_WEEKEND;
-    }
-    // Check each single day (0=Sun, 1=Mon, ..., 6=Sat)
-    for (let i = 0; i < 7; i++) {
-      if (b === (1 << i)) return i;
+      case 1: return 0;
+      case 2: return 1;
+      case 4: return 2;
+      case 8: return 3;
+      case 16: return 4;
+      case 32: return 5;
+      case 64: return 6;
     }
     // Bitmask was something we don't handle yet, default to everyday for now
     return IND_EVERY_DAY;
-  }
+  };
 
   /**
    * Function to edit a schedule item (or add a new one if index is -1)
@@ -177,6 +189,17 @@
         value: currentItem.hour,
         min: 0,
         max: 23,
+        format: v => {
+          // Format as 12h time if user has that set
+          const meridean = require("locale").meridian(new Date(1999, 1, 1, v, 0, 0),1);
+          if (meridean) {
+            return (v>12) 
+              ? v-12 + meridean
+              : ((v===0)?12:v) + meridean;
+          } else { 
+            return v;
+          }
+        },
         onchange: v => { currentItem.hour = v; }
       },
       /*LANG*/"Minute": {