Skip to content

Hide Facility Status and Expiration #73

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
slominskir merged 5 commits into from
Aug 6, 2026
Merged

Hide Facility Status and Expiration #73

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
5bf26b0
Hide Facility Status and Expiration
slominskir Aug 5, 2026
6b32b11
Option B
slominskir Aug 5, 2026
5da65fb
Option B
slominskir Aug 5, 2026
bf07f36
Option B
slominskir Aug 6, 2026
92bf6ac
formatting
slominskir Aug 6, 2026
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
3 changes: 3 additions & 0 deletions src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ public int compare(FacilityControlVerification o1, FacilityControlVerification o
}
});

Collections.sort(cc.getBeamControlVerificationList());
Collections.sort(cc.getRFControlVerificationList());

if (facility != null) {
for (FacilityControlVerification facilityControlVerification :
new ArrayList<>(cc.getFacilityControlVerificationList())) {
Expand Down
25 changes: 0 additions & 25 deletions src/main/webapp/WEB-INF/views/control-verification.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,31 +89,6 @@
<c:choose>
<c:when test="${creditedControl ne null}">
<div>
<h3>Facility Verifications</h3>
<ul id="facility-control-verification-list">
<c:forEach items="${creditedControl.facilityControlVerificationList}" var="fv">
<li>
<c:choose>
<c:when test="${fv.verificationStatusId eq 1}">
<span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
</c:when>
<c:when test="${fv.verificationStatusId eq 50}">
<span title="Verified" class="small-icon baseline-small-icon provisional-icon"></span>
</c:when>
<c:otherwise>
<span title="Not Verified" class="small-icon baseline-small-icon not-verified-icon"></span>
</c:otherwise>
</c:choose>
<c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/>
<c:if test="${fv.verificationStatusId ne 100}">
<span class="title-expiration" title="Earliest Control Expiration">
{Expires: <fmt:formatDate value="${fv.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>}
</span>
<span class="expiring-soon" style="<c:out value="${jam:isExpiringSoon(fv.expirationDate) ? 'display: inline-block;' : 'display: none;'}"/>">(Expiring Soon)</span>
</c:if>
</li>
</c:forEach>
</ul>
<h3>Operations Verifications</h3>
<div class="accordion">
<h3>RF Operations</h3>
Expand Down
93 changes: 57 additions & 36 deletions src/main/webapp/WEB-INF/views/verifications.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
<table id="credited-control-verifications-table" class="data-table">
<thead>
<tr>
<th colspan="3">Facility Control Status with Expiration</th>
<th colspan="2">Facility Control Status</th>
</tr>
</thead>
<tbody>
Expand All @@ -78,44 +78,65 @@
<td>
<ul>
<c:forEach items="${cc.facilityControlVerificationList}" var="fv">
<li>
<c:choose>
<c:when test="${fv.verificationStatusId eq 1}">
<span title="Verified"
class="small-icon baseline-small-icon verified-icon"></span>
</c:when>
<c:when test="${fv.verificationStatusId eq 50}">
<span title="Verified"
class="small-icon baseline-small-icon provisional-icon"></span>
</c:when>
<c:otherwise>
<span title="Not Verified"
class="small-icon baseline-small-icon not-verified-icon"></span>
</c:otherwise>
</c:choose>
<c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/>
<c:if test="${fv.verificationStatusId ne 100}">
<span title="Earliest Control Expiration">
<fmt:formatDate value="${fv.expirationDate}"
pattern="${s:getFriendlyDateTimePattern()}"/>
</span>
<span class="expiring-soon"
style="<c:out value="${jam:isExpiringSoon(fv.expirationDate) ? 'display: inline-block;' : 'display: none;'}"/>">(Expiring Soon)</span>
</c:if>
</li>
<div class="collapsed-accordion">
<h3><c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/></h3>
<div class="content">
<table class="data-table facility-verification-table">
<thead>
<tr>
<th>RF Segments</th>
<th>Beam Destinations</th>
<th></th>
</tr>
</thead>
<tbody>
<tr>
<td>
<c:choose>
<c:when test="${fn:length(cc.getRFControlVerificationList()) < 1}">
None
</c:when>
<c:otherwise>
<ul>
<c:forEach items="${cc.getRFControlVerificationList()}" var="verification">
<li><div title="${verification.verificationStatusId eq 1 ? 'Verified' : (verification.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationStatusId eq 1 ? 'verified-icon' : (verification.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></div> <span class="truncated-operations-label"><c:out value="${verification.RFSegment.name}"/></span></li>
</c:forEach>
</ul>
</c:otherwise>
</c:choose>
</td>
<td>
<c:choose>
<c:when test="${fn:length(cc.getBeamControlVerificationList()) < 1}">
None
</c:when>
<c:otherwise>
<ul>
<c:forEach items="${cc.getBeamControlVerificationList()}" var="verification">
<li><div title="${verification.verificationStatusId eq 1 ? 'Verified' : (verification.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationStatusId eq 1 ? 'verified-icon' : (verification.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></div> <span class="truncated-operations-label"><c:out value="${verification.beamDestination.name}"/></span></li>
</c:forEach>
</ul>
</c:otherwise>
</c:choose>
</td>
<td>
<form method="get"
action="${pageContext.request.contextPath}/verifications/control">
<input type="hidden" name="creditedControlId"
value="${cc.creditedControlId}"/>
<input type="hidden" name="facilityId"
value="${fn:escapeXml(fv.getFacilityControlVerificationPK().facility.facilityId)}"/>
<button class="single-char-button" type="submit">&rarr;</button>
</form>
</td>
</tr>
</tbody>
</table>
</div>
</div>
</c:forEach>
</ul>
</td>
<td>
<form method="get"
action="${pageContext.request.contextPath}/verifications/control">
<input type="hidden" name="creditedControlId"
value="${cc.creditedControlId}"/>
<input type="hidden" name="facilityId"
value="${fn:escapeXml(param.facilityId)}"/>
<button class="single-char-button" type="submit">&rarr;</button>
</form>
</td>
</tr>
</c:forEach>
</tbody>
Expand Down
20 changes: 20 additions & 0 deletions src/main/webapp/resources/css/jam.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,24 @@ ul.jam-cell-list li {
}
.page-dialog .dialog-only-inline-block {
display: inline-block;
}
.facility-verification-table ul {
margin: 0;
padding: 0;
}
.facility-verification-table ul li {
list-style: none;
}
.collapsed-accordion {
display: none;
}
.collapsed-accordion .content {
padding: 5px;
}
.truncated-operations-label {
display: inline-block;
width: 175px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
5 changes: 5 additions & 0 deletions src/main/webapp/resources/js/verifications.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ $( ".accordion" ).accordion({
heightStyle: "content",
active: 0
});
$( ".collapsed-accordion" ).accordion({
collapsible: true,
heightStyle: "content",
active: false
}).show();
$(function() {
$("#expiring-dialog").dialog({
width: 900,
Expand Down
Loading