Skip to content

Conversation

@wanglin86769
Copy link
Contributor

This PR is trying to fix #3198 with the following modifications,

  1. Add search() method to ElogClient.java
  2. Support pagination log request
  3. Support sort by date
  4. Fix a typo which which causes Text be sent for both text and subject

@shroffk shroffk merged commit fe56add into ControlSystemStudio:master May 14, 2025
2 checks passed
@andrea-celentano
Copy link

Dear @wanglin86769, thanks for this update. I tried to recompile the latest version of phoebus, and I confirm it works properly regarding the integration with elog, both in terms of new message posting to the logbook and previous message display from the logbook.

The only minor concern I observe regards the formatting of some messages retrieved from the logbook.
I report below an example. The original message looks like:

image

And it is rendered on phoebus as:

image

Thanks,
Andrea

@wanglin86769
Copy link
Contributor Author

Dear @andrea-celentano , thanks for reporting. It seems that the log description is displayed on a JavaFx WebView tag in the following source file, which by default collapses whitespaces and newlines to single whitespace.
phoebus\app\logbook\olog\ui\src\main\resources\org\phoebus\logbook\olog\ui\SingleLogEntryDisplay.fxml

I have created a PR #3413 to preserve whitespaces as follows,

image

image

Hope the modification does not affect the behavior of Olog, because the Phoebus Elog client actually uses the Olog UI.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Elog - Log Entry Calender and Table exceptions

3 participants