Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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();
Expand Down
Loading