Skip to content

Bitmag 895 - FileID on AlarmService WebGUI Page #40

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

Merged
Bohlski merged 5 commits into from
Aug 31, 2022
Merged

Bitmag 895 - FileID on AlarmService WebGUI Page #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
81dc9ee
First commit adding File ID as a column in the Alarm Service WebGUI. …
m-atlantis Jun 16, 2022
2de739f
Should now show FileID in Alarms column.
m-atlantis Jun 20, 2022
7a204d4
Merge remote-tracking branch 'origin/master' into BITMAG-895
m-atlantis Aug 26, 2022
55ce0c5
Fixed an issue with the 'show more' alarm-service functionality.
m-atlantis Aug 29, 2022
25b014e
Removed a forgotten previously used line that had been commented out.
m-atlantis Aug 30, 2022
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
2 changes: 1 addition & 1 deletion bitrepository-alarm-service/src/main/java/org/bitrepository/alarm/alarmservice/WebAlarm.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public class WebAlarm {

public WebAlarm(Alarm alarm) {
collectionID = alarm.getCollectionID() == null ? "" : alarm.getCollectionID();
fileID = alarm.getFileID() == null ? "" : alarm.getFileID();
fileID = (alarm.getFileID() == null) ? "" : alarm.getFileID();
origDateTime = TimeUtils.shortDate(CalendarUtils.convertFromXMLGregorianCalendar(alarm.getOrigDateTime()));
alarmRaiser = alarm.getAlarmRaiser();
alarmCode = alarm.getAlarmCode();
Expand Down
13 changes: 9 additions & 4 deletions bitrepository-webclient/src/main/webapp/alarm-service.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
.complete {
display: none;
}

.description {
width: 50%;
}
Expand Down Expand Up @@ -112,6 +113,7 @@
<th>Date</th>
<th>Component</th>
<th>Collection</th>
<th>FileID</th>
<th>Alarm code</th>
<th>Description</th>
</tr>
Expand Down Expand Up @@ -169,6 +171,7 @@
<td>${j[i].origDateTime}</td>
<td>${j[i].alarmRaiser}</td>
<td>${nameMapper.getName(j[i].collectionID)}</td>
<td>${j[i].fileID}</td>
<td>${j[i].alarmCode}</td>
<td class="description"><p class="teaser">${nl2br(j[i].alarmText)}</p></td>
</tr>`;
Expand Down Expand Up @@ -204,9 +207,11 @@
const maxLength = 80;
$(".teaser").each(function () {
let index = $(this).closest("tr").find("td:eq(0)").text() + $(this).text();
if (!descriptionMapper.hasOwnProperty(index) || descriptionMapper[index] === "none") {
let string = $(this).html();
let string = $(this).html();

if (descriptionMapper.hasOwnProperty(index) && descriptionMapper[index] !== "none") {
$(this).empty().html(`<span class="complete" style="display: inline">${string}</span>`);
} else {
if (string.length > maxLength) {
let newString = string.substring(0, maxLength);
let removedString = string.substring(maxLength, string.length);
Expand All @@ -232,8 +237,8 @@
function getDescriptionState() {
descriptionMapper = {};
$("#alarms-table-body tr").each(function () {
let identifier = $(this).find("td:eq(0)").text() + $(this).find("td:eq(4)").text();
descriptionMapper[identifier] = $(this).find("td:eq(4)").find(".complete").css("display");
let identifier = $(this).find("td:eq(0)").text() + $(this).find("td:eq(5)").text();
descriptionMapper[identifier] = $(this).find("td:eq(5)").find(".complete").css("display");
});
}

Expand Down