The Age function is not calculated when a Date Time value doesn't match the specified mattern and saveMaskedValue is enabled fix #11157 (#11160)

Author: andrewtelnov

packages/survey-core/src/question_text.ts

@@ -375,8 +375,11 @@ export class QuestionTextModel extends QuestionTextBase {
     return val;
   }
   protected convertToCorrectValue(val: any): any {
-    if (val !== undefined && val !== null && typeof val !== "string" && !this.maskTypeIsEmpty && this.maskSettings.saveMaskedValue) {
-      return this.maskInstance.getMaskedValue(val);
+    if (val !== undefined && val !== null && !this.maskTypeIsEmpty && this.maskSettings.saveMaskedValue) {
+      const maskedVal = this.maskInstance.getMaskedValue(val);
+      if (typeof val === "string" &&
+        (!!this.maskInstance.getUnmaskedValue(val) || !this.maskInstance.getUnmaskedValue(maskedVal))) return val;
+      return maskedVal;
     }
     return super.convertToCorrectValue(val);
   }

packages/survey-core/tests/mask/mask_datetime_tests.ts

@@ -3,6 +3,7 @@ import { JsonObject } from "../../src/jsonobject";
 import { InputMaskDateTime, getDateTimeLexems } from "../../src/mask/mask_datetime";
 import { QuestionTextModel } from "../../src/question_text";
 import { SurveyModel } from "../../src/survey";
+import { settings } from "../../src/settings";
 
 export default QUnit.module("Datetime mask");
 
@@ -1353,7 +1354,6 @@ QUnit.test("Mask datetime with defaultValue includes seconds, #10820", function
   const q1 = <QuestionTextModel>survey.getQuestionByName("q1");
   assert.equal(q1.inputValue, "09/04/2024 12:34:56");
 });
-
 QUnit.test("Mask datetime with defaultValueExpression today() and saveMaskedValue, Bug#11158", function (assert) {
   function todayMock() {
     return new Date(2025, 3, 10);
@@ -1377,4 +1377,44 @@ QUnit.test("Mask datetime with defaultValueExpression today() and saveMaskedValu
   assert.equal(q1.inputValue, "10.04.2025", "inputValue is masked");
   assert.equal(q1.value, "10.04.2025", "value is saved as masked");
   FunctionFactory.Instance.unregister("todayMock");
+});
+QUnit.test("Age function with datetime mask and saveMaskedValue, #11157", function (assert) {
+  const savedOnDateCreated = settings.onDateCreated;
+  settings.onDateCreated = (newDate: Date, reason: string, val: any): Date => {
+    if (!val) {
+      return new Date(2025, 3, 10); // April 10, 2025 as "today"
+    }
+    return newDate;
+  };
+  const survey = new SurveyModel({
+    elements: [
+      {
+        type: "text",
+        name: "Date of Birth",
+        valueName: "patient_dob",
+        maskType: "datetime",
+        maskSettings: {
+          saveMaskedValue: true,
+          pattern: "mm-dd-yyyy"
+        }
+      },
+      {
+        type: "expression",
+        name: "Age",
+        expression: "age({patient_dob})"
+      }
+    ]
+  });
+  const dobQuestion = <QuestionTextModel>survey.getQuestionByName("Date of Birth");
+  const ageQuestion = survey.getQuestionByName("Age");
+  dobQuestion.inputValue = "01-15-1990";
+  assert.equal(dobQuestion.value, "01-15-1990", "DOB value is stored in masked format");
+  assert.equal(ageQuestion.value, 35, "Age should be calculated as 35 via inputValue");
+  survey.setValue("patient_dob", "01-15-2000");
+  assert.equal(ageQuestion.value, 25, "Age should be calculated as 25 via setValue masked");
+  survey.data = { patient_dob: "01-15-2005" };
+  assert.equal(ageQuestion.value, 20, "Age should be calculated as 20 via survey.data masked");
+  survey.data = { patient_dob: "1990-01-15" };
+  assert.equal(ageQuestion.value, 35, "Age should be calculated as 35 via survey.data ISO format");
+  settings.onDateCreated = savedOnDateCreated;
 });