diff --git a/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc b/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc index 05f7bfd0..54c3345f 100644 --- a/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc +++ b/documentation/IDTA-01002-3/modules/ROOT/pages/changelog.adoc @@ -53,6 +53,7 @@ Major Changes: Minor Changes: +* fix: Aligned date/time extraction functions (`$dayOfWeek`, `$dayOfMonth`, `$month`, `$year`) in JSON Schema to accept all `dateTimeOperand` types per BNF grammar, and widened `timeLiteralPattern` to support fractional seconds. * fix: Wrong ServiceSpecificationProfileEnum values for v3.0 profiles. (https://github.com/admin-shell-io/aas-specs-api/issues/526[#526]) * removed: Remove TREE. (https://github.com/admin-shell-io/aas-specs-api/issues/537) * fix: fixed FILTER object in json schema & fixed inconsistencies in BNF (https://github.com/admin-shell-io/aas-specs-api/issues/547) diff --git a/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc b/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc index 348064ec..bfdd5b95 100644 --- a/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc +++ b/documentation/IDTA-01002-3/modules/ROOT/pages/schema.adoc @@ -22,7 +22,7 @@ }, "timeLiteralPattern": { "type": "string", - "pattern": "^[0-9][0-9]:[0-9][0-9](:[0-9][0-9])?$" + "pattern": "^[0-9]{2}:[0-9]{2}(:[0-9]{2})?(\\.[0-9]+)?$" }, "Value": { "type": "object", @@ -70,16 +70,16 @@ "$ref": "#/definitions/Value" }, "$dayOfWeek": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$dayOfMonth": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$month": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$year": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" } }, "oneOf": [ diff --git a/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json b/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json index a5f131d6..255e7972 100644 --- a/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json +++ b/documentation/IDTA-01002-3/modules/ROOT/partials/query-json-schema.json @@ -22,7 +22,7 @@ }, "timeLiteralPattern": { "type": "string", - "pattern": "^[0-9][0-9]:[0-9][0-9](:[0-9][0-9])?$" + "pattern": "^[0-9]{2}:[0-9]{2}(:[0-9]{2})?(\\.[0-9]+)?$" }, "Value": { "type": "object", @@ -67,16 +67,16 @@ "$ref": "#/definitions/Value" }, "$dayOfWeek": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$dayOfMonth": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$month": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" }, "$year": { - "$ref": "#/definitions/dateTimeLiteralPattern" + "$ref": "#/definitions/Value" } }, "oneOf": [