Skip to content

BITMAG-1175: jQuery update #50

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 12 commits into from
Nov 16, 2022
Merged

BITMAG-1175: jQuery update #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
254d89a
Clean js dashboard_components files
Bohlski Nov 11, 2022
d7dc9ca
Rename dataSizeGraph with PascalCase because class
Bohlski Nov 11, 2022
d93df74
Fix missing changes from last commit + some jq-migration
Bohlski Nov 14, 2022
9d6bd5b
jQuery migration to 3.6.1
Bohlski Nov 14, 2022
f68955c
Fix some html/js related warnings
Bohlski Nov 14, 2022
e1984d8
Make status update code less ugly/more sensible
Bohlski Nov 14, 2022
6fe8e1d
Make uniform code style changes to js
Bohlski Nov 14, 2022
b2de57b
Indent js with 4 spaces
Bohlski Nov 15, 2022
f64c1ed
Remove unused js file
Bohlski Nov 15, 2022
dbc88bb
Indent more js with 4 spaces
Bohlski Nov 15, 2022
a509289
Restructure webclient webapp folder
Bohlski Nov 15, 2022
f0f8d0b
Separate js and html into two files
Bohlski Nov 15, 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
16 changes: 0 additions & 16 deletions bitrepository-webclient/src/main/webapp/CollectionNameMapper.js
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions bitrepository-webclient/src/main/webapp/FileSizeUtils.js
View file
Open in desktop

This file was deleted.

151 changes: 10 additions & 141 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 @@ -23,8 +23,8 @@
<html lang="en">
<head>
<title>Bitrepository alarm service</title>
<link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="datepicker/css/datepicker.css" rel="stylesheet">
<link href="static/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
<link href="static/css/datepicker.css" rel="stylesheet">
<style>
.complete {
display: none;
Expand All @@ -41,7 +41,7 @@
<div class="container-fluid">
<div class="row-fluid">
<div class="span11">
<div class="span11" style="height:0px; min-height:0px"></div>
<div class="span11" style="height:0; min-height:0"></div>
<div class="span11">
<h2>Alarm service</h2>
</div>
Expand Down Expand Up @@ -126,144 +126,13 @@ <h2>Alarm service</h2>
</div>
</div>
</div>
<script src="jquery/jquery-1.9.0.min.js"></script>
<script src="bootstrap/js/bootstrap.min.js"></script>
<script src="datepicker/js/bootstrap-datepicker.js"></script>
<script src="menu.js"></script>
<script src="utils.js"></script>
<script src="CollectionNameMapper.js"></script>
<script src="static/js/jquery/jquery-3.6.1.min.js"></script>
<script src="static/bootstrap/js/bootstrap.min.js"></script>
<script src="static/js/bootstrap-datepicker.js"></script>
<script src="static/js/menu.js"></script>
<script src="static/js/utils.js"></script>
<script src="static/js/CollectionNameMapper.js"></script>
<script src="static/js/views/alarm-service.js"></script>

<script>
let nameMapper;
let descriptionExpandedMapper;
let autoGetAlarmsInterval;
let alarmServiceUrl;

function clearElement(element) {
$(element).val("");
}

function updateAlarms() {
let fromDateStr = $("#fromDate").val();
let toDateStr = $("#toDate").val();
let fileIDStr = $("#fileIDFilter").val();
let component = $("#componentFilter").val();
let alarmCodeStr = $("#alarmCodeFilter").val();
let maxAlarmStr = $("#maxAlarms").val();
let collectionIDStr = $("#collectionIDFilter").val();
let url = alarmServiceUrl + '/alarm/AlarmService/queryAlarms/';

getDescriptionExpandedState();

$.post(url,
{
fromDate: fromDateStr,
toDate: toDateStr,
fileID: fileIDStr,
reportingComponent: component,
alarmCode: alarmCodeStr,
maxAlarms: maxAlarmStr,
collectionID: collectionIDStr,
oldestAlarmFirst: false
}, function (json) {
let htmlTableBody = "";
if (json != null) {
for (let i = 0; i < json.length; i++) {
htmlTableBody += `<tr>
<td>${json[i].origDateTime}</td>
<td>${json[i].alarmRaiser}</td>
<td>${nameMapper.getName(json[i].collectionID)}</td>
<td>${json[i].fileID}</td>
<td>${json[i].alarmCode}</td>
<td class="description">${renderAlarmDescription(i, json[i].alarmText).prop('outerHTML')}</td>
</tr>`;
}
}
$("#alarms-table-body").html(htmlTableBody);
enableDescriptionExpansionOnClick();
});
}

function getDescriptionExpandedState() {
descriptionExpandedMapper = {};
$("#alarms-table-body tr").each(function (index) {
// Grab the
descriptionExpandedMapper[index] = $(this).find("td:eq(5)").find(".complete").css("display");
});
}

function renderAlarmDescription(index, alarmDescription) {
const maxLength = 80;
let descriptionHtml = $('<p class="teaser">').css("margin", 0);
let isExpandedDesc = descriptionExpandedMapper.hasOwnProperty(index) &&
descriptionExpandedMapper[index] !== "none";

if (alarmDescription.length <= maxLength || isExpandedDesc) {
let fullDescSpan = `<span class="complete" style="display: inline">${nl2br(alarmDescription)}</span>`
descriptionHtml.empty().html(fullDescSpan);
} else { // Alarm description is too long and is not expanded
let shortenedDesc = alarmDescription.substring(0, maxLength);
let remainingDesc = alarmDescription.substring(maxLength, alarmDescription.length);
descriptionHtml.empty().html(nl2br(shortenedDesc));
descriptionHtml.append(`<span class="dots">... </span>`)
descriptionHtml.append(`<span class="complete">${nl2br(remainingDesc)}</span>`);
descriptionHtml.append('<a href="javascript:void(0);" class="show-more">show more</a>');
}
return descriptionHtml;
}

function enableDescriptionExpansionOnClick() {
$(".teaser").each(function () {
$(this).children(".show-more").on("click", function () {
$(this).siblings(".complete").show();
$(this).siblings(".dots").remove();
$(this).remove();
});
});
}

function init() {
$.get('repo/urlservice/alarmService/', {}, function (url) {
alarmServiceUrl = url;
}, 'html').done(function () {
$.getJSON('repo/reposervice/getCollections/', {}, function (collections) {
nameMapper = new CollectionNameMapper(collections);
let cols = nameMapper.getCollectionIDs();
for (let i in cols) {
$("#collectionIDFilter").append(
`<option value="${cols[i]}">${nameMapper.getName(cols[i])}</option>`
);
}
updateAlarms();
autoGetAlarmsInterval = setInterval(function () {
updateAlarms();
}, 2500);
});
});
}

$(document).ready(function () {
makeMenu("alarm-service.html", "#pageMenu");
init();
$("#fromDate").datepicker({format: "yyyy/mm/dd"});
$("#toDate").datepicker({format: "yyyy/mm/dd"});
$("#toDateClearButton").click(function (event) {
event.preventDefault();
clearElement("#toDate")
});
$("#fromDateClearButton").click(function (event) {
event.preventDefault();
clearElement("#fromDate")
});
$("#fileIDClearButton").click(function (event) {
event.preventDefault();
clearElement("#fileIDFilter")
});
$("#componentIDClearButton").click(function (event) {
event.preventDefault();
clearElement("#componentFilter")
});
});
</script>
</body>
</html>
Loading