Skip to content

Commit 7fd767d

Browse files
committed
Make date/time search consistent with table
Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>
1 parent c50427b commit 7fd767d

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

client/src/com/mirth/connect/client/ui/browsers/event/EventBrowser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ public void loadNew(String eventNameFilter) {
207207
}
208208

209209
private Calendar getCalendar(MirthDatePicker datePicker, MirthTimePicker timePicker) throws ParseException {
210-
DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("hh:mm aa"));
210+
DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("HH:mm"));
211211
Date date = datePicker.getDate();
212212
String time = timePicker.getDate();
213213

@@ -909,8 +909,8 @@ private void initComponents() {
909909
endDatePicker = new com.mirth.connect.client.ui.components.MirthDatePicker();
910910
startDatePicker = new com.mirth.connect.client.ui.components.MirthDatePicker();
911911
nameField = new javax.swing.JTextField();
912-
startTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker();
913-
endTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker();
912+
startTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE);
913+
endTimePicker = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE);
914914
filterButton = new javax.swing.JButton();
915915
advSearchButton = new javax.swing.JButton();
916916
levelBoxInformation = new com.mirth.connect.client.ui.components.MirthCheckBox();

client/src/com/mirth/connect/client/ui/browsers/message/MessageBrowser.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -502,7 +502,7 @@ public int getPageSize() {
502502
}
503503

504504
private Calendar getCalendar(MirthDatePicker datePicker, MirthTimePicker timePicker) throws ParseException {
505-
DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("hh:mm aa"));
505+
DateFormatter timeFormatter = new DateFormatter(new SimpleDateFormat("HH:mm"));
506506
Date date = datePicker.getDate();
507507
String time = timePicker.getDate();
508508

@@ -2384,11 +2384,11 @@ private void initComponents() {
23842384
advSearchButton = new javax.swing.JButton();
23852385
pageSizeField = new com.mirth.connect.client.ui.components.MirthTextField();
23862386
statusBoxError = new com.mirth.connect.client.ui.components.MirthCheckBox();
2387-
mirthTimePicker2 = new com.mirth.connect.client.ui.components.MirthTimePicker();
2387+
mirthTimePicker2 = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE);
23882388
statusBoxReceived = new com.mirth.connect.client.ui.components.MirthCheckBox();
23892389
pageGoButton = new javax.swing.JButton();
23902390
statusBoxTransformed = new com.mirth.connect.client.ui.components.MirthCheckBox();
2391-
mirthTimePicker1 = new com.mirth.connect.client.ui.components.MirthTimePicker();
2391+
mirthTimePicker1 = new com.mirth.connect.client.ui.components.MirthTimePicker("HH:mm", Calendar.MINUTE);
23922392
jLabel3 = new javax.swing.JLabel();
23932393
allDayCheckBox = new com.mirth.connect.client.ui.components.MirthCheckBox();
23942394
mirthDatePicker2 = new com.mirth.connect.client.ui.components.MirthDatePicker();

0 commit comments

Comments
 (0)