Merge pull request #3646 from ControlSystemStudio/CSSTUDIO-3532

Add tz request parameter to logbook search requests

Author: shroffk

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

@@ -64,10 +64,12 @@
 import org.phoebus.ui.dialog.ExceptionDetailsErrorDialog;
 
 import java.io.IOException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
+import java.util.TimeZone;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -407,6 +409,8 @@ public void search() {
         params.put("sort", advancedSearchViewController.getSortAscending() ? "up" : "down");
         params.put("from", Integer.toString(pagination.getCurrentPageIndex() * pageSizeProperty.get()));
         params.put("size", Integer.toString(pageSizeProperty.get()));
+        params.put("tz", ZoneId.systemDefault().getId());
+
 
         searchInProgress.set(true);
         logger.log(Level.INFO, "Single search: " + queryString);

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

@@ -24,8 +24,10 @@
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.time.ZoneId;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.TimeZone;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -105,4 +107,11 @@ public void testNonEmtpyFile() {
         List<OlogQuery> queries = ologQueryManager.getQueries();
         assertEquals(1, queries.size());
     }
+
+    @Test
+    public void testTZ(){
+        System.out.println(ZoneId.systemDefault());
+        System.out.println(TimeZone.getDefault().getID());
+        System.out.println(TimeZone.getDefault().toZoneId().getId());
+    }
 }