Skip to content

Commit 6414867

Browse files
committed
Add tz request parameter to logbook search requests
1 parent ffd7085 commit 6414867

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

app/logbook/olog/ui/src/main/java/org/phoebus/logbook/olog/ui/LogEntryTableViewController.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@
6464
import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
6565

6666
import java.io.IOException;
67+
import java.time.ZoneId;
6768
import java.util.ArrayList;
6869
import java.util.List;
6970
import java.util.Map;
7071
import java.util.Optional;
72+
import java.util.TimeZone;
7173
import java.util.concurrent.atomic.AtomicBoolean;
7274
import java.util.logging.Level;
7375
import java.util.logging.Logger;
@@ -407,6 +409,8 @@ public void search() {
407409
params.put("sort", advancedSearchViewController.getSortAscending() ? "up" : "down");
408410
params.put("from", Integer.toString(pagination.getCurrentPageIndex() * pageSizeProperty.get()));
409411
params.put("size", Integer.toString(pageSizeProperty.get()));
412+
params.put("tz", ZoneId.systemDefault().getId());
413+
410414

411415
searchInProgress.set(true);
412416
logger.log(Level.INFO, "Single search: " + queryString);

app/logbook/olog/ui/src/test/java/org/phoebus/logbook/olog/ui/query/OlogQueryManagerTest.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,10 @@
2424
import java.io.File;
2525
import java.io.FileOutputStream;
2626
import java.io.IOException;
27+
import java.time.ZoneId;
2728
import java.util.ArrayList;
2829
import java.util.List;
30+
import java.util.TimeZone;
2931

3032
import static org.junit.jupiter.api.Assertions.assertEquals;
3133
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -105,4 +107,11 @@ public void testNonEmtpyFile() {
105107
List<OlogQuery> queries = ologQueryManager.getQueries();
106108
assertEquals(1, queries.size());
107109
}
110+
111+
@Test
112+
public void testTZ(){
113+
System.out.println(ZoneId.systemDefault());
114+
System.out.println(TimeZone.getDefault().getID());
115+
System.out.println(TimeZone.getDefault().toZoneId().getId());
116+
}
108117
}

0 commit comments

Comments
 (0)