Skip to content

#2693 Expansion of the Event search function #3074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Patrykb0802 wants to merge 3 commits into
base: release/2.8.0
Choose a base branch
from
Open

#2693 Expansion of the Event search function #3074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80c735c
#2693 Expansion of the Event search function
Patrykb0802 Jan 13, 2025
197749b
#2693 Expansion of the Event search function
Patrykb0802 Jan 16, 2025
9b637f2
#2693 Expansion of the Event search function
Patrykb0802 Apr 7, 2025
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
335 changes: 245 additions & 90 deletions WebContent/WEB-INF/jsp/events.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@
<tag:page dwr="EventsDwr">
<%@ include file="/WEB-INF/jsp/include/userComment.jsp" %>
<link rel="stylesheet" href="resources/jquery.ui.all.css">
<link rel="stylesheet" href="resources/jQuery/plugins/jquery-ui/development-bundle/themes/base/jquery-ui.css">
<link rel="stylesheet" href="resources/demos.css">
<script type="text/javascript" src="resources/jquery.js"></script>
<script type="text/javascript" src="resources/jquery_ui.js"></script>
<script type="text/javascript" src="resources/jquery.ui.datepicker.js"></script>
<script type="text/javascript" src="resources/jquery.ui.datepicker-pt-BR.js"></script>
<script type="text/javascript" src="resources/jQuery/plugins/jquery-ui/development-bundle/ui/i18n/jquery.ui.datepicker-en-GB.js"></script>
<style>
.incrementControl { width: 2em; }
</style>
Expand All @@ -38,11 +39,24 @@
// dojo.requireLocalization("dojo.i18n.calendar", "gregorianExtras", null, "ROOT,ja,zh");

jQuery.noConflict();
jQuery.datepicker.setDefaults(jQuery.datepicker.regional['pt-BR']);

jQuery.datepicker.setDefaults(jQuery.datepicker.regional['en-GB']);

jQuery(function() {
jQuery('#datePicker').datepicker();
jQuery("#startDate, #endDate").datepicker();

// Initialize the datepickers on each input
jQuery("#startDate").datepicker({ dateFormat: 'dd-mm-yy' });
jQuery("#endDate").datepicker({ dateFormat: 'dd-mm-yy' });

// Clicking the icon opens the respective datepicker
jQuery("#startDateIcon").click(function() {
jQuery("#startDate").datepicker("show");
});

jQuery("#endDateIcon").click(function() {
jQuery("#endDate").datepicker("show");
});
});

function updatePendingAlarmsContent(content) {
Expand Down Expand Up @@ -115,23 +129,65 @@
}

function newSearch() {
// var x = dojo.widget.byId("datePicker");
// console.log(x);
// x.setDate(x.today);
time = new Date($("datePicker"));
hideContextualMessages("eventSearchForm");
// doSearch(0,time.getTime());
console.log("newSearch");
// Collect the selected Event Source Types
var eventSourceTypes = [];
jQuery("input[name='eventSourceType']:checked").each(function() {
eventSourceTypes.push(this.value);
});

let searchConfigTemp = createSearchConfigTemp();
// Collect the selected Alarm Levels
var alarmLevels = [];
jQuery("input[name='alarmLevel']:checked").each(function() {
alarmLevels.push(this.value);
});

let messages = validateSearchParameters(searchConfigTemp);
// Collect the selected Statuses
var statuses = [];
jQuery("input[name='status']:checked").each(function() {
statuses.push(this.value);
});

if(messages.length > 0) {
showDwrMessages(messages);
} else {
doSearchOld();
}
// Retrieve date fields and keywords
var startDate = jQuery('#startDate').val();
var endDate = jQuery('#endDate').val();
var keywords = jQuery('#keywords').val();
var eventIdStr = jQuery('#eventId').val();
var eventId = eventIdStr ? parseInt(eventIdStr, 10) : 0;

jQuery('#searchBtn').prop('disabled', true);
jQuery('#searchMessage').text("Searching...");
Comment on lines +157 to +158
Copy link

@coderabbitai coderabbitai bot Jan 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Hardcoded string bypasses localization.

"Searching..." is hardcoded instead of using the existing <spring:message code="events.search.searching"/> key that's used in doSearchOld() and doSearch().

🌐 Proposed fix 
       jQuery('#searchBtn').prop('disabled', true);
-      jQuery('#searchMessage').text("Searching...");
+      $set("searchMessage", "<spring:message code='events.search.searching'/>");

Committable suggestion skipped: line range outside the PR's diff.

🤖 Prompt for AI Agents 
In @WebContent/WEB-INF/jsp/events.jsp around lines 157 - 158, The code sets
jQuery('#searchMessage').text("Searching...") with a hardcoded English string;
replace that literal with the localized message key used by doSearchOld() and
doSearch(), i.e. use the Spring message for events.search.searching instead of
the hardcoded "Searching..." so the UI respects localization (for example by
emitting the localized text into the JS from JSP via <spring:message
code="events.search.searching"/> and using that value in the
jQuery('#searchMessage').text(...) call).


// Call our new DWR method
EventsDwr.searchNew(
eventSourceTypes,
statuses,
alarmLevels,
startDate,
endDate,
keywords,
eventId,
function(response) {
jQuery('#searchBtn').prop('disabled', false);

if (response.hasMessages) {

jQuery('#searchMessage').text("Error or messages found");
}
else {
// Update the search results div
if (response.data && response.data.content) {
$set("searchResults", response.data.content);
}
// Show a result count
if (response.data && response.data.resultCount) {
jQuery('#searchMessage').text(response.data.resultCount);
}
else {
jQuery('#searchMessage').text("");
}
}
}
);
}

