icrc-jfigueiredo <72515287+icrc-jfigueiredo@users.noreply.github.com> 22 Apr 2021 db50553c9ac25b0c86a63a150a42f6d2b516f4cf

HTML-755: <encounterDate showTime="true"/> to support time zones. (#219)
* HTML-755 Convert from client timezone to server timezone before saving on the DB

* HTML-755 Convert from client timezone to server timezone before saving on the DB

* HTML-755 Convert from client timezone to server timezone before saving on the DB

* HTML-755 Convert from client timezone to server timezone before saving on the DB

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Using getters and setters.
Changing timezone word using always minor "z"
Add Global Variable to timezone on the constants file and add its value in the config.xml

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Reuse some code from TimeWidget
Add a new test to work with the global variable

* Code alignment between ZonedDateTimeWidget, DateWidget and TimeWidget.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

* HTML-755: ZonedDateTimeWidget to reuse DateWidget and TimeWidget routines.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Fix new timezones tests.

* HTML-755: Updating and expanding on EncounterDateTagTest.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Remove some functions only used for tests.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Change date format to "yyyy-MM-dd'T'HH:mm:ss'Z'"

* HTML-755: Removed EncounterDetailSubmissionElement#generateHtmlDateWidget.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Fix test with wrong date format
Change the WidgetFactory.displayValue so we can add a class to the html.
ZonedDateTimeWidget generateHtml now use the WidgetFactory.displayValue

* HTML-755 Convert from client timezone to server timezone before saving on the DB

remove unnecessary condition

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Change class name

* HTML-755: New date utils temporarily added to HtmlFormEntryUtil.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

remove unnecessary condition

* HTML-755: Finalising the GP use strategy + fixing tests.

* HTML-755: Renaming test case as submitEncounterDateWithoutTimezone_shouldError.

* HTML-755: ZonedDateTimeWidget to be the registered widget.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Remvove, hideSeconds

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Remove hideSeconds

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Remove hideSeconds

* Removing unnecessary blank line.

* Upadting "htmlformentry.error.noClientTimezone".

* HTML-755: Disuse of org.joda.time.DateMidnight.

* HTML-755: EncounterDateTagTest to reset to system timezone upon completion.

* HTML-755: Added org.openmrs.util.TimeZoneUtil.

* Updated htmlformentry.handleTimezones description.

* HTML-755: Using results.assertEncounterDatetime.

* HTML-755 Convert from client timezone to server timezone before saving on the DB

Change initial value format for date.
Add new function to TimeZoneUtil to convert from string with format ISO 8601 to date

* HTML-755 Change the timezone GP name

* HTML-755 Replace GP name

* HTML-755 Change names only

* HTML-755 Update TimeZoneUtil.java with new functionalities

* HTML-755 Create new constant for UP_CLIENT_TIMEZONE "htmlformentry.client.timezone"

* HTML-755 Remove white spaces from messages.properties

* HTML-755 Remove white spaces from messages.properties

* HTML-755 Remove unnecessary constant prefix, remove unused constant.

Co-authored-by: mks-d <dimitri@mekomsolutions.com>
Co-authored-by: Joel Figueiredo <71354718+JFFigueiredo@users.noreply.github.com>

• api-tests/src/test/java/org/openmrs/module/htmlformentry/EncounterDateTagTest.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api-tests/src/test/java/org/openmrs/module/htmlformentry/RegressionTest.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api-tests/src/test/java/org/openmrs/module/htmlformentry/handler/MarkPatientDeadTagHandlerComponentTest.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryConstants.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/HtmlFormEntryUtil.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/element/EncounterDetailSubmissionElement.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/widget/DateWidget.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/widget/TimeWidget.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/widget/WidgetFactory.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/module/htmlformentry/widget/ZonedDateTimeWidget.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/java/org/openmrs/util/TimeZoneUtil.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/main/resources/messages.properties (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/test/java/org/openmrs/module/htmlformentry/widget/DateWidgetTest.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• api/src/test/java/org/openmrs/module/htmlformentry/widget/ZonedDateTimeWidgetTest.java (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)
• omod/src/main/resources/config.xml (version db50553c9ac25b0c86a63a150a42f6d2b516f4cf)

Mark Goodrich <mark.goodrich@live.com> 22 Apr 2021 969c9a43808098d0ca5b100373d1f9d48b35af80

HTML-774: Order Tag only displays displays one drug per forumlation) (#237)

• api/src/main/java/org/openmrs/module/htmlformentry/handler/OrderTagHandler.java (version 969c9a43808098d0ca5b100373d1f9d48b35af80)

Jack MacDonald <33408323+jmmacdo4@users.noreply.github.com> 22 Apr 2021 b8f9105bd912a46dda71c6d57f74e7a0af9e7ebe

Remove binding from appointment notes asa it opens the potential for XSS (#20)

• omod/src/main/webapp/fragments/patientAppointmentRequests.gsp (version b8f9105bd912a46dda71c6d57f74e7a0af9e7ebe)

mgoodrich <mark.goodrich@live.com> 22 Apr 2021 6df5e0bbca6383a8d0a6784b744e43db0adcc70d

RA-1911: Program Enrollment Widget should allow enrollment date of program to be equal to completion date of previous program (#399) add test

• omod/src/main/web/dashboardwidgets/programstatus/programstatus.spec.js (version 6df5e0bbca6383a8d0a6784b744e43db0adcc70d)

Mark Goodrich <mark.goodrich@live.com> 22 Apr 2021 d3785b1d0dbe4c2faf56fa4d53f510d407b616ff

RA-1911: Program Enrollment Widget should allow enrollment date of program to be equal to completion date of previous program (#399)

• api/src/main/java/org/openmrs/module/coreapps/utils/PatientProgramComparator.java (version d3785b1d0dbe4c2faf56fa4d53f510d407b616ff)
• api/src/test/java/org/openmrs/module/coreapps/utils/PatientProgramComparatorTest.java (version d3785b1d0dbe4c2faf56fa4d53f510d407b616ff)
• omod/src/main/java/org/openmrs/module/coreapps/fragment/controller/program/ProgramHistoryFragmentController.java (version d3785b1d0dbe4c2faf56fa4d53f510d407b616ff)
• omod/src/main/web/dashboardwidgets/programstatus/programstatus.controller.js (version d3785b1d0dbe4c2faf56fa4d53f510d407b616ff)

mgoodrich <mark.goodrich@live.com> 22 Apr 2021 7f0cad3a2bec938e69c01bba7f77ce4529120fcc

RA-1903: Check the role 'System Developer' to allow enrollment actions. fix test

• omod/src/main/web/dashboardwidgets/programstatus/programstatus.spec.js (version 7f0cad3a2bec938e69c01bba7f77ce4529120fcc)

icrc-jfigueiredo <72515287+icrc-jfigueiredo@users.noreply.github.com> 22 Apr 2021 579f24ef8ea6f393844cf9f42bb528f42df215b7

RA-1908: LoginPageController to set the "clientTimezone" user property. (#88)
* HTML-755 Add userProperty "clientTimezone" when selecting a location.

Add userProperty "clientTimezone" when selecting a location.
If we only have 1 location, if timezones are enabled and that user don't have the user proprety "clientTimezone" set on the DB, it will force the user to click on that single location, if timezones are not enable then it will skip the location selection screen(if only 1 location are possible for that user).

Update the UiFramework version.

* HTML-755 Fix typo and formatting code

* HTML-755 Formatting code

* HTML-755 Correct typo

* HTML-755 Change method name.

* HTML-755 Adding new test

* HTML-755 Adding new test

* HTML-755 UPPERCASE constants names

* HTML-755 Constant Convention changes.

• omod/src/main/java/org/openmrs/module/referenceapplication/page/controller/LoginPageController.java (version 579f24ef8ea6f393844cf9f42bb528f42df215b7)
• omod/src/main/webapp/pages/login.gsp (version 579f24ef8ea6f393844cf9f42bb528f42df215b7)
• omod/src/test/java/org/openmrs/module/referenceapplication/page/controller/LoginPageControllerTest.java (version 579f24ef8ea6f393844cf9f42bb528f42df215b7)
• pom.xml (version 579f24ef8ea6f393844cf9f42bb528f42df215b7)

Isaac Sears <isaac.j.sears@gmail.com> 22 Apr 2021 0410c091d46eed3c132fe0fcafe5964182659f74

Merge pull request #89 from The-Lady/EMPT110
RA-1875: EMPT110 Fixed XSS Vulnerability in AppId field on User App Page

The-Lady <ash.phoenix97@gmail.com> 21 Apr 2021 d9b44e7fc5a90564d167a3a3f5cd4839e6259da2 m

Limited encoding of appId to that in error messages only

• omod/src/main/java/org/openmrs/module/referenceapplication/page/controller/UserAppPageController.java (version d9b44e7fc5a90564d167a3a3f5cd4839e6259da2)

The-Lady <ash.phoenix97@gmail.com> 19 Apr 2021 b76b42c2e32fc8fb87252c7194fb02b1ef13260a m

Encoded AppId in post request made on User App page

• omod/src/main/java/org/openmrs/module/referenceapplication/page/controller/UserAppPageController.java (version b76b42c2e32fc8fb87252c7194fb02b1ef13260a)

Parth Kanakiya <smartparth13@gmail.com> 22 Apr 2021 0f3a7c6753e63da6959dc4e300dea94bc80a185e

Fixed issue EMPT61 as described in document. (#110)
Fixed Issues

• omod/src/main/webapp/fragments/field/personRelationship.gsp (version 0f3a7c6753e63da6959dc4e300dea94bc80a185e)