From 5bf26b0a1def524c9eee17e33444af736b7612ac Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 5 Aug 2026 15:56:06 -0400 Subject: [PATCH 1/5] Hide Facility Status and Expiration Fixes #72 --- .../WEB-INF/views/control-verification.jsp | 25 ------------------- .../webapp/WEB-INF/views/verifications.jsp | 24 +----------------- 2 files changed, 1 insertion(+), 48 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/control-verification.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp index a7f2c9d..5b61654 100644 --- a/src/main/webapp/WEB-INF/views/control-verification.jsp +++ b/src/main/webapp/WEB-INF/views/control-verification.jsp @@ -89,31 +89,6 @@
-

Facility Verifications

-
    - -
  • - - - - - - - - - - - - - - - {Expires: } - - ">(Expiring Soon) - -
    • -     -

Operations Verifications

RF Operations

diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp index d16ef30..e9ef51c 100644 --- a/src/main/webapp/WEB-INF/views/verifications.jsp +++ b/src/main/webapp/WEB-INF/views/verifications.jsp @@ -68,7 +68,7 @@ - + @@ -79,29 +79,7 @@
  • - - - - - - - - - - - - - - - - ">(Expiring Soon) -
From 6b32b11bcd6d78809da327e23821d71d4f98a6ad Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 5 Aug 2026 16:40:14 -0400 Subject: [PATCH 2/5] Option B --- .../WEB-INF/views/control-verification-b.jsp | 156 ++++++++++++++++++ 1 file changed, 156 insertions(+) create mode 100644 src/main/webapp/WEB-INF/views/control-verification-b.jsp diff --git a/src/main/webapp/WEB-INF/views/control-verification-b.jsp b/src/main/webapp/WEB-INF/views/control-verification-b.jsp new file mode 100644 index 0000000..af0e3de --- /dev/null +++ b/src/main/webapp/WEB-INF/views/control-verification-b.jsp @@ -0,0 +1,156 @@ +<%@page contentType="text/html" pageEncoding="UTF-8"%> +<%@taglib prefix="c" uri="jakarta.tags.core"%> +<%@taglib prefix="fn" uri="jakarta.tags.functions"%> +<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> +<%@taglib prefix="s" uri="jlab.tags.smoothness" %> +<%@taglib prefix="jam" uri="jlab.tags.jam"%> +<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> + + + + + + + + + + +
+
+
    +
  • + +
    +
    +
    + Filter +
      +
    • +
      + +
      +
      + +
      +
      • +
    • +
      + +
      +
      + +
      +
      • +
    +
    +
    + + + +     +
    • +
  • + Verifications +
    • +
+
+ +
+ Info + | + + + + Open in new tab +
+ +

+
+ + +
+

Operations Verifications

+
+

RF Operations

+
+ + + None + + + + + +
+
+
+

Beam Operations

+
+ + + None + + + + + +
+
+

Facility Verifications

+ +

+
+

RF Operations

+
+ + + None + + + +
+ + + +
+
+
+

Beam Operations

+
+
    + +
    • +     +
+
+
+ +
+ + + Choose a Credited Control to continue + + +
+ + From 5da65fb287b79ac1c3fe8f0d4be74600f7ddf3d3 Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Wed, 5 Aug 2026 16:58:50 -0400 Subject: [PATCH 3/5] Option B --- .../WEB-INF/views/control-verification-b.jsp | 64 ++++++++++++------- src/main/webapp/resources/css/jam.css | 7 ++ 2 files changed, 49 insertions(+), 22 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/control-verification-b.jsp b/src/main/webapp/WEB-INF/views/control-verification-b.jsp index af0e3de..73764c7 100644 --- a/src/main/webapp/WEB-INF/views/control-verification-b.jsp +++ b/src/main/webapp/WEB-INF/views/control-verification-b.jsp @@ -118,30 +118,50 @@

Facility Verifications

-

-

RF Operations

+

- - - None - - - -
- - - -
-
-
-

Beam Operations

-
-
    - -
    • -     -
+
Facility Control Status with ExpirationFacility Control Status
+ + + + + + + + + + + + +
RF SegmentsBeam Destinations
+ + + None + + +
    + +
    • +     +
+ + + 		+ + + None + + +
    + +
    • +     +