function createSearchConfigTemp(){
Expand Down Expand Up @@ -192,78 +248,177 @@
</div>
<div id="hourglass" style="padding:6px;text-align:center;"><tag:img png="hourglass"/></div>
</div>

<div class="borderDiv" style="clear:left;float:left;" id="eventSearchForm">
<div class="smallTitle titlePadding"><spring:message code="events.search"/></div>
<div>
<table>
<tr>
<td id="eventIdLabel" class="formLabel"><spring:message code="events.id"/></td>
<td class="formField"><input id="eventId" type="text"></td>
</tr>
<tr>
<td class="formLabel"><spring:message code="events.search.type"/></td>
<td class="formField">
<select id="eventSourceType">
<option value="-1"><spring:message code="common.all"/></option>
<option value="<c:out value="<%= EventType.EventSources.DATA_POINT %>"/>"><spring:message code="eventHandlers.pointEventDetector"/></option>
<option value="<c:out value="<%= EventType.EventSources.SCHEDULED %>"/>"><spring:message code="scheduledEvents.ses"/></option>
<option value="<c:out value="<%= EventType.EventSources.COMPOUND %>"/>"><spring:message code="compoundDetectors.compoundEventDetectors"/></option>
<option value="<c:out value="<%= EventType.EventSources.DATA_SOURCE %>"/>"><spring:message code="eventHandlers.dataSourceEvents"/></option>
<option value="<c:out value="<%= EventType.EventSources.PUBLISHER %>"/>"><spring:message code="eventHandlers.publisherEvents"/></option>
<option value="<c:out value="<%= EventType.EventSources.MAINTENANCE %>"/>"><spring:message code="eventHandlers.maintenanceEvents"/></option>
<option value="<c:out value="<%= EventType.EventSources.SYSTEM %>"/>"><spring:message code="eventHandlers.systemEvents"/></option>
<option value="<c:out value="<%= EventType.EventSources.AUDIT %>"/>"><spring:message code="eventHandlers.auditEvents"/></option>
</select>
</td>
</tr>
<tr>
<td class="formLabel"><spring:message code="common.status"/></td>
<td class="formField">
<select id="eventStatus">
<option value="<c:out value="<%= EventsDwr.STATUS_ALL %>"/>"><spring:message code="common.all"/></option>
<option value="<c:out value="<%= EventsDwr.STATUS_ACTIVE %>"/>"><spring:message code="common.active"/></option>
<option value="<c:out value="<%= EventsDwr.STATUS_RTN %>"/>"><spring:message code="event.rtn.rtn"/></option>
<option value="<c:out value="<%= EventsDwr.STATUS_NORTN %>"/>"><spring:message code="common.nortn"/></option>
<option value="<c:out value="<%= EventsDwr.STATUS_ASSIGNEE %>"/>"><spring:message code="common.assignee"/></option>
</select>
</td>
</tr>
<tr>
<td class="formLabel"><spring:message code="common.alarmLevel"/></td>
<td class="formField"><select id="alarmLevel"><tag:alarmLevelOptions allOption="true"/></select></td>
</tr>
<tr>
<td class="formLabel"><spring:message code="events.search.keywords"/></td>
<td class="formField"><input id="keywords" type="text"/></td>
</tr>

<!-- <tr> -->
<!-- <td> -->
<!-- <div id="datePickerDiv" style="position:relative; top:0px; left:0px;" onmouseover="cancelDatePickerExpiry()" onmouseout="expireDatePicker()"> -->
<%-- <div widgetId="datePicker" dojoType="datepicker" dayWidth="narrow" lang="${lang}"></div> --%>
<!-- </div> -->
<!-- </td> -->
<!-- </tr> -->

<tr>
<td id="maxResultsLabel" class="formLabel"><spring:message code="events.search.maxResults"/></td>
<td class="formField"><input id="maxResults" type="text" value="100"/></td>
</tr>


<tr>
<td colspan="2" align="center">
<input id="searchBtn" type="button" value="<spring:message code="events.search.search"/>" onclick="newSearch()"/>
<span id="searchMessage" class="formError"></span>
</td>
</tr>



</table>

<div class="borderDiv" style="clear:left; float:left;" id="eventSearchForm">
<h3><spring:message code="events.search"/></h3>

<!-- Keywords -->
<div style="display: flex; margin-bottom: 1em; align-items: center;">
<label for="keywords" style="display:inline-block; font-weight:bold;">
<spring:message code="events.search.keywords"/>:
</label>
<input type="text" id="keywords" name="keywords" style="flex: 1;"/>
</div>

<!-- Date range fields -->
<div style="margin-bottom: 1em; white-space: nowrap;">
<label for="startDate" style="display:inline-block; font-weight:bold;">
<spring:message code="events.search.startDate"/>:
</label>
<input type="text" id="startDate" name="startDate" class="datepicker" />
<!-- Calendar icon next to the field -->
<img
src="images/calendar.gif"
alt="Calendar"
style="cursor:pointer; vertical-align: middle;"
id="startDateIcon"
/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<label for="endDate" style="display:inline-block; font-weight:bold;">
<spring:message code="events.search.endDate"/>:
</label>
<input type="text" id="endDate" name="endDate" class="datepicker" />
<!-- Calendar icon next to the field -->
<img
src="images/calendar.gif"
alt="Calendar"
style="cursor:pointer; vertical-align: middle;"
id="endDateIcon"
/>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
<!-- eventID search -->
<label for="eventId" style="display:inline-block; font-weight:bold;">
<spring:message code="events.search.id"/>:
</label>
<input type="text" id="eventId" name="eventId" style="width:80px;"/>
</div>

<!-- Checkbox groups in 3 columns -->
<div style="display: flex; gap: 2rem;">

<!-- Column 1: Event source type -->
<div style="flex: none; white-space: nowrap;">
<strong><spring:message code="events.search.type"/>:</strong>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.DATA_POINT %>"/>">
<spring:message code="eventHandlers.pointEventDetector"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.SCHEDULED %>" />"/>
<spring:message code="scheduledEvents.ses"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.COMPOUND %>" />"/>
<spring:message code="compoundDetectors.compoundEventDetectors"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.DATA_SOURCE %>" />"/>
<spring:message code="eventHandlers.dataSourceEvents"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.PUBLISHER %>" />"/>
<spring:message code="eventHandlers.publisherEvents"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.MAINTENANCE %>" />"/>
<spring:message code="eventHandlers.maintenanceEvents"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.SYSTEM %>" />"/>
<spring:message code="eventHandlers.systemEvents"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="eventSourceType" value="<c:out value="<%= EventType.EventSources.AUDIT %>" />"/>
<spring:message code="eventHandlers.auditEvents"/>
</label>
</div>
</div>

<!-- Column 2: Alarm level -->
<div style="flex: none; white-space: nowrap;">
<strong><spring:message code="common.alarmLevel"/>:</strong>
<div>
<label>
<input type="checkbox" name="alarmLevel" value="0" />
<spring:message code="common.alarmLevel.none"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="alarmLevel" value="1" />
<spring:message code="common.alarmLevel.info"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="alarmLevel" value="2" />
<spring:message code="common.alarmLevel.urgent"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="alarmLevel" value="3" />
<spring:message code="common.alarmLevel.critical"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="alarmLevel" value="4" />
<spring:message code="common.alarmLevel.lifeSafety"/>
</label>
</div>
</div>

<!-- Column 3: Status -->
<div style="flex: none; white-space: nowrap;">
<strong><spring:message code="common.status"/>:</strong>
<div>
<label>
<input type="checkbox" name="status" value="<c:out value="<%= EventsDwr.STATUS_ACTIVE %>" />"/>
<spring:message code="common.active"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="status" value="<c:out value="<%= EventsDwr.STATUS_RTN %>" />"/>
<spring:message code="event.rtn.rtn"/>
</label>
</div>
<div>
<label>
<input type="checkbox" name="status" value="<c:out value="<%= EventsDwr.STATUS_NORTN %>" />"/>
<spring:message code="common.nortn"/>
</label>
</div>
</div>
</div><!-- end flex container -->

<!-- Search button -->
<div style="margin-top: 1em;">
<input id="searchBtn"
type="button"
value="<spring:message code='events.search.search'/>"
onclick="newSearch()"/>
<span id="searchMessage" class="formError"></span>
</div>
<div id="searchResults"></div>

<!-- Search results placeholder -->
<div id="searchResults" style="margin-top: 1em;"></div>
</div>

<tag:newPageNotification href="./app.shtm#/alarms/scada" ref="alarmListNotification"/>
Expand Down
1 change: 1 addition & 0 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,7 @@ test {
includeTestsMatching "org.scada_lts.web.mvc.api.validation.css.CssValidatorTestsSuite"
includeTestsMatching "org.scada_lts.web.beans.validation.xss.XssValidatorTestsSuite"
includeTestsMatching "org.scada_lts.utils.CyclicDependencyValidationUtilsTest"
includeTestsMatching "org.scada_lts.utils.QueryUtilsTest"
}

failFast = true
Expand Down
Loading