From 7fd767d4aaf5636af15bb88421f888b0fca265fc Mon Sep 17 00:00:00 2001 From: Mitch Gaffigan Date: Fri, 20 Mar 2026 10:32:31 -0500 Subject: [PATCH] Make date/time search consistent with table Signed-off-by: Mitch Gaffigan --- .../connect/client/ui/browsers/event/EventBrowser.java | 6 +++--- .../connect/client/ui/browsers/message/MessageBrowser.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java b/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java index 8cdc10698..d85a6f5ec 100644 --- a/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java +++ b/client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java @@ -207,7 +207,7 @@ public void loadNew(String eventNameFilter) { } private Calendar getCalendar(MirthDatePicker datePicker, MirthTimePicker timePicker) throws ParseException { - DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("hh:mm aa")); + DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("HH:mm")); Date date = datePicker.getDate(); String time = timePicker.getDate(); @@ -909,8 +909,8 @@ private void initComponents() { endDatePicker = new com.mirth.connect.client.ui.components.MirthDatePicker(); startDatePicker = new com.mirth.connect.client.ui.components.MirthDatePicker(); nameField = new javax.swing.JTextField(); - startTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker(); - endTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker(); + startTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE); + endTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE); filterButton = new javax.swing.JButton(); advSearchButton = new javax.swing.JButton(); levelBoxInformation = new com.mirth.connect.client.ui.components.MirthCheckBox(); diff --git a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java b/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java index 25898c3e8..18d3c1b02 100644 --- a/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java +++ b/client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java @@ -502,7 +502,7 @@ public int getPageSize() { } private Calendar getCalendar(MirthDatePicker datePicker, MirthTimePicker timePicker) throws ParseException { - DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("hh:mm aa")); + DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("HH:mm")); Date date = datePicker.getDate(); String time = timePicker.getDate(); @@ -2384,11 +2384,11 @@ private void initComponents() { advSearchButton = new javax.swing.JButton(); pageSizeField = new com.mirth.connect.client.ui.components.MirthTextField(); statusBoxError = new com.mirth.connect.client.ui.components.MirthCheckBox(); - mirthTimePicker2 = new com.mirth.connect.client.ui.components.MirthTimePicker(); + mirthTimePicker2 = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE); statusBoxReceived = new com.mirth.connect.client.ui.components.MirthCheckBox(); pageGoButton = new javax.swing.JButton(); statusBoxTransformed = new com.mirth.connect.client.ui.components.MirthCheckBox(); - mirthTimePicker1 = new com.mirth.connect.client.ui.components.MirthTimePicker(); + mirthTimePicker1 = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE); jLabel3 = new javax.swing.JLabel(); allDayCheckBox = new com.mirth.connect.client.ui.components.MirthCheckBox(); mirthDatePicker2 = new com.mirth.connect.client.ui.components.MirthDatePicker();