+ + +
+
diff --git a/src/main/webapp/resources/css/jam.css b/src/main/webapp/resources/css/jam.css index addf632..ad7718d 100644 --- a/src/main/webapp/resources/css/jam.css +++ b/src/main/webapp/resources/css/jam.css @@ -91,4 +91,11 @@ 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; } \ No newline at end of file From bf07f36874746721855404d220624d7258001b5b Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Thu, 6 Aug 2026 15:33:09 -0400 Subject: [PATCH 4/5] Option B --- .../session/CreditedControlFacade.java | 3 + .../WEB-INF/views/control-verification-b.jsp | 176 ------------------ .../webapp/WEB-INF/views/verifications.jsp | 71 +++++-- src/main/webapp/resources/css/jam.css | 3 + src/main/webapp/resources/js/verifications.js | 5 + 5 files changed, 68 insertions(+), 190 deletions(-) delete mode 100644 src/main/webapp/WEB-INF/views/control-verification-b.jsp diff --git a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java index a70511f..138d6a1 100644 --- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java +++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java @@ -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())) { diff --git a/src/main/webapp/WEB-INF/views/control-verification-b.jsp b/src/main/webapp/WEB-INF/views/control-verification-b.jsp deleted file mode 100644 index 73764c7..0000000 --- a/src/main/webapp/WEB-INF/views/control-verification-b.jsp +++ /dev/null @@ -1,176 +0,0 @@ -<%@page contentType="text/html" pageEncoding="UTF-8"%> -<%@taglib prefix="c" uri="jakarta.tags.core"%> -<%@taglib prefix="fn" uri="jakarta.tags.functions"%> -<%@taglib prefix="fmt" uri="jakarta.tags.fmt"%> -<%@taglib prefix="s" uri="jlab.tags.smoothness" %> -<%@taglib prefix="jam" uri="jlab.tags.jam"%> -<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> - - - - - - - - - - -
-
-
    -
  • - -
    -
    -
    - Filter -
      -
    • -
      - -
      -
      - -
      -
      • -
    • -
      - -
      -
      - -
      -
      • -
    -
    -
    - - -
    -     -
    • -
  • - Verifications -
    • -
-
- -
- Info - | - - - - Open in new tab -
- -

-
- - -
-

Operations Verifications

-
-

RF Operations

-
- - - None - - - - - -
-
-
-

Beam Operations

-
- - - None - - - - - -
-
-

Facility Verifications

- -
-

-
- - - - - - - - - - - - - -
RF SegmentsBeam Destinations
- - - None - - -
    - -
    • -     -
- - - 		- - - None - - -
    - -
    • -     -
- - -
- -
-
- -
- - - Choose a Credited Control to continue - - -
- - diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp index e9ef51c..e8a4ced 100644 --- a/src/main/webapp/WEB-INF/views/verifications.jsp +++ b/src/main/webapp/WEB-INF/views/verifications.jsp @@ -68,7 +68,7 @@ - + @@ -78,22 +78,65 @@ - diff --git a/src/main/webapp/resources/css/jam.css b/src/main/webapp/resources/css/jam.css index ad7718d..543ed82 100644 --- a/src/main/webapp/resources/css/jam.css +++ b/src/main/webapp/resources/css/jam.css @@ -98,4 +98,7 @@ ul.jam-cell-list li { } .facility-verification-table ul li { list-style: none; +} +.collapsed-accordion { + display: none; } \ No newline at end of file diff --git a/src/main/webapp/resources/js/verifications.js b/src/main/webapp/resources/js/verifications.js index 166fc0c..f87d53a 100644 --- a/src/main/webapp/resources/js/verifications.js +++ b/src/main/webapp/resources/js/verifications.js @@ -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, From 92bf6acb702d34a5d9cb39c9227cc5f2efd1ff6a Mon Sep 17 00:00:00 2001 From: Ryan Slominski Date: Thu, 6 Aug 2026 15:47:31 -0400 Subject: [PATCH 5/5] formatting --- src/main/webapp/WEB-INF/views/verifications.jsp | 4 ++-- src/main/webapp/resources/css/jam.css | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp index e8a4ced..6e32311 100644 --- a/src/main/webapp/WEB-INF/views/verifications.jsp +++ b/src/main/webapp/WEB-INF/views/verifications.jsp @@ -99,7 +99,7 @@
    -
    • +
@@ -113,7 +113,7 @@
    -
    • +
diff --git a/src/main/webapp/resources/css/jam.css b/src/main/webapp/resources/css/jam.css index 543ed82..97dbe78 100644 --- a/src/main/webapp/resources/css/jam.css +++ b/src/main/webapp/resources/css/jam.css @@ -101,4 +101,14 @@ ul.jam-cell-list li { } .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; } \ No newline at end of file
Facility Control StatusFacility Control Status
    -
  • - -
    • +
    +

    +
    + + + + + + + + + + + + + + + +
    RF SegmentsBeam Destinations
    + + + None + + +
      + +
      • +       +
    +     +     +     		+ + + None + + +
      + +
      • +       +
    +     +     +     		+
    + + + +
    +
    +
    +
-
- - - -
-