Commit Graph

652 Commits

Author SHA1 Message Date
Grahame Grieve b13b4932f9 XMLParser allows passing a schema location 2021-05-05 12:17:02 +10:00
Grahame Grieve 6da83fa41e Do not flag internal references as suspicious 2021-05-05 10:17:08 +10:00
Grahame Grieve 9ae04aed03 Fix compartment definitions of ListResource.source and subject for R3 and R4 2021-05-05 08:51:36 +10:00
Mark Iantorno f14ef6d83f
Issue 484 (#485)
* added Integer argument constructor for IntegerType class.

* Updating release notes
2021-05-04 11:21:57 -04:00
Grahame Grieve 53ea22cae7 release notes 2021-05-04 09:45:57 +10:00
markiantorno fb6f420df0 Updating version to: 5.3.12-SNAPSHOT and incrementing test cases dependency. 2021-04-22 05:47:40 +00:00
Grahame Grieve 1c320586e5 Ensure that CVX uses tx.fhir.org, not UTG definitions which are wrong + Fix problems with Bundle validation for ids in collections and add additional search related validation + Remove check on ElementDefinition.id for R2B 2021-04-22 13:27:32 +10:00
markiantorno ba29b1907c Updating version to: 5.3.11-SNAPSHOT and incrementing test cases dependency. 2021-04-21 17:20:12 +00:00
Grahame Grieve 6af6219dcc compile fix + release notes 2021-04-21 19:54:59 +10:00
markiantorno ba18e1c11a Updating version to: 5.3.10-SNAPSHOT and incrementing test cases dependency. 2021-04-12 20:34:20 +00:00
Grahame Grieve 5cb41f9e23 release notes 2021-04-13 05:05:36 +10:00
Grahame Grieve faae5a206f release notes 2021-04-02 06:39:20 +11:00
markiantorno 91e31e813f Updating version to: 5.3.8-SNAPSHOT and incrementing test cases dependency. 2021-03-29 08:04:39 +00:00
Grahame Grieve 032b81a38e fix issue with validating fixed values for primitive elements 2021-03-29 17:26:12 +11:00
Grahame Grieve 30be8a0dc1
Merge branch 'master' into issue_438 2021-03-29 09:08:04 +10:00
Itay Goren 75d6d73757 add default status value to medication request conversion 10_40 2021-03-25 12:57:21 +02:00
Grahame Grieve c9b3df0192 release notes 2021-03-10 21:45:22 +11:00
markiantorno 0dc44571e6 Updating version to: 5.3.5-SNAPSHOT and incrementing test cases dependency. 2021-03-03 23:12:04 +00:00
Grahame Grieve 61bc00b3b8 release notes 2021-03-04 07:29:24 +11:00
markiantorno 622ad5f207 Updating version to: 5.3.4-SNAPSHOT and incrementing test cases dependency. 2021-03-03 15:27:46 +00:00
Grahame Grieve cd7a8d39e7 * Improve terminology validation error messages
* add additional validation on profiles around types (for logical models)
2021-03-03 13:30:58 +11:00
Mark Iantorno b700d82eab
Validation sessions (#443)
* Sessions are working,

* adding javadocs to cache

* These changes were already added, the merge re-added them to the RELEASE_NOTES by mistake.

* cleaning code a little
2021-02-23 14:44:13 -05:00
markiantorno f08f4aec85 Updating version to: 5.3.3-SNAPSHOT and incrementing test cases dependency. 2021-02-18 23:31:07 +00:00
Mark Iantorno 13ca724ffe
Update RELEASE_NOTES.md 2021-02-18 17:42:09 -05:00
markiantorno 5cede7a6b0 Updating version to: 5.3.2-SNAPSHOT and incrementing test cases dependency. 2021-02-17 19:58:37 +00:00
palanm cc03acb3c3 Junit test for Copy method 2021-02-17 11:32:18 -08:00
ItayGoren ad8fbb87df
Merge branch 'master' into observastion-tests 2021-02-04 16:33:23 +02:00
Itay Goren 9d84343fee adding test for observation conversion 10_40 2021-02-04 16:32:54 +02:00
ItayGoren 5b3f4fa85c
converting procedures from dstu2 to r4 (#429)
* converting procedures from dstu2 to r4

* Update VersionConvertor_10_40.java

* Update VersionConvertor_10_40.java

* Update VersionConvertor_10_40.java

* Update Procedure10_40Test.java

* add description to the release notes

Co-authored-by: Mark Iantorno <markiantorno@gmail.com>
2021-02-01 11:16:15 -05:00
ItayGoren 42d148a80e
add medication conversion from dstu2 to r4 (#430)
* add medication conversion from dstu2 to r4

* fixed test

* add description to the release notes
2021-02-01 09:43:51 -05:00
markiantorno 82546c5764 Updating version to: 5.2.21-SNAPSHOT and incrementing test cases dependency. 2021-01-25 15:02:01 +00:00
Mark Iantorno b7f8f8babf
Update RELEASE_NOTES.md 2021-01-25 09:13:22 -05:00
markiantorno de30f3d212 Updating version to: 5.2.20-SNAPSHOT and incrementing test cases dependency. 2021-01-24 16:59:11 +00:00
Mark Iantorno 0458bd8015
Update RELEASE_NOTES.md 2021-01-24 11:08:58 -05:00
markiantorno d13b5dce94 Updating version to: 5.2.19-SNAPSHOT and incrementing test cases dependency. 2021-01-21 23:50:48 +00:00
markiantorno cc7b3bb865 test message for deploy 2021-01-21 09:57:29 -05:00
Mark Iantorno fa86f4459b
test commit 1 (#419) 2021-01-20 16:46:09 -05:00
markiantorno 8a69438532 Updating version to: 5.2.17-SNAPSHOT and incrementing test cases dependency. 2021-01-14 22:38:02 +00:00
Grahame Grieve 2b0a88e75e set up release 2021-01-15 03:49:47 +11:00
markiantorno 3ab5444dca Updating version to: 5.2.14-SNAPSHOT and incrementing test cases dependency. 2020-12-24 05:15:27 +00:00
Grahame Grieve 3ba81328cc * More rules around URL validation, instead of just marking them as errors
* Don't report errors for extensible bindings when profiles apply required bindings
* fix rendering issue with profile references
* only use c:\temp if it's writeable
2020-12-24 13:21:30 +11:00
markiantorno 401b73c700 Updating version to: 5.2.13-SNAPSHOT and incrementing test cases dependency. 2020-12-18 13:38:06 +00:00
Grahame Grieve 9eca42afdb validation fixes 2020-12-18 22:46:04 +11:00
markiantorno ff49147146 Updating version to: 5.2.12-SNAPSHOT and incrementing test cases dependency. 2020-12-15 13:19:59 +00:00
Grahame Grieve 9d57bc9069 ping build 2020-12-15 16:33:03 +11:00
Grahame Grieve 97838733ec * fix bad eror message in german messages (issue 399) 2020-12-15 14:34:19 +11:00
markiantorno 55055fa3c4 Updating version to: 5.2.11-SNAPSHOT and incrementing test cases dependency. 2020-12-09 01:50:11 +00:00
Grahame Grieve 82f3300b69 setup release 2020-12-09 10:11:30 +11:00
markiantorno c85cbf59aa Updating version to: 5.2.10-SNAPSHOT and incrementing test cases dependency. 2020-12-06 22:30:20 +00:00
Grahame Grieve c32a04d9b2 release notes 2020-12-05 10:31:26 +11:00
markiantorno 118c03590f Updating version to: 5.2.8-SNAPSHOT and incrementing test cases dependency. 2020-12-03 22:12:42 +00:00
markiantorno 4a98669bdc pom fixes for skipping unecessary module deployments 2020-12-03 15:59:36 -05:00
Grahame Grieve cc57a7ebcb release notes 2020-12-03 16:58:19 +11:00
Grahame Grieve b75c0a7181 set up release 2020-12-03 12:58:05 +11:00
markiantorno 2dff99e99b Updating version to: 5.2.6-SNAPSHOT and incrementing test cases dependency. 2020-12-01 12:33:00 +00:00
Grahame Grieve 245b1b7e20 set up release 2020-12-01 15:01:31 +11:00
markiantorno 3e7bd73109 Updating version to: 5.2.4-SNAPSHOT and incrementing test cases dependency. 2020-11-27 16:34:04 +00:00
Grahame Grieve d4087590bf
hopefully final prep for 5.2.2 (#387)
* Add on the fly retrieval of profiles in the validator, and fix bug where validator reported 'not done yet' for invalid contained references.

* fix loading issue for content references in versions before R3

* fix content resolution issue for versions from before 3

* Fix for bundle renderer trying to render resources from the wrong version

* Fix for wrong reference to Any in cross version extensions

* fix test case reference

* fix mistake generating snapshots around element ids

* fix tests
2020-11-27 09:20:49 -05:00
Grahame Grieve 34d29ed614 release notes 2020-11-26 08:56:22 +11:00
Mark Iantorno bdf3e025d3
Issue 383 (#384)
* added null hasWhen check for all version conversions

* updated release notes

* error message updated for clarity
2020-11-24 15:08:44 -05:00
markiantorno 7adfefa635 Updating version to: 5.2.2-SNAPSHOT and incrementing test cases dependency. 2020-11-24 16:05:34 +00:00
Mark Iantorno e911459218
Updated for 5.2.1 2020-11-24 10:15:04 -05:00
markiantorno f4ca5aebe5 Updating version to: 5.1.23-SNAPSHOT and incrementing test cases dependency. 2020-11-13 05:35:44 +00:00
Grahame Grieve 6ef8565563 fix rendering on must-support view for must-support on types and target profiles 2020-11-13 14:46:57 +11:00
markiantorno e85f66fddb Updating version to: 5.1.22-SNAPSHOT and incrementing test cases dependency. 2020-11-11 02:03:27 +00:00
Grahame Grieve ef3e34ae01 * add styling when adding markdown to table
* don't apply warning about reference content when it's used as a pattern
2020-11-11 10:12:48 +11:00
markiantorno 1db9a028bf Updating version to: 5.1.21-SNAPSHOT and incrementing test cases dependency. 2020-11-05 05:40:28 +00:00
Grahame Grieve 581799d01c update test case dependency 2020-11-05 14:56:30 +11:00
markiantorno 7a3da4239e Updating version to: 5.1.20-SNAPSHOT and incrementing test cases dependency. 2020-11-03 18:45:02 +00:00
Mark Iantorno 93f3cad9ec
Update RELEASE_NOTES.md 2020-11-03 11:03:54 -05:00
markiantorno b7661db83e Updating version to: 5.1.19-SNAPSHOT and incrementing test cases dependency. 2020-10-30 00:08:34 +00:00
Grahame Grieve 82afa47590 add parameter -html-output for enhanced presentation of slicing information (issue #283) 2020-10-29 17:51:34 +11:00
Grahame Grieve bc1d67db96 * fix bug checking unfixed values for HumanName patterns
* fix bug checking patterns (missed in some circumstances)
* fix bug checking type of resources in bundles
* improve messages around cardinality errors in profiles
2020-10-29 14:03:08 +11:00
markiantorno 9bbb78e23d Updating version to: 5.1.18-SNAPSHOT and incrementing test cases dependency. 2020-10-14 20:03:52 +00:00
Grahame Grieve 5ce25da10b release notes 2020-10-14 16:49:44 +11:00
markiantorno 1f583d6ba7 Updating version to: 5.1.17-SNAPSHOT and incrementing test cases dependency. 2020-10-01 04:37:43 +00:00
Grahame Grieve e89da42514 * fix error setting up mapping log
* fix rendering of definitions in CodeSystems
* fix error rendering bundles in bundles
2020-10-01 12:39:10 +10:00
Grahame Grieve 3e6863ef70 Support for additional checking in IG Publisher 2020-10-01 11:05:24 +10:00
Grahame Grieve 3f97d628ed release notes 2020-09-30 09:30:20 +10:00
markiantorno afa46ebe7c Updating version to: 5.1.16-SNAPSHOT and incrementing test cases dependency. 2020-09-26 00:15:47 +00:00
Mark Iantorno 6936ed731c
GitHub packages (#357)
* changes to enable publishing to both github packages and sonatype
2020-09-25 16:49:03 -04:00
markiantorno b7183f005c Updating version to: 5.1.15-SNAPSHOT and incrementing test cases dependency. 2020-09-24 20:45:19 +00:00
Mark Iantorno 4da20d24fc
Update RELEASE_NOTES.md 2020-09-24 16:43:15 -04:00
Mark Iantorno e10c52a70b
Update RELEASE_NOTES.md 2020-09-24 16:42:46 -04:00
Mark Iantorno eaa747fa67
Update RELEASE_NOTES.md 2020-09-24 16:07:43 -04:00
Mark Iantorno 31e4a01104
Update RELEASE_NOTES.md 2020-09-24 16:03:33 -04:00
Mark Iantorno b93c13280d
Update RELEASE_NOTES.md 2020-09-24 15:59:39 -04:00
Grahame Grieve b578cfbc0d
Gg v5114 b (#356)
* Ensure "I" flag in profile table representation is not used for underlying infrastructural constraints that exist everywhere

* render multiple values for properties if they exist

* fix for npe

* fix for use of "current" as version

* fix bad package URLs as they are loaded

* RELEASE_NOTES.md

* Add rendering for must support on types, profiles, targets

* Add new validation for must-support on types / profiles / targets + improve extension validation

* add <code> when rendering turtle to HTML

* RELEASE_NOTES.md

* fix notes
2020-09-24 14:06:36 -04:00
Grahame Grieve cce35705a6 fix notes 2020-09-25 03:37:46 +10:00
Grahame Grieve cf6eb7b10c RELEASE_NOTES.md 2020-09-25 03:29:54 +10:00
Grahame Grieve b8370f7e61
various minor fixes (#353)
* Ensure "I" flag in profile table representation is not used for underlying infrastructural constraints that exist everywhere

* render multiple values for properties if they exist

* fix for npe

* fix for use of "current" as version

* fix bad package URLs as they are loaded

* RELEASE_NOTES.md
2020-09-22 16:17:45 -04:00
Grahame Grieve 9d0fe1a081 RELEASE_NOTES.md 2020-09-23 03:48:25 +10:00
markiantorno 5e3b51e286 Updating version to: 5.1.14-SNAPSHOT and incrementing test cases dependency. 2020-09-21 19:41:08 +00:00
Grahame Grieve 9c09320530 release notes 2020-09-22 04:09:27 +10:00
Grahame Grieve a47e806016 release notes 2020-09-17 17:04:59 +10:00
markiantorno a0573907bd Updating version to: 5.1.12-SNAPSHOT and incrementing test cases dependency. 2020-09-16 04:59:05 +00:00
Grahame Grieve 66f0b35a38 FHIRPath - support lenient mode on polymorphics 2020-09-16 13:08:02 +10:00
markiantorno 8a11bd2e9b Updating version to: 5.1.11-SNAPSHOT and incrementing test cases dependency. 2020-09-15 05:18:08 +00:00
Grahame Grieve f288ac45be ping build 2020-09-15 13:48:06 +10:00
Grahame Grieve b595a307c1 ping build 2020-09-15 13:40:18 +10:00
Grahame Grieve 953d907f0f more release notes 2020-09-15 13:35:32 +10:00
Grahame Grieve 81b2feda30 add release notes 2020-09-15 13:21:15 +10:00
markiantorno 1d2e9a2be8 Updating version to: 5.1.10-SNAPSHOT and incrementing test cases dependency. 2020-09-09 06:00:52 +00:00
Grahame Grieve f696804509 Fix tests 2020-09-09 12:46:04 +10:00
markiantorno a92876ab4a Updating version to: 5.1.9-SNAPSHOT and incrementing test cases dependency. 2020-09-08 05:28:46 +00:00
Grahame Grieve 1ebd74f0d0 Add release notes 2020-09-08 14:01:33 +10:00
markiantorno aae995b72c Updating version to: 5.1.8-SNAPSHOT and incrementing test cases dependency. 2020-09-01 01:33:46 +00:00
Grahame Grieve 39f13c5d65 release notes 2020-09-01 09:54:39 +10:00
markiantorno bb953fc7fc Updating version to: 5.1.7-SNAPSHOT and incrementing test cases dependency. 2020-08-27 08:09:56 +00:00
Grahame Grieve a1b7257bb1 Add release notes 2020-08-27 17:12:52 +10:00
markiantorno 9f23ff6ea9 Updating version to: 5.1.6-SNAPSHOT and incrementing test cases dependency. 2020-08-20 12:41:28 +00:00
Grahame Grieve 5afbb01e45 fix release notes 2020-08-20 20:38:37 +10:00
markiantorno be5ba84652 Updating version to: 5.1.5-SNAPSHOT and incrementing test cases dependency. 2020-08-18 22:50:45 +00:00
Grahame Grieve 0d6719a6f8 Release Notes 2020-08-19 05:56:30 +10:00
Grahame Grieve 4e200acead clear notes 2020-08-18 12:13:38 +10:00
Grahame Grieve 66190d43a5 restore release notes 2020-08-17 08:41:22 +10:00
markiantorno c09becfba2 Updating version to: 5.1.3-SNAPSHOT and incrementing test cases dependency. 2020-08-15 23:06:25 +00:00
Grahame Grieve 61871e7c63 release notes 2020-08-13 20:33:38 +10:00
markiantorno 1af6268fa8 Updating version to: 5.0.23-SNAPSHOT and incrementing test cases dependency. 2020-08-07 03:51:36 +00:00
Grahame Grieve deeae26b42 release notes 2020-08-07 11:37:38 +10:00
Grahame Grieve 23d62721c6 release notes 2020-08-06 22:38:58 +10:00
markiantorno f54e56e74c Updating version to: 5.0.20-SNAPSHOT 2020-08-05 23:31:54 +00:00
Grahame Grieve 4cac2c97ac release notes 2020-08-06 07:42:22 +10:00
markiantorno ea322996f3 Updating version to: 5.0.19-SNAPSHOT 2020-08-03 21:14:01 +00:00
Grahame Grieve 417c245e3c fix up release notes 2020-08-03 21:52:39 +10:00
Grahame Grieve 6bdde22026 no validation for CanonicalResource.url (further work needed) 2020-08-03 18:16:00 +10:00
Grahame Grieve 5299bbe16b * better validation of external references. Note: this is a potentially significant change: things that were called ok before may not be now, and things that were not ok before may become so, depending on the interplay between this and auto-load, further work may be needed here
* Support better validation of version specific profiles in meta.profile. This may also find new errors that were not previously being found
* Support auto-determination of the version of FHIR to use when using the java validator
* auto-load packages from the package server when references to profiles etc are encountered
* look for references inside other parameters in Parameters resource
2020-08-03 17:40:21 +10:00
markiantorno 82125235a0 Updating version to: 5.0.18-SNAPSHOT 2020-07-30 04:47:14 +00:00
Grahame Grieve ef20988d70 release notes 2020-07-30 12:04:03 +10:00
markiantorno a154f454b4 Updating version to: 5.0.17-SNAPSHOT 2020-07-28 05:15:29 +00:00
Grahame Grieve eb7391f4ce update release notes 2020-07-28 12:56:15 +10:00
Grahame Grieve b256965738 * fix evaluation of codes in code systems that are labelled content = fragment 2020-07-28 06:06:01 +10:00
markiantorno b877474fc8 Updating version to: 5.0.15-SNAPSHOT 2020-07-17 22:21:01 +00:00
Mark Iantorno 50e6bb02fd
Update RELEASE_NOTES.md (#279) 2020-07-17 17:45:43 -04:00
markiantorno e14de3b339 Updating version to: 5.0.14-SNAPSHOT 2020-07-17 05:55:20 +00:00
Grahame Grieve 376e4f0ef1 update release notes 2020-07-17 09:34:44 +10:00
Grahame Grieve 6707d5a59f add release notes 2020-07-16 09:24:35 +10:00
markiantorno facb2ca0a8 Updating version to: 5.0.13-SNAPSHOT 2020-07-07 02:37:39 +00:00
Grahame Grieve ce47093c12
Gg work (#267)
* fix for new test case about profiles restricting types

* update release notes

* fix NPEs doing ProfileComparison

* fix non-translated messages in InstanceValidator

* Fix validation issues

* update to 1.1.22 tests

* fix bug finding children in getChildList when element is a reference to another element

* fixes to QuestionnaireRenderer + add QuestionnaireResponseRenderer

* Add more informative error when no type parser provided

* fix bug where current/dev builds do not properly update the cache

* improve test error message

* set up release notes

* fix bug with CDA snapshot generation

* fix bug in type checking code

* Add support for validating against ImplementationGuide.global

* Fix bug in QuestionnaireResponse rendering

* update tests dependency

* ping build

* Add additional StructureDefinition validation

* update release notes

* fix npe rendering diagnostic reports without subjects

* don't add note on untranslatable messages

* check existing snapshots (preliminary)

* add signpost message tracking

* start working on profile generating bug

* Fix bug in snapshot - not handling case where content is sliced, base slicing detail is provided, and max slices = 1

* fix release notes
2020-07-06 20:21:40 -04:00
markiantorno ab8bbb5491 Updating version to: 5.0.12-SNAPSHOT 2020-07-04 00:25:03 +00:00
Grahame Grieve 92c02d2294
Add support for validating against ImplementationGuide.global (#266)
* fix for new test case about profiles restricting types

* update release notes

* fix NPEs doing ProfileComparison

* fix non-translated messages in InstanceValidator

* Fix validation issues

* update to 1.1.22 tests

* fix bug finding children in getChildList when element is a reference to another element

* fixes to QuestionnaireRenderer + add QuestionnaireResponseRenderer

* Add more informative error when no type parser provided

* fix bug where current/dev builds do not properly update the cache

* improve test error message

* set up release notes

* fix bug with CDA snapshot generation

* fix bug in type checking code

* Add support for validating against ImplementationGuide.global

* Fix bug in QuestionnaireResponse rendering

* update tests dependency

* ping build

* Add additional StructureDefinition validation

* update release notes
2020-07-03 18:25:15 -04:00
markiantorno 97f6758969 Updating version to: 5.0.11-SNAPSHOT 2020-07-01 00:52:38 +00:00
Grahame Grieve 9024a309ac
fix various bugs (#265)
* fix for new test case about profiles restricting types

* update release notes

* fix NPEs doing ProfileComparison

* fix non-translated messages in InstanceValidator

* Fix validation issues

* update to 1.1.22 tests

* fix bug finding children in getChildList when element is a reference to another element

* fixes to QuestionnaireRenderer + add QuestionnaireResponseRenderer

* Add more informative error when no type parser provided

* fix bug where current/dev builds do not properly update the cache

* improve test error message

* set up release notes
2020-06-30 20:25:38 -04:00
markiantorno 7f7e83f6f8 Updating version to: 5.0.10-SNAPSHOT 2020-06-27 00:25:51 +00:00
Grahame Grieve b08c12f2c4
update test case dependency to 1.1.22 (#263)
* fix for new test case about profiles restricting types

* update release notes

* fix NPEs doing ProfileComparison

* fix non-translated messages in InstanceValidator

* Fix validation issues

* update to 1.1.22 tests
2020-06-26 20:07:30 -04:00
Grahame Grieve 03a4224424
fix for new test case about profiles restricting types (#261)
* fix for new test case about profiles restricting types

* update release notes

* fix NPEs doing ProfileComparison

* fix non-translated messages in InstanceValidator
2020-06-26 14:46:54 -04:00
markiantorno 49c35b1de2 Updating version to: 5.0.8-SNAPSHOT
***NO_CI***
2020-06-13 13:12:37 +00:00
Mark Iantorno f5455bb9e9
Merge branch 'release' into merge_branch 2020-06-12 19:34:50 -04:00
Grahame Grieve 66532cc2c2 Add release notes 2020-06-12 09:42:56 +10:00
Mark Iantorno 0fb57007c4
Release v5.0.6 (#226)
* reenable test and fix recursion

* remove disabled r4 fml tests

* add conformsTo test and support for FML

* Snapshot builder fix (#223)

* Update module-snapshot-publishing.yml for Azure Pipelines

* Changing pipeline, because intermodule depenedecies are not being read in correctly.

* Update README.md

* Fixed bad link

* Release: v5.0.6

***NO_CI***

* Updating version to: 5.0.7-SNAPSHOT
***NO_CI***

* Fixing issues and preparing for release (#225)

* Issue #189 - improve Questionnaire error message

* fix for issue #187

* more work on comparison

* Fix for NamingSystem display

Co-authored-by: Oliver Egger <oliver.egger@ahdis.ch>
Co-authored-by: Grahame Grieve <grahameg@gmail.com>
2020-06-05 18:47:17 -04:00
markiantorno 94cca87107 Updating version to: 5.0.7-SNAPSHOT
***NO_CI***
2020-06-05 22:14:50 +00:00
Mark Iantorno 8eb14a9b31
Creating RELEASE_NOTES file for pipelines. 2020-05-28 15:12:22 -04:00