tpmkms_4wp 9.3.0-beta.10 → 9.3.0-beta.11

package/common/dateTimeSelectors.js

@@ -54,7 +54,7 @@ const template = {
       ],
       semantics: [
         {
-          match: ({context, isA}) => isA(context.marker, 'dateTimeSelector') && !!args.context.evaluate,
+          match: ({context, isA}) => isA(context.marker, 'dateTimeSelector') && !!context.evaluate,
           apply: ({context, isProcess}) => {
             context.evalue = instantiate(isProcess, context)
           },

package/common/helpers/dateTimeSelectors.js

@@ -30,12 +30,35 @@ function getNextDayOfWeek(date, targetDay) {
   return nextDate;
 }
 
+function getTime(time) {
+  let hour = 0
+  let minute = 0
+  let second = 0
+  let hour_offset = 0
+  if (time.time.ampm.ampm == 'pm') {
+    hour_offset = 12
+  }
+  if (time.marker == 'integer') {
+    hour = time.value
+  }
+  hour += hour_offset
+  return { hour, minute, second }
+}
+
 instantiate = (now, context) => {
   if (context.dateTimeSelector) {
     const dateTimeSelector = getNextDayOfWeek(now, context.dateTimeSelector?.value)
     if (dateTimeSelector) {
       return dateTimeSelector.toISOString()
     }
+  } else if (context.marker == 'dateTimeSelector') {
+    const dateTimeSelector = getNextDayOfWeek(now, context.date.date.value)
+    const hms = getTime(context.time)
+    dateTimeSelector.setHours(hms.hour)
+    dateTimeSelector.setMinutes(hms.minute)
+    dateTimeSelector.setSeconds(hms.second)
+    dateTimeSelector.setMilliseconds(0)
+    return dateTimeSelector.toISOString()
   }
 }
 

package/common/reminders.js

@@ -37,9 +37,10 @@ class API {
     } else {
       now = new Date()
     }
-    // reminder.nextISODate = reminders_helpers.instantiate(now, reminder)
-    // debugger
+    // reminder.nextISODate = dateTimeSelectors.instantiate(now, reminder)
     // TODO make the evaluate work --> const value = await this.args.e(reminder.dateTimeSelector)
+    const value = await this.args.e(reminder.dateTimeSelector)
+    reminder.nextISODate = value?.evalue
   }
 
   // the user of the KM can override this. this can be used to sync the GUI and the LUI

package/common/reminders.test.json

@@ -322,6 +322,7 @@
         "concept": "concept2",
         "conjunction": "conjunction2",
         "countable": "countable2",
+        "dateTimeSelectors": "dateTimeSelectors2",
         "dates": "dates2",
         "dialogues": "dialogues2",
         "evaluate": "evaluate2",
@@ -362,6 +363,9 @@
         "countable2": {
           "km": "countable2"
         },
+        "dateTimeSelectors2": {
+          "km": "dateTimeSelectors2"
+        },
         "dates2": {
           "km": "dates2"
         },
@@ -509,8 +513,7 @@
               "modifies",
               "is",
               "isQuery",
-              "remember",
-              "evaluate"
+              "remember"
             ]
           },
           "concepts": [
@@ -557,7 +560,6 @@
             "adjective",
             "orAble",
             "ifAble",
-            "evaluate",
             "each",
             "every",
             "distributable",
@@ -633,9 +635,6 @@
             "each": [
               "article"
             ],
-            "evaluate": [
-              "verb"
-            ],
             "every": [
               "article"
             ],
@@ -837,8 +836,6 @@
               },
               "era_dates": {
               },
-              "evaluate": {
-              },
               "every": {
               },
               "february_dates": {
@@ -1173,6 +1170,7 @@
             "touchedBy": [
               "dates#call2",
               "instance6#dates#call2",
+              "instance6#dateTimeSelectors#call2",
               "instance6#reminders#call2"
             ],
             "value": "resetIdSuffix",
@@ -1318,6 +1316,7 @@
             "touchedBy": [
               "dates#call2",
               "instance3#dates#call2",
+              "instance3#dateTimeSelectors#call2",
               "instance3#reminders#call2"
             ],
             "two": {
@@ -1572,6 +1571,7 @@
             "touchedBy": [
               "dates#call2",
               "instance2#dates#call2",
+              "instance2#dateTimeSelectors#call2",
               "instance2#reminders#call2"
             ],
             "two": {
@@ -1981,6 +1981,7 @@
             "touchedBy": [
               "dates#call2",
               "instance1#dates#call2",
+              "instance1#dateTimeSelectors#call2",
               "instance1#reminders#call2"
             ],
             "two": {
@@ -2879,6 +2880,7 @@
         "concept": "concept2",
         "conjunction": "conjunction2",
         "countable": "countable2",
+        "dateTimeSelectors": "dateTimeSelectors2",
         "dates": "dates2",
         "dialogues": "dialogues2",
         "evaluate": "evaluate2",
@@ -2919,6 +2921,9 @@
         "countable2": {
           "km": "countable2"
         },
+        "dateTimeSelectors2": {
+          "km": "dateTimeSelectors2"
+        },
         "dates2": {
           "km": "dates2"
         },
@@ -3066,8 +3071,7 @@
               "modifies",
               "is",
               "isQuery",
-              "remember",
-              "evaluate"
+              "remember"
             ]
           },
           "concepts": [
@@ -3114,7 +3118,6 @@
             "adjective",
             "orAble",
             "ifAble",
-            "evaluate",
             "each",
             "every",
             "distributable",
@@ -3190,9 +3193,6 @@
             "each": [
               "article"
             ],
-            "evaluate": [
-              "verb"
-            ],
             "every": [
               "article"
             ],
@@ -3394,8 +3394,6 @@
               },
               "era_dates": {
               },
-              "evaluate": {
-              },
               "every": {
               },
               "february_dates": {
@@ -3839,6 +3837,7 @@
             "touchedBy": [
               "dates#call2",
               "instance6#dates#call2",
+              "instance6#dateTimeSelectors#call2",
               "instance6#reminders#call2"
             ],
             "value": "resetIdSuffix",
@@ -4536,7 +4535,6 @@
         "word": "monday"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       "",
       "(When should I remind you to go to regina)",
@@ -6673,7 +6671,6 @@
         "word": "remind"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -9910,7 +9907,6 @@
         "word": "remind"
       }
     ],
-    "developerTest": false,
     "generatedParenthesized": [
       ""
     ],
@@ -11061,6 +11057,7 @@
               "dateTimeSelectorText": "on monday at 10 am",
               "fromSTM": true,
               "id": 1,
+              "nextISODate": "2025-08-11T07:00:00.000Z",
               "pullFromContext": false,
               "stm": {
                 "id": 1
@@ -11209,6 +11206,7 @@
               "dateTimeSelectorText": "on monday at 10 am",
               "fromSTM": true,
               "id": 1,
+              "nextISODate": "2025-08-11T07:00:00.000Z",
               "pullFromContext": false,
               "stm": {
                 "id": 1

package/package.json

@@ -341,8 +341,8 @@
     "scriptjs": "^2.5.9",
     "table": "^6.7.1",
     "uuid": "^9.0.0",
-    "theprogrammablemind_4wp": "9.3.0-beta.10"
+    "theprogrammablemind_4wp": "9.3.0-beta.11"
   },
-  "version": "9.3.0-beta.10",
+  "version": "9.3.0-beta.11",
   "license": "UNLICENSED"
 }