From 554190a72b5a3223b1d957e9834ecb884a0a49ea Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 13:12:00 -0500
Subject: [PATCH 01/44] Separate Facilities Fixes #1 Separate RF Operations
 Fixes #15

---
 container/oracle/initdb.d/02_ddl.sql          |  82 ++++++++----
 container/oracle/initdb.d/03_default_data.sql |  43 +++++--
 .../session/BeamDestinationFacade.java        |  37 +++++-
 .../jam/business/session/FacilityFacade.java  |  60 +++++++++
 .../persistence/entity/BeamDestination.java   |  24 ++--
 .../jlab/jam/persistence/entity/Facility.java | 117 ++++++++++++++++++
 .../controller/ContextRootController.java     |  32 +++++
 ...ssions.java => FacilityAuthorization.java} |  45 ++++---
 .../presentation/util/BeamAuthFunctions.java  |   6 +-
 .../WEB-INF/tags/authorization-page.tag       |  37 ++++++
 .../tags/destination-permissions-table.tag    |   7 +-
 src/main/webapp/WEB-INF/tags/page.tag         |   2 +-
 .../webapp/WEB-INF/tags/permissions-page.tag  |  22 ++--
 ...issions.jsp => facility-authorization.jsp} |   6 +-
 src/main/webapp/WEB-INF/web.xml               |   3 -
 15 files changed, 431 insertions(+), 92 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/business/session/FacilityFacade.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/Facility.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java
 rename src/main/java/org/jlab/jam/presentation/controller/{BeamPermissions.java => FacilityAuthorization.java} (86%)
 create mode 100644 src/main/webapp/WEB-INF/tags/authorization-page.tag
 rename src/main/webapp/WEB-INF/views/{permissions.jsp => facility-authorization.jsp} (83%)

diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index 9661a82..5ab6c89 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -47,20 +47,60 @@ CREATE SEQUENCE JAM_OWNER.WORKGROUP_ID
     NOCACHE
     ORDER;
 
+CREATE TABLE JAM_OWNER.WORKGROUP
+(
+    WORKGROUP_ID     INTEGER NOT NULL ,
+    NAME             VARCHAR2(64 CHAR) NOT NULL ,
+    LEADER_ROLE_NAME VARCHAR2(64 CHAR) NOT NULL ,
+    CONSTRAINT WORKGROUP_PK PRIMARY KEY (WORKGROUP_ID)
+);
+
+CREATE TABLE JAM_OWNER.FACILITY
+(
+    FACILITY_ID       INTEGER NOT NULL,
+    NAME              VARCHAR2(64 CHAR) NOT NULL,
+    PATH              VARCHAR2(32 CHAR) NOT NULL,
+    RF_WORKGROUP_ID   INTEGER NOT NULL,
+    BEAM_WORKGROUP_ID INTEGER NOT NULL,
+    WEIGHT            INTEGER NOT NULL,
+    CONSTRAINT FACILITY_PK PRIMARY KEY (FACILITY_ID),
+    CONSTRAINT FACILITY_AK1 UNIQUE (NAME),
+    CONSTRAINT FACILITY_FK1 FOREIGN KEY (RF_WORKGROUP_ID) REFERENCES JAM_OWNER.WORKGROUP (WORKGROUP_ID),
+    CONSTRAINT FACILITY_FK2 FOREIGN KEY (BEAM_WORKGROUP_ID) REFERENCES JAM_OWNER.WORKGROUP (WORKGROUP_ID)
+);
+
+CREATE TABLE JAM_OWNER.RF_OPERATION
+(
+    RF_OPERATION_ID INTEGER NOT NULL,
+    NAME            VARCHAR2(64 CHAR) NOT NULL,
+    FACILITY_ID     INTEGER NOT NULL,
+    ACTIVE_YN       CHAR(1 BYTE) DEFAULT 'Y' NOT NULL,
+    WEIGHT          INTEGER NOT NULL,
+    CONSTRAINT RF_OPERATION_PK PRIMARY KEY (RF_OPERATION_ID),
+    CONSTRAINT RF_OPERATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
+);
+
+-- Should be renamed BEAM_OPERATION
 CREATE TABLE JAM_OWNER.BEAM_DESTINATION
 (
-    BEAM_DESTINATION_ID  INTEGER NOT NULL ,
-    NAME                 VARCHAR2(64 CHAR) NOT NULL ,
-    MACHINE              VARCHAR2(32 CHAR) DEFAULT  'CEBAF'  NOT NULL ,
-    CURRENT_LIMIT_UNITS  VARCHAR2(3 CHAR) DEFAULT  'uA'  NOT NULL ,
-    ACTIVE_YN            CHAR(1 BYTE) DEFAULT  'Y'  NOT NULL CONSTRAINT BEAM_DESTINATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N')),
+    BEAM_DESTINATION_ID  INTEGER NOT NULL,
+    --OPERATION_TYPE       VARCHAR2(4 CHAR) DEFAULT 'BEAM' NOT NULL,
+    NAME                 VARCHAR2(64 CHAR) NOT NULL,
+    FACILITY_ID          INTEGER NOT NULL,
+    CURRENT_LIMIT_UNITS  VARCHAR2(3 CHAR) DEFAULT  'uA'  NOT NULL,
+    ACTIVE_YN            CHAR(1 BYTE) DEFAULT  'Y'  NOT NULL,
     WEIGHT               INTEGER NOT NULL,
-    CONSTRAINT BEAM_DESTINATION_PK PRIMARY KEY (BEAM_DESTINATION_ID)
+    CONSTRAINT BEAM_DESTINATION_PK PRIMARY KEY (BEAM_DESTINATION_ID),
+    CONSTRAINT BEAM_DESTINATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
+    CONSTRAINT BEAM_DESTINATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
+    --CONSTRAINT BEAM_DESTINATION_CK2 CHECK (OPERATION_TYPE IN ('BEAM', 'RF'))
 );
 
+-- Rename BEAM_AUTHORIZATION
 CREATE TABLE JAM_OWNER.AUTHORIZATION
 (
     AUTHORIZATION_ID     INTEGER NOT NULL ,
+    --OPERATION_TYPE       VARCHAR2(4 CHAR) DEFAULT 'BEAM' NOT NULL,
     MODIFIED_DATE        DATE NOT NULL ,
     MODIFIED_BY          VARCHAR2(64 CHAR) NOT NULL ,
     AUTHORIZATION_DATE   DATE NOT NULL ,
@@ -69,6 +109,7 @@ CREATE TABLE JAM_OWNER.AUTHORIZATION
     CONSTRAINT AUTHORIZATION_PK PRIMARY KEY (AUTHORIZATION_ID)
 );
 
+-- Rename BEAM_OPERATION_AUTHORIZATION
 CREATE TABLE JAM_OWNER.DESTINATION_AUTHORIZATION
 (
     BEAM_DESTINATION_ID  INTEGER NOT NULL ,
@@ -82,27 +123,20 @@ CREATE TABLE JAM_OWNER.DESTINATION_AUTHORIZATION
     CONSTRAINT DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (AUTHORIZATION_ID) REFERENCES JAM_OWNER.AUTHORIZATION (AUTHORIZATION_ID)
 );
 
-CREATE TABLE JAM_OWNER.WORKGROUP
-(
-    WORKGROUP_ID     INTEGER NOT NULL ,
-    NAME             VARCHAR2(64 CHAR) NOT NULL ,
-    LEADER_ROLE_NAME VARCHAR2(64 CHAR) NOT NULL ,
-    CONSTRAINT WORKGROUP_PK PRIMARY KEY (WORKGROUP_ID)
-);
-
 CREATE TABLE JAM_OWNER.CREDITED_CONTROL
 (
-    CREDITED_CONTROL_ID  INTEGER NOT NULL ,
-    NAME                 VARCHAR2(128 CHAR) NOT NULL ,
-    DESCRIPTION          VARCHAR2(2048 CHAR) NULL ,
-    WORKGROUP_ID         INTEGER NOT NULL ,
-    WEIGHT               INTEGER NULL ,
-    VERIFICATION_FREQUENCY VARCHAR2(128 CHAR) NULL ,
-    COMMENTS             VARCHAR2(2048) NULL ,
+    CREDITED_CONTROL_ID    INTEGER NOT NULL,
+    NAME                   VARCHAR2(128 CHAR) NOT NULL,
+    DESCRIPTION            VARCHAR2(2048 CHAR) NULL,
+    WORKGROUP_ID           INTEGER NOT NULL,
+    WEIGHT                 INTEGER NULL,
+    VERIFICATION_FREQUENCY VARCHAR2(128 CHAR) NULL,
+    COMMENTS               VARCHAR2(2048) NULL,
     CONSTRAINT CREDITED_CONTROL_PK PRIMARY KEY (CREDITED_CONTROL_ID),
     CONSTRAINT CREDITED_CONTROL_FK1 FOREIGN KEY (WORKGROUP_ID) REFERENCES JAM_OWNER.WORKGROUP(WORKGROUP_ID)
 );
 
+-- Should be renamed VERIFICATION_STATUS
 CREATE TABLE JAM_OWNER.VERIFICATION
 (
     VERIFICATION_ID      INTEGER NOT NULL ,
@@ -110,11 +144,12 @@ CREATE TABLE JAM_OWNER.VERIFICATION
     CONSTRAINT VERIFICATION_PK PRIMARY KEY (VERIFICATION_ID)
 );
 
+-- RENAME BEAM_CONTROL_VERIFICATION
 CREATE TABLE JAM_OWNER.CONTROL_VERIFICATION
 (
-    CONTROL_VERIFICATION_ID INTEGER NOT NULL ,
+    CONTROL_VERIFICATION_ID INTEGER NOT NULL , -- RENAME BEAM_CONTROL_VERIFICATION_ID
     CREDITED_CONTROL_ID  INTEGER NULL ,
-    BEAM_DESTINATION_ID  INTEGER NOT NULL ,
+    BEAM_DESTINATION_ID  INTEGER NOT NULL , -- rename BEAM_OPERATION_ID
     VERIFICATION_ID      INTEGER NOT NULL,
     VERIFICATION_DATE    DATE NULL ,
     VERIFIED_BY          VARCHAR(64 CHAR) NULL ,
@@ -129,6 +164,7 @@ CREATE TABLE JAM_OWNER.CONTROL_VERIFICATION
     CONSTRAINT CONTROL_VERIFICATION_FK3 FOREIGN KEY (VERIFICATION_ID) REFERENCES JAM_OWNER.VERIFICATION (VERIFICATION_ID) ON DELETE SET NULL
 );
 
+-- RENAME BEAM_VERIFICATION_HISTORY
 CREATE TABLE JAM_OWNER.VERIFICATION_HISTORY
 (
     VERIFICATION_HISTORY_ID INTEGER NOT NULL ,
diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index 0c6a75c..67b1b3d 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -6,9 +6,26 @@ insert into JAM_OWNER.VERIFICATION (VERIFICATION_ID, NAME) values (50, 'Provisio
 insert into JAM_OWNER.VERIFICATION (VERIFICATION_ID, NAME) values (100, 'Not Verified');
 
 -- Populate Workgroup
-insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (JAM_OWNER.WORKGROUP_ID.nextval, 'Group 1', 'group1Leaders');
-insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (JAM_OWNER.WORKGROUP_ID.nextval, 'Group 2', 'group2Leaders');
-insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (JAM_OWNER.WORKGROUP_ID.nextval, 'Group 3', 'group3Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (1, 'Group 1', 'group1Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (2, 'Group 2', 'group2Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (3, 'Group 3', 'group3Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (4, 'Group 4', 'group4Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (5, 'Group 5', 'group5Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (6, 'Group 6', 'group6Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (7, 'Group 7', 'group7Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (8, 'Group 8', 'group8Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (9, 'Group 9', 'group9Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (10, 'Group 10', 'group10Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (11, 'Group 11', 'group11Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (12, 'Group 12', 'group12Leaders');
+insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (13, 'Group 13', 'group13Leaders');
+
+-- Populate Facilities
+insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (1, 'CEBAF', '/cebaf', 4, 5, 1);
+insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (2, 'LERF', '/lerf', 6, 7, 2);
+insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (3, 'UITF', '/uitf', 8, 9, 3);
+insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (4, 'CMTF', '/cmtf', 10, 11, 4);
+insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (5, 'VTA', '/vta', 12, 13, 5);
 
 -- Populate Credited Controls
 insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 1','Control 1 Description',1,1,'1 Year');
@@ -19,16 +36,16 @@ insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WOR
 insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 6','Control 6 Description',1,6,'1 Year');
 
 -- Populate Beam Destinations
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 1', 'CEBAF', 'uA', 'Y', 1);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 2', 'CEBAF', 'uA', 'Y', 2);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 3', 'CEBAF', 'uA', 'Y', 3);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 4', 'LERF', 'uA', 'Y', 4);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 5', 'LERF', 'uA', 'Y', 5);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 6', 'LERF', 'uA', 'Y', 6);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 7', 'UITF', 'uA', 'Y', 7);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 8', 'UITF', 'uA', 'Y', 8);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 9', 'UITF', 'uA', 'Y', 9);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Injector RF Operations', 'CEBAF', 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 1', 1, 'uA', 'Y', 1);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 2', 1, 'uA', 'Y', 2);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 3', 1, 'uA', 'Y', 3);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 4', 2, 'uA', 'Y', 4);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 5', 2, 'uA', 'Y', 5);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 6', 2, 'uA', 'Y', 6);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 7', 3, 'uA', 'Y', 7);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 8', 3, 'uA', 'Y', 8);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 9', 3, 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Injector RF Operations', 1, 'uA', 'Y', 9);
 
 -- Populate Initial Control Verification
 insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 1, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
index 96f4a87..a994f6d 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
@@ -1,6 +1,7 @@
 package org.jlab.jam.business.session;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
@@ -10,8 +11,10 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
+import javax.persistence.criteria.*;
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.ControlVerification;
+import org.jlab.jam.persistence.entity.Facility;
 
 /**
  * @author ryans
@@ -46,7 +49,7 @@ public List<BeamDestination> findActiveDestinations() {
   public List<BeamDestination> findCebafDestinations() {
     Query q =
         em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where machine = 'CEBAF' and ACTIVE_YN = 'Y' order by weight",
+            "select * from JAM_OWNER.beam_destination where FACILITY_ID = 1 and ACTIVE_YN = 'Y' order by weight",
             BeamDestination.class);
 
     return q.getResultList();
@@ -57,7 +60,7 @@ public List<BeamDestination> findCebafDestinations() {
   public List<BeamDestination> findLerfDestinations() {
     Query q =
         em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where machine = 'LERF'  and ACTIVE_YN = 'Y' order by weight",
+            "select * from JAM_OWNER.beam_destination where facility_id = 2 and ACTIVE_YN = 'Y' order by weight",
             BeamDestination.class);
 
     return q.getResultList();
@@ -68,7 +71,7 @@ public List<BeamDestination> findLerfDestinations() {
   public List<BeamDestination> findUitfDestinations() {
     Query q =
         em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where machine = 'UITF'  and ACTIVE_YN = 'Y' order by weight",
+            "select * from JAM_OWNER.beam_destination where facility_id = 3 and ACTIVE_YN = 'Y' order by weight",
             BeamDestination.class);
 
     return q.getResultList();
@@ -107,4 +110,32 @@ public int compare(ControlVerification o1, ControlVerification o2) {
 
     return destination;
   }
+
+  @PermitAll
+  public List<BeamDestination> findByFacility(Facility facility) {
+    CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
+    CriteriaQuery<BeamDestination> cq = cb.createQuery(BeamDestination.class);
+    Root<BeamDestination> root = cq.from(BeamDestination.class);
+
+    List<Predicate> filters = new ArrayList<>();
+
+    filters.add(cb.equal(root.get("facility"), facility));
+
+    filters.add(cb.equal(root.get("active"), true));
+
+    if (!filters.isEmpty()) {
+      cq.where(cb.and(filters.toArray(new Predicate[] {})));
+    }
+
+    List<Order> orders = new ArrayList<>();
+    Path p0 = root.get("weight");
+    Order o0 = cb.desc(p0);
+    orders.add(o0);
+    cq.orderBy(orders);
+
+    cq.select(root);
+    TypedQuery<BeamDestination> q = getEntityManager().createQuery(cq);
+
+    return q.getResultList();
+  }
 }
diff --git a/src/main/java/org/jlab/jam/business/session/FacilityFacade.java b/src/main/java/org/jlab/jam/business/session/FacilityFacade.java
new file mode 100644
index 0000000..466b3b2
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/FacilityFacade.java
@@ -0,0 +1,60 @@
+package org.jlab.jam.business.session;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.*;
+import org.jlab.jam.persistence.entity.Facility;
+
+/**
+ * @author ryans
+ */
+@Stateless
+public class FacilityFacade extends AbstractFacade<Facility> {
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public FacilityFacade() {
+    super(Facility.class);
+  }
+
+  @PermitAll
+  public Facility findByPath(String pathInfo) {
+    CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
+    CriteriaQuery<Facility> cq = cb.createQuery(Facility.class);
+    Root<Facility> root = cq.from(Facility.class);
+
+    List<Predicate> filters = new ArrayList<>();
+
+    filters.add(cb.equal(root.get("path"), pathInfo));
+
+    if (!filters.isEmpty()) {
+      cq.where(cb.and(filters.toArray(new Predicate[] {})));
+    }
+
+    cq.select(root);
+    TypedQuery<Facility> q = getEntityManager().createQuery(cq).setFirstResult(0).setMaxResults(2);
+    List<Facility> recordList = q.getResultList();
+
+    Facility facility = null;
+
+    if (recordList.size() > 1) {
+      throw new RuntimeException("Duplicate facility paths configured");
+    }
+
+    if (recordList.size() > 0) {
+      facility = recordList.get(0);
+    }
+
+    return facility;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
index a9cf971..3d50124 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
@@ -4,6 +4,7 @@
 import java.util.List;
 import java.util.Objects;
 import javax.persistence.*;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import org.jlab.jam.persistence.view.BeamDestinationVerification;
 import org.jlab.smoothness.persistence.util.YnStringToBoolean;
@@ -16,9 +17,10 @@ public class BeamDestination {
   @Column(name = "BEAM_DESTINATION_ID", nullable = false, precision = 0)
   private BigInteger beamDestinationId;
 
-  @Basic
-  @Column(name = "MACHINE", nullable = false, length = 32)
-  private String machine;
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
 
   @Basic
   @Column(name = "CURRENT_LIMIT_UNITS", nullable = false, length = 3)
@@ -74,12 +76,12 @@ public void setBeamDestinationId(BigInteger beamDestinationId) {
     this.beamDestinationId = beamDestinationId;
   }
 
-  public String getMachine() {
-    return machine;
+  public Facility getFacility() {
+    return facility;
   }
 
-  public void setMachine(String machine) {
-    this.machine = machine;
+  public void setFacility(Facility facility) {
+    this.facility = facility;
   }
 
   public String getCurrentLimitUnits() {
@@ -104,14 +106,14 @@ public boolean equals(Object o) {
     if (o == null || getClass() != o.getClass()) return false;
     BeamDestination that = (BeamDestination) o;
     return Objects.equals(beamDestinationId, that.beamDestinationId)
-        && Objects.equals(machine, that.machine)
+        && Objects.equals(facility, that.facility)
         && Objects.equals(currentLimitUnits, that.currentLimitUnits)
         && Objects.equals(name, that.name);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(beamDestinationId, machine, currentLimitUnits, name);
+    return Objects.hash(beamDestinationId, facility, currentLimitUnits, name);
   }
 
   @Override
@@ -119,8 +121,8 @@ public String toString() {
     return "BeamDestination{"
         + "beamDestinationId="
         + beamDestinationId
-        + ", machine='"
-        + machine
+        + ", facility='"
+        + facility
         + '\''
         + ", currentLimitUnits='"
         + currentLimitUnits
diff --git a/src/main/java/org/jlab/jam/persistence/entity/Facility.java b/src/main/java/org/jlab/jam/persistence/entity/Facility.java
new file mode 100644
index 0000000..01874d8
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/Facility.java
@@ -0,0 +1,117 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Objects;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "FACILITY", schema = "JAM_OWNER")
+public class Facility implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "FACILITY_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger facilityId;
+
+  @Basic(optional = false)
+  @NotNull
+  @Size(min = 1, max = 64)
+  @Column(nullable = false, length = 64)
+  private String name;
+
+  @Basic(optional = false)
+  @NotNull
+  @Size(min = 1, max = 32)
+  @Column(nullable = false, length = 32)
+  private String path;
+
+  @NotNull
+  @JoinColumn(name = "RF_WORKGROUP_ID", referencedColumnName = "WORKGROUP_ID", nullable = false)
+  @ManyToOne(optional = false, fetch = FetchType.EAGER)
+  private Workgroup rfWorkgroup;
+
+  @NotNull
+  @JoinColumn(name = "BEAM_WORKGROUP_ID", referencedColumnName = "WORKGROUP_ID", nullable = false)
+  @ManyToOne(optional = false, fetch = FetchType.EAGER)
+  private Workgroup beamWorkgroup;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "WEIGHT", nullable = false)
+  private BigInteger weight;
+
+  public BigInteger getFacilityId() {
+    return facilityId;
+  }
+
+  public void setFacilityId(BigInteger facilityId) {
+    this.facilityId = facilityId;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getPath() {
+    return path;
+  }
+
+  public void setPath(String path) {
+    this.path = path;
+  }
+
+  public Workgroup getRfWorkgroup() {
+    return rfWorkgroup;
+  }
+
+  public void setRfWorkgroup(Workgroup rfWorkgroup) {
+    this.rfWorkgroup = rfWorkgroup;
+  }
+
+  public Workgroup getBeamWorkgroup() {
+    return beamWorkgroup;
+  }
+
+  public void setBeamWorkgroup(Workgroup beamWorkgroup) {
+    this.beamWorkgroup = beamWorkgroup;
+  }
+
+  public BigInteger getWeight() {
+    return weight;
+  }
+
+  public void setWeight(BigInteger weight) {
+    this.weight = weight;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 5;
+    hash = 97 * hash + (this.facilityId != null ? this.facilityId.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object obj) {
+    if (obj == null) {
+      return false;
+    }
+    if (getClass() != obj.getClass()) {
+      return false;
+    }
+    final Facility other = (Facility) obj;
+    return Objects.equals(this.facilityId, other.facilityId);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java b/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java
new file mode 100644
index 0000000..af51b82
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/ContextRootController.java
@@ -0,0 +1,32 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "ContextRootController",
+    urlPatterns = {""})
+public class ContextRootController extends HttpServlet {
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    response.sendRedirect(request.getContextPath() + "/authorizations/cebaf");
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamPermissions.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
similarity index 86%
rename from src/main/java/org/jlab/jam/presentation/controller/BeamPermissions.java
rename to src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index e883864..0d292f0 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamPermissions.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -21,13 +21,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.AuthorizationFacade;
-import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.business.session.ControlVerificationFacade;
-import org.jlab.jam.persistence.entity.Authorization;
-import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.DestinationAuthorization;
-import org.jlab.jam.persistence.entity.DestinationAuthorizationPK;
+import org.jlab.jam.business.session.*;
+import org.jlab.jam.persistence.entity.*;
 import org.jlab.smoothness.business.exception.UserFriendlyException;
 import org.jlab.smoothness.business.util.TimeUtil;
 import org.jlab.smoothness.presentation.util.ParamConverter;
@@ -36,14 +31,15 @@
  * @author ryans
  */
 @WebServlet(
-    name = "BeamPermissions",
-    urlPatterns = {"/permissions"})
-public class BeamPermissions extends HttpServlet {
+    name = "FacilityAuthorization",
+    urlPatterns = {"/authorizations/*"})
+public class FacilityAuthorization extends HttpServlet {
 
-  private static final Logger LOGGER = Logger.getLogger(BeamPermissions.class.getName());
+  private static final Logger LOGGER = Logger.getLogger(FacilityAuthorization.class.getName());
   @EJB AuthorizationFacade authorizationFacade;
   @EJB BeamDestinationFacade beamDestinationFacade;
   @EJB ControlVerificationFacade verificationFacade;
+  @EJB FacilityFacade facilityFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -57,25 +53,38 @@ public class BeamPermissions extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
+    String pathInfo = request.getPathInfo();
+
+    System.err.println("PathInfo: " + pathInfo);
+
+    Facility facility = facilityFacade.findByPath(pathInfo);
+
+    if (facility == null) {
+      throw new ServletException("Facility not found");
+    }
+
+    List<Facility> facilityList =
+        facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
     verificationFacade.performExpirationCheck(false);
 
     Authorization authorization = authorizationFacade.findCurrent();
 
-    List<BeamDestination> cebafDestinationList = beamDestinationFacade.findCebafDestinations();
-    List<BeamDestination> lerfDestinationList = beamDestinationFacade.findLerfDestinations();
-    List<BeamDestination> uitfDestinationList = beamDestinationFacade.findUitfDestinations();
+    List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
 
     Map<BigInteger, DestinationAuthorization> destinationAuthorizationMap =
         authorizationFacade.createDestinationAuthorizationMap(authorization);
 
+    request.setAttribute("facility", facility);
+    request.setAttribute("facilityList", facilityList);
     request.setAttribute("unitsMap", authorizationFacade.getUnitsMap());
     request.setAttribute("authorization", authorization);
-    request.setAttribute("cebafDestinationList", cebafDestinationList);
-    request.setAttribute("lerfDestinationList", lerfDestinationList);
-    request.setAttribute("uitfDestinationList", uitfDestinationList);
+    request.setAttribute("beamList", beamList);
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
-    request.getRequestDispatcher("WEB-INF/views/permissions.jsp").forward(request, response);
+    request
+        .getRequestDispatcher("/WEB-INF/views/facility-authorization.jsp")
+        .forward(request, response);
   }
 
   /**
diff --git a/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java b/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
index da255ea..5a94768 100644
--- a/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
+++ b/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
@@ -32,13 +32,13 @@ public static List<String> beamModeList(String facility, String destination) {
       modes = RF_LIST;
     } else {
       switch (facility) {
-        case "cebaf":
+        case "CEBAF":
           modes = CEBAF_LIST;
           break;
-        case "lerf":
+        case "LERF":
           modes = LERF_LIST;
           break;
-        case "uitf":
+        case "UITF":
           modes = UITF_LIST;
           break;
       }
diff --git a/src/main/webapp/WEB-INF/tags/authorization-page.tag b/src/main/webapp/WEB-INF/tags/authorization-page.tag
new file mode 100644
index 0000000..e79dca5
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/authorization-page.tag
@@ -0,0 +1,37 @@
+<%@tag description="The Authorization Page Template Tag" pageEncoding="UTF-8" trimDirectiveWhitespaces="true"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
+<%@attribute name="title" %>
+<%@attribute name="stylesheets" fragment="true" %>
+<%@attribute name="scripts" fragment="true" %>
+<t:page title="Auth - ${title}">
+    <jsp:attribute name="stylesheets">       
+        <jsp:invoke fragment="stylesheets"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <jsp:invoke fragment="scripts"/>
+    </jsp:attribute>
+    <jsp:body>
+        <c:set var="currentPathInfo" scope="request" value="${requestScope['javax.servlet.forward.path_info']}"/>
+        <div id="two-columns">
+            <div id="left-column">
+                <section>
+                    <h2 id="left-column-header">Auth</h2>
+                    <nav id="secondary-nav">
+                        <ul>
+                        <c:forEach items="${facilityList}" var="facility">
+                            <li${facility.path eq currentPathInfo ? ' class="current-secondary"' : ''}><a
+                                    href="${pageContext.request.contextPath}/authorizations${facility.path}">${facility.name}</a>
+                            </li>
+                        </c:forEach>
+                        </ul>
+                    </nav>
+                </section>
+            </div>
+            <div id="right-column">
+                <jsp:doBody/>
+            </div>
+        </div>
+    </jsp:body>
+</t:page>
diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
index a937246..b0c1724 100644
--- a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
+++ b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
@@ -5,9 +5,8 @@
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
-<%@attribute name="destinationList" required="true" type="java.util.List"%>
+<%@attribute name="beamList" required="true" type="java.util.List"%>
 <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%>
-<%@attribute name="facility" required="true" type="java.lang.String"%>
 <table class="destinations-table data-table stripped-table">
     <thead>
         <tr>
@@ -28,7 +27,7 @@
         </tr>
     </thead>
     <tbody>
-        <c:forEach items="${destinationList}" var="destination">
+        <c:forEach items="${beamList}" var="destination">
             <c:set var="destinationAuthorization" value="${destinationAuthorizationMap[destination.beamDestinationId]}"/>
             <c:set var="units" value="${unitsMap[destination.beamDestinationId] ne null ? unitsMap[destination.beamDestinationId] : 'uA'}"/>
             <tr>
@@ -50,7 +49,7 @@
                     <div class="readonly-field"><c:out value="${selectedBeamMode}"/></div>
                     <div class="editable-field">
                         <select name="mode[]" class="mode-select">
-                            <c:forEach items="${beamauth:beamModeList(facility, destination.name)}" var="beamMode">
+                            <c:forEach items="${beamauth:beamModeList(facility.name, destination.name)}" var="beamMode">
                                 <option${beamMode eq selectedBeamMode ? ' selected="selected"' : ''}><c:out value="${beamMode}"/></option>
                             </c:forEach>
                         </select>
diff --git a/src/main/webapp/WEB-INF/tags/page.tag b/src/main/webapp/WEB-INF/tags/page.tag
index fdddea0..76d0b95 100644
--- a/src/main/webapp/WEB-INF/tags/page.tag
+++ b/src/main/webapp/WEB-INF/tags/page.tag
@@ -18,7 +18,7 @@
     </jsp:attribute>
     <jsp:attribute name="primaryNavigation">
                     <ul>
-                        <li${fn:startsWith(currentPath, '/permissions') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/permissions">Permissions</a></li>
+                        <li${fn:startsWith(currentPath, '/authorizations') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/authorizations/cebaf">Authorizations</a></li>
                         <li${fn:startsWith(currentPath, '/credited-controls') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/credited-controls">Credited Controls</a></li>
                         <li${'/destinations' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/destinations">Beam Destinations</a></li>
                         <li${'/control-participation' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/control-participation">Control Participation</a></li>
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/permissions-page.tag
index 15a0caa..ada3cde 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/permissions-page.tag
@@ -1,28 +1,30 @@
-<%@tag description="Destination Table Tag" pageEncoding="UTF-8"%>
+<%@tag description="Permissions Table Tag" pageEncoding="UTF-8"%>
 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
 <%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
-<%@attribute name="cebafDestinationList" required="true" type="java.util.List"%>
-<%@attribute name="lerfDestinationList" required="true" type="java.util.List"%>
+<%@attribute name="rfList" required="true" type="java.util.List"%>
+<%@attribute name="beamList" required="true" type="java.util.List"%>
 <%@attribute name="isEditable" required="true" type="java.lang.Boolean"%>
 <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%>
 <form id="authorization-form" method="post" action="permissions">
     <div class="chart-wrap-backdrop">
-        <h2>Permissions
+        <h2><c:out value="${facility.name}"/>
             <c:if test="${isEditable}">
                 <span class="readonly-field"><button id="edit-button" type="button">Edit</button></span>
             </c:if>            
         </h2>
+        <h3>RF Operations</h3>
+        <table class="data-table">
+            <tbody>
+
+            </tbody>
+        </table>
         <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-        <h3>CEBAF</h3>
-        <t:destination-permissions-table destinationList="${cebafDestinationList}" isHistory="${isHistory}" facility="cebaf"/>
-        <h3>LERF</h3>
-        <t:destination-permissions-table destinationList="${lerfDestinationList}" isHistory="${isHistory}" facility="lerf"/>
-        <h3>UITF</h3>
-        <t:destination-permissions-table destinationList="${uitfDestinationList}" isHistory="${isHistory}" facility="uitf"/>
+        <h3>Beam Operations</h3>
+        <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
         <h3>Notes</h3>
         <div class="notes-field">
             <span class="readonly-field">
diff --git a/src/main/webapp/WEB-INF/views/permissions.jsp b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
similarity index 83%
rename from src/main/webapp/WEB-INF/views/permissions.jsp
rename to src/main/webapp/WEB-INF/views/facility-authorization.jsp
index b1d6e9f..ddb8bcf 100644
--- a/src/main/webapp/WEB-INF/views/permissions.jsp
+++ b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Permissions"> 
+<t:authorization-page title="${facility.name}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
     </jsp:attribute>
@@ -13,7 +13,7 @@
     </jsp:attribute>        
     <jsp:body>
         <section>
-            <t:permissions-page cebafDestinationList="${cebafDestinationList}" lerfDestinationList="${lerfDestinationList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
+            <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
         </section>
         <div id="success-dialog" class="dialog" title="Authorization Saved Successfully">
             <span class="logentry-success">A new log entry was created: <a id="new-entry-url" href="#"></a></span>
@@ -22,4 +22,4 @@
             </div>
         </div>
     </jsp:body>         
-</t:page>
+</t:authorization-page>
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
index 0a94077..0f4154b 100644
--- a/src/main/webapp/WEB-INF/web.xml
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -3,9 +3,6 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
    http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd">
-    <welcome-file-list>
-        <welcome-file>permissions</welcome-file>
-    </welcome-file-list>
     <context-param>
         <param-name>appName</param-name>
         <param-value>JLab Authorization Manager</param-value>

From 94257c731e5e435be25c52cce4debdbfb4cf76f5 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 16:03:50 -0500
Subject: [PATCH 02/44] Separate Facilities

---
 README.md                                     |   4 +-
 container/oracle/initdb.d/02_ddl.sql          | 264 +++++++++-----
 container/oracle/initdb.d/03_default_data.sql |  78 ++--
 ...cade.java => BeamAuthorizationFacade.java} |  82 +++--
 ...ava => BeamControlVerificationFacade.java} | 264 +++++++-------
 ...> BeamDestinationAuthorizationFacade.java} |   9 +-
 .../session/BeamDestinationFacade.java        |  10 +-
 .../jam/business/session/ComponentFacade.java |  13 +-
 .../session/CreditedControlFacade.java        |   6 +-
 .../business/session/DailyScheduledCheck.java |   2 +-
 .../session/RFAuthorizationFacade.java        | 345 ++++++++++++++++++
 .../jam/business/session/RFSegmentFacade.java |  58 +++
 .../session/VerificationHistoryFacade.java    |  16 +-
 .../persistence/entity/BeamAuthorization.java | 168 +++++++++
 ...tion.java => BeamControlVerification.java} |  75 ++--
 ...va => BeamControlVerificationHistory.java} |  79 ++--
 .../persistence/entity/BeamDestination.java   |   6 +-
 ...java => BeamDestinationAuthorization.java} |  42 +--
 .../persistence/entity/CreditedControl.java   |  15 +-
 .../entity/DestinationAuthorizationPK.java    |  29 +-
 ...uthorization.java => RFAuthorization.java} |  57 +--
 .../entity/RFControlVerification.java         | 212 +++++++++++
 .../entity/RFControlVerificationHistory.java  | 166 +++++++++
 .../jam/persistence/entity/RFSegment.java     | 125 +++++++
 .../entity/RFSegmentAuthorization.java        | 158 ++++++++
 .../entity/SegmentAuthorizationPK.java        |  80 ++++
 .../view/BeamDestinationVerification.java     |   8 +-
 .../AuthorizationHistoryController.java       |   8 +-
 .../BeamDestinationInformation.java           |   8 +-
 .../controller/CreditedControls.java          |  10 +-
 ...nationsAuthorizationHistoryController.java |  20 +-
 .../controller/FacilityAuthorization.java     |  35 +-
 .../VerificationHistoryController.java        |  12 +-
 .../presentation/controller/ajax/EditCc.java  |   8 +-
 .../ajax/ToggleControlParticipation.java      |   4 +-
 .../tags/destination-permissions-table.tag    |  20 +-
 .../webapp/WEB-INF/tags/permissions-page.tag  |  88 ++---
 .../WEB-INF/tags/rf-operations-table.tag      |  85 +++++
 .../views/beam-destination-information.jsp    |   8 +-
 .../WEB-INF/views/credited-controls.jsp       |  12 +-
 .../verification-history.jsp                  |   4 +-
 .../webapp/WEB-INF/views/destinations.jsp     |  12 +-
 .../permissions/authorization-history.jsp     |   6 +-
 .../destinations-authorization-history.jsp    |   6 +-
 src/main/webapp/resources/css/permissions.css |   7 +
 src/main/webapp/resources/js/permissions.js   |   8 +-
 46 files changed, 2126 insertions(+), 606 deletions(-)
 rename src/main/java/org/jlab/jam/business/session/{AuthorizationFacade.java => BeamAuthorizationFacade.java} (77%)
 rename src/main/java/org/jlab/jam/business/session/{ControlVerificationFacade.java => BeamControlVerificationFacade.java} (71%)
 rename src/main/java/org/jlab/jam/business/session/{DestinationAuthorizationFacade.java => BeamDestinationAuthorizationFacade.java} (56%)
 create mode 100644 src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
 create mode 100644 src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
 rename src/main/java/org/jlab/jam/persistence/entity/{ControlVerification.java => BeamControlVerification.java} (60%)
 rename src/main/java/org/jlab/jam/persistence/entity/{VerificationHistory.java => BeamControlVerificationHistory.java} (55%)
 rename src/main/java/org/jlab/jam/persistence/entity/{DestinationAuthorization.java => BeamDestinationAuthorization.java} (75%)
 rename src/main/java/org/jlab/jam/persistence/entity/{Authorization.java => RFAuthorization.java} (65%)
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java
 create mode 100644 src/main/webapp/WEB-INF/tags/rf-operations-table.tag

diff --git a/README.md b/README.md
index 404f697..1bb85d2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # jam [![CI](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/jam?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/jam)
-A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
+A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations beamAuthorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
 
 ![Screenshot](https://github.com/JeffersonLab/jam/raw/main/Screenshot.png?raw=true "Screenshot")
 
@@ -16,7 +16,7 @@ A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both
 ---
 
 ## Overview
-The Authorization application allows the Director of Operations (or a delegate) to clearly communicate and document authorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director authorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
+The Authorization application allows the Director of Operations (or a delegate) to clearly communicate and document beamAuthorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director beamAuthorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
 
 ### Roles
  - **Operations Director** - Responsible for authorizing beam
diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index 5ab6c89..f220ce5 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -1,7 +1,9 @@
 alter session set container = XEPDB1;
 
---DROP SEQUENCE JAM_OWNER.AUTHORIZATION_ID;
---DROP SEQUENCE JAM_OWNER.DESTINATION_ID;
+--DROP SEQUENCE JAM_OWNER.RF_AUTHORIZATION_ID;
+--DROP SEQUENCE JAM_OWNER.BEAM_AUTHORIZATION_ID;
+--DROP SEQUENCE JAM_OWNER.RF_SEGMENT_ID;
+--DROP SEQUENCE JAM_OWNER.BEAM_DESTINATION_ID;
 --DROP SEQUENCE JAM_OWNER.CONTROL_VERIFICATION_ID;
 --DROP SEQUENCE JAM_OWNER.CREDITED_CONTROL_ID;
 --DROP SEQUENCE JAM_OWNER.VERIFICATION_HISTORY_ID;
@@ -16,17 +18,32 @@ alter session set container = XEPDB1;
 --DROP TABLE JAM_OWNER.BEAM_DESTINATION CASCADE CONSTRAINTS PURGE;
 --DROP TABLE JAM_OWNER.WORKGROUP CASCADE CONSTRAINTS PURGE;
 
-CREATE SEQUENCE JAM_OWNER.AUTHORIZATION_ID
+CREATE SEQUENCE JAM_OWNER.RF_AUTHORIZATION_ID
     START WITH 1
     NOCYCLE
     NOCACHE
     ORDER;
-CREATE SEQUENCE JAM_OWNER.DESTINATION_ID
+CREATE SEQUENCE JAM_OWNER.BEAM_AUTHORIZATION_ID
     START WITH 1
     NOCYCLE
     NOCACHE
     ORDER;
-CREATE SEQUENCE JAM_OWNER.CONTROL_VERIFICATION_ID
+CREATE SEQUENCE JAM_OWNER.RF_SEGMENT_ID
+    START WITH 1
+    NOCYCLE
+    NOCACHE
+    ORDER;
+CREATE SEQUENCE JAM_OWNER.BEAM_DESTINATION_ID
+    START WITH 1
+    NOCYCLE
+    NOCACHE
+    ORDER;
+CREATE SEQUENCE JAM_OWNER.RF_CONTROL_VERIFICATION_ID
+    START WITH 1
+    NOCYCLE
+    NOCACHE
+    ORDER;
+CREATE SEQUENCE JAM_OWNER.BEAM_CONTROL_VERIFICATION_ID
     START WITH 1
     NOCYCLE
     NOCACHE
@@ -36,7 +53,12 @@ CREATE SEQUENCE JAM_OWNER.CREDITED_CONTROL_ID
     NOCYCLE
     NOCACHE
     ORDER;
-CREATE SEQUENCE JAM_OWNER.VERIFICATION_HISTORY_ID
+CREATE SEQUENCE JAM_OWNER.RF_CONTROL_VERIFICATION_HISTORY_ID
+    START WITH 1
+    NOCYCLE
+    NOCACHE
+    ORDER;
+CREATE SEQUENCE JAM_OWNER.BEAM_CONTROL_VERIFICATION_HISTORY_ID
     START WITH 1
     NOCYCLE
     NOCACHE
@@ -69,22 +91,20 @@ CREATE TABLE JAM_OWNER.FACILITY
     CONSTRAINT FACILITY_FK2 FOREIGN KEY (BEAM_WORKGROUP_ID) REFERENCES JAM_OWNER.WORKGROUP (WORKGROUP_ID)
 );
 
-CREATE TABLE JAM_OWNER.RF_OPERATION
+CREATE TABLE JAM_OWNER.RF_SEGMENT
 (
-    RF_OPERATION_ID INTEGER NOT NULL,
-    NAME            VARCHAR2(64 CHAR) NOT NULL,
-    FACILITY_ID     INTEGER NOT NULL,
-    ACTIVE_YN       CHAR(1 BYTE) DEFAULT 'Y' NOT NULL,
-    WEIGHT          INTEGER NOT NULL,
-    CONSTRAINT RF_OPERATION_PK PRIMARY KEY (RF_OPERATION_ID),
-    CONSTRAINT RF_OPERATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
+    RF_SEGMENT_ID INTEGER NOT NULL,
+    NAME          VARCHAR2(64 CHAR) NOT NULL,
+    FACILITY_ID   INTEGER NOT NULL,
+    ACTIVE_YN     CHAR(1 BYTE) DEFAULT 'Y' NOT NULL,
+    WEIGHT        INTEGER NOT NULL,
+    CONSTRAINT RF_SEGMENT_PK PRIMARY KEY (RF_SEGMENT_ID),
+    CONSTRAINT RF_SEGMENT_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
 );
 
--- Should be renamed BEAM_OPERATION
 CREATE TABLE JAM_OWNER.BEAM_DESTINATION
 (
     BEAM_DESTINATION_ID  INTEGER NOT NULL,
-    --OPERATION_TYPE       VARCHAR2(4 CHAR) DEFAULT 'BEAM' NOT NULL,
     NAME                 VARCHAR2(64 CHAR) NOT NULL,
     FACILITY_ID          INTEGER NOT NULL,
     CURRENT_LIMIT_UNITS  VARCHAR2(3 CHAR) DEFAULT  'uA'  NOT NULL,
@@ -93,34 +113,55 @@ CREATE TABLE JAM_OWNER.BEAM_DESTINATION
     CONSTRAINT BEAM_DESTINATION_PK PRIMARY KEY (BEAM_DESTINATION_ID),
     CONSTRAINT BEAM_DESTINATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
     CONSTRAINT BEAM_DESTINATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
-    --CONSTRAINT BEAM_DESTINATION_CK2 CHECK (OPERATION_TYPE IN ('BEAM', 'RF'))
 );
 
--- Rename BEAM_AUTHORIZATION
-CREATE TABLE JAM_OWNER.AUTHORIZATION
+CREATE TABLE JAM_OWNER.RF_AUTHORIZATION
+(
+    RF_AUTHORIZATION_ID INTEGER NOT NULL,
+    MODIFIED_DATE       DATE NOT NULL,
+    MODIFIED_BY         VARCHAR2(64 CHAR) NOT NULL,
+    AUTHORIZATION_DATE  DATE NOT NULL,
+    AUTHORIZED_BY       VARCHAR(64 CHAR) NOT NULL,
+    COMMENTS            VARCHAR2(2048 CHAR) NULL,
+    CONSTRAINT RF_AUTHORIZATION_PK PRIMARY KEY (RF_AUTHORIZATION_ID)
+);
+
+CREATE TABLE JAM_OWNER.BEAM_AUTHORIZATION
+(
+    BEAM_AUTHORIZATION_ID INTEGER NOT NULL,
+    MODIFIED_DATE         DATE NOT NULL,
+    MODIFIED_BY           VARCHAR2(64 CHAR) NOT NULL,
+    AUTHORIZATION_DATE    DATE NOT NULL,
+    AUTHORIZED_BY         VARCHAR(64 CHAR) NOT NULL,
+    COMMENTS              VARCHAR2(2048 CHAR) NULL,
+    CONSTRAINT BEAM_AUTHORIZATION_PK PRIMARY KEY (BEAM_AUTHORIZATION_ID)
+);
+
+CREATE TABLE JAM_OWNER.BEAM_DESTINATION_AUTHORIZATION
 (
-    AUTHORIZATION_ID     INTEGER NOT NULL ,
-    --OPERATION_TYPE       VARCHAR2(4 CHAR) DEFAULT 'BEAM' NOT NULL,
-    MODIFIED_DATE        DATE NOT NULL ,
-    MODIFIED_BY          VARCHAR2(64 CHAR) NOT NULL ,
-    AUTHORIZATION_DATE   DATE NOT NULL ,
-    AUTHORIZED_BY        VARCHAR(64 CHAR) NOT NULL ,
-    COMMENTS             VARCHAR2(2048 CHAR) NULL ,
-    CONSTRAINT AUTHORIZATION_PK PRIMARY KEY (AUTHORIZATION_ID)
+    BEAM_DESTINATION_ID   INTEGER NOT NULL,
+    BEAM_AUTHORIZATION_ID INTEGER NOT NULL,
+    BEAM_MODE             VARCHAR2(16) NOT NULL,
+    CW_LIMIT              NUMBER(24,12) NULL,
+    COMMENTS              VARCHAR2(256) NULL,
+    EXPIRATION_DATE       DATE NULL,
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_PK PRIMARY KEY (BEAM_DESTINATION_ID,BEAM_AUTHORIZATION_ID),
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK1 FOREIGN KEY (BEAM_DESTINATION_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID),
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (BEAM_AUTHORIZATION_ID) REFERENCES JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID),
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_CK1 CHECK (BEAM_MODE IN ('None', 'Tune', 'CW', 'Ceramic Viewer', 'Viewer Limited', 'High Duty Cycle', 'BLM Checkout', 'RF Only'))
 );
 
--- Rename BEAM_OPERATION_AUTHORIZATION
-CREATE TABLE JAM_OWNER.DESTINATION_AUTHORIZATION
+CREATE TABLE JAM_OWNER.RF_SEGMENT_AUTHORIZATION
 (
-    BEAM_DESTINATION_ID  INTEGER NOT NULL ,
-    AUTHORIZATION_ID     INTEGER NOT NULL ,
-    BEAM_MODE            VARCHAR2(16) NOT NULL  CONSTRAINT  DESTINATION_AUTHORIZATION_CK1 CHECK (BEAM_MODE IN ('None', 'Tune', 'CW', 'Ceramic Viewer', 'Viewer Limited', 'High Duty Cycle', 'BLM Checkout', 'RF Only')),
-    CW_LIMIT             NUMBER(24,12) NULL ,
-    COMMENTS             VARCHAR2(256) NULL ,
-    EXPIRATION_DATE      DATE NULL ,
-    CONSTRAINT DESTINATION_AUTHORIZATION_PK PRIMARY KEY (BEAM_DESTINATION_ID,AUTHORIZATION_ID),
-    CONSTRAINT DESTINATION_AUTHORIZATION_FK1 FOREIGN KEY (BEAM_DESTINATION_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID),
-    CONSTRAINT DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (AUTHORIZATION_ID) REFERENCES JAM_OWNER.AUTHORIZATION (AUTHORIZATION_ID)
+    RF_SEGMENT_ID       INTEGER NOT NULL,
+    RF_AUTHORIZATION_ID INTEGER NOT NULL,
+    RF_MODE             VARCHAR2(16) NOT NULL,
+    COMMENTS            VARCHAR2(256) NULL,
+    EXPIRATION_DATE     DATE NULL,
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_PK PRIMARY KEY (RF_SEGMENT_ID,RF_AUTHORIZATION_ID),
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK1 FOREIGN KEY (RF_SEGMENT_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID),
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK2 FOREIGN KEY (RF_AUTHORIZATION_ID) REFERENCES JAM_OWNER.RF_AUTHORIZATION (RF_AUTHORIZATION_ID),
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (RF_MODE IN ('None', 'RF ON'))
 );
 
 CREATE TABLE JAM_OWNER.CREDITED_CONTROL
@@ -136,55 +177,87 @@ CREATE TABLE JAM_OWNER.CREDITED_CONTROL
     CONSTRAINT CREDITED_CONTROL_FK1 FOREIGN KEY (WORKGROUP_ID) REFERENCES JAM_OWNER.WORKGROUP(WORKGROUP_ID)
 );
 
--- Should be renamed VERIFICATION_STATUS
-CREATE TABLE JAM_OWNER.VERIFICATION
-(
-    VERIFICATION_ID      INTEGER NOT NULL ,
-    NAME                 VARCHAR2(128 CHAR) NOT NULL ,
-    CONSTRAINT VERIFICATION_PK PRIMARY KEY (VERIFICATION_ID)
-);
-
--- RENAME BEAM_CONTROL_VERIFICATION
-CREATE TABLE JAM_OWNER.CONTROL_VERIFICATION
-(
-    CONTROL_VERIFICATION_ID INTEGER NOT NULL , -- RENAME BEAM_CONTROL_VERIFICATION_ID
-    CREDITED_CONTROL_ID  INTEGER NULL ,
-    BEAM_DESTINATION_ID  INTEGER NOT NULL , -- rename BEAM_OPERATION_ID
-    VERIFICATION_ID      INTEGER NOT NULL,
-    VERIFICATION_DATE    DATE NULL ,
-    VERIFIED_BY          VARCHAR(64 CHAR) NULL ,
-    EXPIRATION_DATE      DATE NULL ,
-    COMMENTS             VARCHAR2(2048 CHAR) NULL ,
-    MODIFIED_BY          VARCHAR2(64 CHAR) NOT NULL ,
-    MODIFIED_DATE        DATE NOT NULL ,
-    CONSTRAINT CONTROL_VERIFICATION_PK PRIMARY KEY (CONTROL_VERIFICATION_ID),
-    CONSTRAINT CONTROL_VERIFICATION_AK1 UNIQUE (CREDITED_CONTROL_ID,BEAM_DESTINATION_ID),
-    CONSTRAINT CONTROL_VERIFICATION_FK1 FOREIGN KEY (CREDITED_CONTROL_ID) REFERENCES JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID) ON DELETE CASCADE,
-    CONSTRAINT CONTROL_VERIFICATION_FK2 FOREIGN KEY (BEAM_DESTINATION_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID) ON DELETE CASCADE,
-    CONSTRAINT CONTROL_VERIFICATION_FK3 FOREIGN KEY (VERIFICATION_ID) REFERENCES JAM_OWNER.VERIFICATION (VERIFICATION_ID) ON DELETE SET NULL
-);
-
--- RENAME BEAM_VERIFICATION_HISTORY
-CREATE TABLE JAM_OWNER.VERIFICATION_HISTORY
-(
-    VERIFICATION_HISTORY_ID INTEGER NOT NULL ,
-    CONTROL_VERIFICATION_ID INTEGER NOT NULL ,
-    VERIFICATION_ID      INTEGER NOT NULL ,
-    VERIFIED_BY          VARCHAR2(64 CHAR) NULL ,
-    VERIFICATION_DATE    DATE NOT NULL ,
-    EXPIRATION_DATE      DATE NULL ,
-    COMMENTS             VARCHAR2(2048 CHAR) NULL ,
-    MODIFIED_BY          VARCHAR2(64 CHAR) NOT NULL ,
-    MODIFIED_DATE        DATE NOT NULL ,
-    CONSTRAINT VERIFICATION_HISTORY_PK PRIMARY KEY (VERIFICATION_HISTORY_ID),
-    CONSTRAINT VERIFICATION_HISTORY_FK1 FOREIGN KEY (CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.CONTROL_VERIFICATION (CONTROL_VERIFICATION_ID) ON DELETE CASCADE,
-    CONSTRAINT VERIFICATION_HISTORY_FK3 FOREIGN KEY (VERIFICATION_ID) REFERENCES JAM_OWNER.VERIFICATION (VERIFICATION_ID) ON DELETE SET NULL
-);
-
-CREATE OR REPLACE FORCE VIEW JAM_OWNER.BEAM_DESTINATION_VERIFICATION (BEAM_DESTINATION_ID, VERIFICATION_ID, EXPIRATION_DATE) AS
+CREATE TABLE JAM_OWNER.VERIFICATION_STATUS
+(
+    VERIFICATION_STATUS_ID INTEGER NOT NULL ,
+    NAME                   VARCHAR2(128 CHAR) NOT NULL ,
+    CONSTRAINT VERIFICATION_STATUS_PK PRIMARY KEY (VERIFICATION_STATUS_ID)
+);
+
+CREATE TABLE JAM_OWNER.RF_CONTROL_VERIFICATION
+(
+    RF_CONTROL_VERIFICATION_ID INTEGER NOT NULL,
+    CREDITED_CONTROL_ID        INTEGER NULL,
+    RF_SEGMENT_ID              INTEGER NOT NULL,
+    VERIFICATION_STATUS_ID     INTEGER NOT NULL,
+    VERIFICATION_DATE          DATE NULL,
+    VERIFIED_BY                VARCHAR(64 CHAR) NULL,
+    EXPIRATION_DATE            DATE NULL,
+    COMMENTS                   VARCHAR2(2048 CHAR) NULL,
+    MODIFIED_BY                VARCHAR2(64 CHAR) NOT NULL,
+    MODIFIED_DATE              DATE NOT NULL,
+    CONSTRAINT RF_CONTROL_VERIFICATION_PK PRIMARY KEY (RF_CONTROL_VERIFICATION_ID),
+    CONSTRAINT RF_CONTROL_VERIFICATION_AK1 UNIQUE (CREDITED_CONTROL_ID,RF_SEGMENT_ID),
+    CONSTRAINT RF_CONTROL_VERIFICATION_FK1 FOREIGN KEY (CREDITED_CONTROL_ID) REFERENCES JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID) ON DELETE CASCADE,
+    CONSTRAINT RF_CONTROL_VERIFICATION_FK2 FOREIGN KEY (RF_SEGMENT_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID) ON DELETE CASCADE,
+    CONSTRAINT RF_CONTROL_VERIFICATION_FK3 FOREIGN KEY (VERIFICATION_STATUS_ID) REFERENCES JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID) ON DELETE SET NULL
+);
+
+CREATE TABLE JAM_OWNER.BEAM_CONTROL_VERIFICATION
+(
+    BEAM_CONTROL_VERIFICATION_ID INTEGER NOT NULL,
+    CREDITED_CONTROL_ID          INTEGER NULL,
+    BEAM_DESTINATION_ID          INTEGER NOT NULL,
+    VERIFICATION_STATUS_ID       INTEGER NOT NULL,
+    VERIFICATION_DATE            DATE NULL,
+    VERIFIED_BY                  VARCHAR(64 CHAR) NULL,
+    EXPIRATION_DATE              DATE NULL,
+    COMMENTS                     VARCHAR2(2048 CHAR) NULL,
+    MODIFIED_BY                  VARCHAR2(64 CHAR) NOT NULL,
+    MODIFIED_DATE                DATE NOT NULL,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_PK PRIMARY KEY (BEAM_CONTROL_VERIFICATION_ID),
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_AK1 UNIQUE (CREDITED_CONTROL_ID,BEAM_DESTINATION_ID),
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_FK1 FOREIGN KEY (CREDITED_CONTROL_ID) REFERENCES JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID) ON DELETE CASCADE,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_FK2 FOREIGN KEY (BEAM_DESTINATION_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID) ON DELETE CASCADE,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_FK3 FOREIGN KEY (VERIFICATION_STATUS_ID) REFERENCES JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID) ON DELETE SET NULL
+);
+
+CREATE TABLE JAM_OWNER.RF_CONTROL_VERIFICATION_HISTORY
+(
+    RF_CONTROL_VERIFICATION_HISTORY_ID INTEGER NOT NULL,
+    RF_CONTROL_VERIFICATION_ID         INTEGER NOT NULL,
+    VERIFICATION_STATUS_ID             INTEGER NOT NULL,
+    VERIFIED_BY                        VARCHAR2(64 CHAR) NULL,
+    VERIFICATION_DATE                  DATE NOT NULL,
+    EXPIRATION_DATE                    DATE NULL,
+    COMMENTS                           VARCHAR2(2048 CHAR) NULL,
+    MODIFIED_BY                        VARCHAR2(64 CHAR) NOT NULL,
+    MODIFIED_DATE                      DATE NOT NULL,
+    CONSTRAINT RF_CONTROL_VERIFICATION_HISTORY_PK PRIMARY KEY (RF_CONTROL_VERIFICATION_HISTORY_ID),
+    CONSTRAINT RF_CONTROL_VERIFICATION_HISTORY_FK1 FOREIGN KEY (RF_CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.RF_CONTROL_VERIFICATION (RF_CONTROL_VERIFICATION_ID) ON DELETE CASCADE,
+    CONSTRAINT RF_CONTROL_VERIFICATION_HISTORY_FK3 FOREIGN KEY (VERIFICATION_STATUS_ID) REFERENCES JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID) ON DELETE SET NULL
+);
+
+CREATE TABLE JAM_OWNER.BEAM_CONTROL_VERIFICATION_HISTORY
+(
+    BEAM_CONTROL_VERIFICATION_HISTORY_ID INTEGER NOT NULL,
+    BEAM_CONTROL_VERIFICATION_ID         INTEGER NOT NULL,
+    VERIFICATION_STATUS_ID               INTEGER NOT NULL,
+    VERIFIED_BY                          VARCHAR2(64 CHAR) NULL,
+    VERIFICATION_DATE                    DATE NOT NULL,
+    EXPIRATION_DATE                      DATE NULL,
+    COMMENTS                             VARCHAR2(2048 CHAR) NULL,
+    MODIFIED_BY                          VARCHAR2(64 CHAR) NOT NULL,
+    MODIFIED_DATE                        DATE NOT NULL,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_HISTORY_PK PRIMARY KEY (BEAM_CONTROL_VERIFICATION_HISTORY_ID),
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_HISTORY_FK1 FOREIGN KEY (BEAM_CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.BEAM_CONTROL_VERIFICATION (BEAM_CONTROL_VERIFICATION_ID) ON DELETE CASCADE,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_HISTORY_FK3 FOREIGN KEY (VERIFICATION_STATUS_ID) REFERENCES JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID) ON DELETE SET NULL
+);
+
+CREATE OR REPLACE FORCE VIEW JAM_OWNER.BEAM_DESTINATION_VERIFICATION (BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, EXPIRATION_DATE) AS
 SELECT a.beam_destination_id,
-       NVL((SELECT MAX(VERIFICATION_ID) FROM JAM_OWNER.CONTROL_VERIFICATION b WHERE a.beam_destination_id = b.beam_destination_id), 1) AS VERIFICATION_ID,
-       (SELECT MIN(EXPIRATION_DATE) FROM JAM_OWNER.CONTROL_VERIFICATION b WHERE a.beam_destination_id = b.beam_destination_id) as EXPIRATION_DATE
+       NVL((SELECT MAX(VERIFICATION_STATUS_ID) FROM JAM_OWNER.BEAM_CONTROL_VERIFICATION b WHERE a.beam_destination_id = b.beam_destination_id), 1) AS VERIFICATION_STATUS_ID,
+       (SELECT MIN(EXPIRATION_DATE) FROM JAM_OWNER.BEAM_CONTROL_VERIFICATION b WHERE a.beam_destination_id = b.beam_destination_id) as EXPIRATION_DATE
 FROM JAM_OWNER.BEAM_DESTINATION a;
 
 CREATE TABLE JAM_OWNER.COMPONENT
@@ -203,11 +276,18 @@ CREATE TABLE JAM_OWNER.COMPONENT
 select component_id, name, status_id from srm_owner.component join srm_owner.component_status_2 using (component_id) where system_id in (select system_id from srm_owner.system_application where application_id = 1)
 );*/
 
-CREATE TABLE JAM_OWNER.VERIFICATION_COMPONENT
+CREATE TABLE JAM_OWNER.BEAM_CONTROL_VERIFICATION_COMPONENT
+(
+    BEAM_CONTROL_VERIFICATION_ID INTEGER NOT NULL ,
+    COMPONENT_ID                 INTEGER NOT NULL ,
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_COMPONENT_PK PRIMARY KEY (BEAM_CONTROL_VERIFICATION_ID, COMPONENT_ID),
+    CONSTRAINT BEAM_CONTROL_VERIFICATION_COMPONENT_FK1 FOREIGN KEY (BEAM_CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.BEAM_CONTROL_VERIFICATION (BEAM_CONTROL_VERIFICATION_ID) ON DELETE CASCADE
+);
+
+CREATE TABLE JAM_OWNER.RF_CONTROL_VERIFICATION_COMPONENT
 (
-    CONTROL_VERIFICATION_ID INTEGER NOT NULL ,
-    COMPONENT_ID            INTEGER NOT NULL ,
-    CONSTRAINT VERIFICATION_COMPONENT_PK PRIMARY KEY (CONTROL_VERIFICATION_ID, COMPONENT_ID),
-    CONSTRAINT VERIFICATION_COMPONENT_FK1 FOREIGN KEY (CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.CONTROL_VERIFICATION (CONTROL_VERIFICATION_ID) ON DELETE CASCADE
-    --CONSTRAINT VERIFICATION_COMPONENT_FK2 FOREIGN KEY (COMPONENT_ID) REFERENCES JAM_OWNER.COMPONENT (COMPONENT_ID) ON DELETE CASCADE
+    RF_CONTROL_VERIFICATION_ID INTEGER NOT NULL ,
+    COMPONENT_ID               INTEGER NOT NULL ,
+    CONSTRAINT RF_CONTROL_VERIFICATION_COMPONENT_PK PRIMARY KEY (RF_CONTROL_VERIFICATION_ID, COMPONENT_ID),
+    CONSTRAINT RF_CONTROL_VERIFICATION_COMPONENT_FK1 FOREIGN KEY (RF_CONTROL_VERIFICATION_ID) REFERENCES JAM_OWNER.RF_CONTROL_VERIFICATION (RF_CONTROL_VERIFICATION_ID) ON DELETE CASCADE
 );
\ No newline at end of file
diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index 67b1b3d..fbf2f52 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -1,9 +1,9 @@
 alter session set container = XEPDB1;
 
 -- Populate Verification
-insert into JAM_OWNER.VERIFICATION (VERIFICATION_ID, NAME) values (1, 'Verified');
-insert into JAM_OWNER.VERIFICATION (VERIFICATION_ID, NAME) values (50, 'Provisionally Verified');
-insert into JAM_OWNER.VERIFICATION (VERIFICATION_ID, NAME) values (100, 'Not Verified');
+insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (1, 'Verified');
+insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (50, 'Provisionally Verified');
+insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (100, 'Not Verified');
 
 -- Populate Workgroup
 insert into JAM_OWNER.WORKGROUP (WORKGROUP_ID, NAME, LEADER_ROLE_NAME) values (1, 'Group 1', 'group1Leaders');
@@ -36,49 +36,49 @@ insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WOR
 insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 6','Control 6 Description',1,6,'1 Year');
 
 -- Populate Beam Destinations
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 1', 1, 'uA', 'Y', 1);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 2', 1, 'uA', 'Y', 2);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 3', 1, 'uA', 'Y', 3);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 4', 2, 'uA', 'Y', 4);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 5', 2, 'uA', 'Y', 5);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 6', 2, 'uA', 'Y', 6);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 7', 3, 'uA', 'Y', 7);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 8', 3, 'uA', 'Y', 8);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Destination 9', 3, 'uA', 'Y', 9);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.destination_id.nextval, 'Injector RF Operations', 1, 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 1', 1, 'uA', 'Y', 1);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 2', 1, 'uA', 'Y', 2);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 3', 1, 'uA', 'Y', 3);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 4', 2, 'uA', 'Y', 4);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 5', 2, 'uA', 'Y', 5);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 6', 2, 'uA', 'Y', 6);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 7', 3, 'uA', 'Y', 7);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 8', 3, 'uA', 'Y', 8);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 9', 3, 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Injector RF Operations', 1, 'uA', 'Y', 9);
 
 -- Populate Initial Control Verification
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 1, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 2, 2, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 3, 3, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 4, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 5, 5, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 6, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 1, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 2, 5, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 3, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 4, 3, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 5, 2, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 6, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 1, 9, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 2, 8, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 3, 7, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 4, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 5, 9, 100, sysdate, 'admin', null, null, 'admin', sysdate);
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 6, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 1, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 2, 2, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 3, 3, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 4, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 5, 5, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 6, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 1, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 2, 5, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 3, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 4, 3, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 5, 2, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 6, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 1, 9, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 2, 8, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 3, 7, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 4, 6, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 5, 9, 100, sysdate, 'admin', null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 6, 4, 100, sysdate, 'admin', null, null, 'admin', sysdate);
 -- Test null VERIFIED_BY (Control 6, Destination 9)
-insert into JAM_OWNER.control_verification (CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.control_verification_id.nextval, 6, 9, 100, sysdate, null, null, null, 'admin', sysdate);
+insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 6, 9, 100, sysdate, null, null, null, 'admin', sysdate);
 
 -- Populate Initial Verification History (Control 1, Destination 1)
-insert into JAM_OWNER.verification_history (VERIFICATION_HISTORY_ID, CONTROL_VERIFICATION_ID, VERIFICATION_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.verification_history_id.nextval, 1, 100, sysdate, 'tbrown', null, null, 'tbrown', sysdate);
+insert into JAM_OWNER.beam_control_verification_history (BEAM_CONTROL_VERIFICATION_HISTORY_ID, BEAM_CONTROL_VERIFICATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_history_id.nextval, 1, 100, sysdate, 'tbrown', null, null, 'tbrown', sysdate);
 
 -- Populate Initial Authorization
-insert into JAM_OWNER.authorization (AUTHORIZATION_ID, MODIFIED_BY, MODIFIED_DATE, AUTHORIZATION_DATE, AUTHORIZED_BY, COMMENTS) values(JAM_OWNER.authorization_id.nextval, 'tbrown', sysdate, sysdate, 'tbrown', 'testing');
+insert into JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID, MODIFIED_BY, MODIFIED_DATE, AUTHORIZATION_DATE, AUTHORIZED_BY, COMMENTS) values(JAM_OWNER.beam_authorization_id.nextval, 'tbrown', sysdate, sysdate, 'tbrown', 'testing');
 
 -- Populate Initial Destination Authorization
-insert into JAM_OWNER.destination_authorization (BEAM_DESTINATION_ID, AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(1, 1, 'None', null, 'test 1', null);
-insert into JAM_OWNER.destination_authorization (BEAM_DESTINATION_ID, AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(2, 1, 'Tune', null, 'test 2', null);
-insert into JAM_OWNER.destination_authorization (BEAM_DESTINATION_ID, AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(3, 1, 'CW', 10, 'test 3', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(1, 1, 'None', null, 'test 1', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(2, 1, 'Tune', null, 'test 2', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(3, 1, 'CW', 10, 'test 3', null);
 
 -- Populate Component
 insert into JAM_OWNER.COMPONENT (COMPONENT_ID, NAME, STATUS_ID) values (2763, '0L03', 1);
@@ -88,5 +88,5 @@ insert into JAM_OWNER.COMPONENT (COMPONENT_ID, NAME, STATUS_ID) values (2766, '1
 insert into JAM_OWNER.COMPONENT (COMPONENT_ID, NAME, STATUS_ID) values (2767, '1L04', 1);
 
 -- Populate Component Verification
-insert into JAM_OWNER.VERIFICATION_COMPONENT (CONTROL_VERIFICATION_ID, COMPONENT_ID) values (1, 2763);
-insert into JAM_OWNER.VERIFICATION_COMPONENT (CONTROL_VERIFICATION_ID, COMPONENT_ID) values (1, 2764);
+insert into JAM_OWNER.BEAM_CONTROL_VERIFICATION_COMPONENT (BEAM_CONTROL_VERIFICATION_ID, COMPONENT_ID) values (1, 2763);
+insert into JAM_OWNER.BEAM_CONTROL_VERIFICATION_COMPONENT (BEAM_CONTROL_VERIFICATION_ID, COMPONENT_ID) values (1, 2764);
diff --git a/src/main/java/org/jlab/jam/business/session/AuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
similarity index 77%
rename from src/main/java/org/jlab/jam/business/session/AuthorizationFacade.java
rename to src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
index 8b96357..e587c50 100644
--- a/src/main/java/org/jlab/jam/business/session/AuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
@@ -27,9 +27,9 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import org.jlab.jam.persistence.entity.Authorization;
+import org.jlab.jam.persistence.entity.BeamAuthorization;
 import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.DestinationAuthorization;
+import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
 import org.jlab.jlog.Body;
 import org.jlab.jlog.Library;
 import org.jlab.jlog.LogEntry;
@@ -47,9 +47,9 @@
  */
 @Stateless
 @DeclareRoles({"jam-admin"})
-public class AuthorizationFacade extends AbstractFacade<Authorization> {
+public class BeamAuthorizationFacade extends AbstractFacade<BeamAuthorization> {
 
-  private static final Logger LOGGER = Logger.getLogger(AuthorizationFacade.class.getName());
+  private static final Logger LOGGER = Logger.getLogger(BeamAuthorizationFacade.class.getName());
 
   @PersistenceContext(unitName = "jamPU")
   private EntityManager em;
@@ -61,8 +61,8 @@ protected EntityManager getEntityManager() {
     return em;
   }
 
-  public AuthorizationFacade() {
-    super(Authorization.class);
+  public BeamAuthorizationFacade() {
+    super(BeamAuthorization.class);
   }
 
   @SuppressWarnings("unchecked")
@@ -89,51 +89,52 @@ public HashMap<BigInteger, String> getUnitsMap() {
 
   @SuppressWarnings("unchecked")
   @PermitAll
-  public Authorization findCurrent() {
+  public BeamAuthorization findCurrent() {
     Query q =
         em.createNativeQuery(
-            "select * from (select * from authorization order by modified_date desc) where rownum <= 1",
-            Authorization.class);
+            "select * from (select * from beam_authorization order by modified_date desc) where rownum <= 1",
+            BeamAuthorization.class);
 
-    List<Authorization> authorizationList = q.getResultList();
+    List<BeamAuthorization> beamAuthorizationList = q.getResultList();
 
-    Authorization authorization = null;
+    BeamAuthorization beamAuthorization = null;
 
-    if (authorizationList != null && !authorizationList.isEmpty()) {
-      authorization = authorizationList.get(0);
+    if (beamAuthorizationList != null && !beamAuthorizationList.isEmpty()) {
+      beamAuthorization = beamAuthorizationList.get(0);
     }
 
-    return authorization;
+    return beamAuthorization;
   }
 
   @SuppressWarnings("unchecked")
   @PermitAll
-  public List<Authorization> findHistory(int offset, int maxPerPage) {
+  public List<BeamAuthorization> findHistory(int offset, int maxPerPage) {
     Query q =
         em.createNativeQuery(
-            "select * from authorization order by authorization_date desc", Authorization.class);
+            "select * from authorization order by authorization_date desc",
+            BeamAuthorization.class);
 
     return q.setFirstResult(offset).setMaxResults(maxPerPage).getResultList();
   }
 
   @PermitAll
   public Long countHistory() {
-    TypedQuery<Long> q = em.createQuery("select count(a) from Authorization a", Long.class);
+    TypedQuery<Long> q = em.createQuery("select count(a) from BeamAuthorization a", Long.class);
 
     return q.getSingleResult();
   }
 
   @PermitAll
-  public Map<BigInteger, DestinationAuthorization> createDestinationAuthorizationMap(
-      Authorization authorization) {
-    Map<BigInteger, DestinationAuthorization> destinationAuthorizationMap = new HashMap<>();
+  public Map<BigInteger, BeamDestinationAuthorization> createDestinationAuthorizationMap(
+      BeamAuthorization beamAuthorization) {
+    Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap = new HashMap<>();
 
-    if (authorization != null && authorization.getDestinationAuthorizationList() != null) {
-      for (DestinationAuthorization destinationAuthorization :
-          authorization.getDestinationAuthorizationList()) {
+    if (beamAuthorization != null && beamAuthorization.getDestinationAuthorizationList() != null) {
+      for (BeamDestinationAuthorization beamDestinationAuthorization :
+          beamAuthorization.getDestinationAuthorizationList()) {
         destinationAuthorizationMap.put(
-            destinationAuthorization.getDestinationAuthorizationPK().getBeamDestinationId(),
-            destinationAuthorization);
+            beamDestinationAuthorization.getDestinationAuthorizationPK().getBeamDestinationId(),
+            beamDestinationAuthorization);
       }
     }
 
@@ -142,27 +143,27 @@ public Map<BigInteger, DestinationAuthorization> createDestinationAuthorizationM
 
   @RolesAllowed("jam-admin")
   public void saveAuthorization(
-      String comments, List<DestinationAuthorization> destinationAuthorizationList)
+      String comments, List<BeamDestinationAuthorization> beamDestinationAuthorizationList)
       throws UserFriendlyException {
     String username = checkAuthenticated();
 
-    Authorization authorization = new Authorization();
-    authorization.setComments(comments);
-    authorization.setAuthorizationDate(new Date());
-    authorization.setAuthorizedBy(username);
-    authorization.setModifiedDate(authorization.getAuthorizationDate());
-    authorization.setModifiedBy(username);
+    BeamAuthorization beamAuthorization = new BeamAuthorization();
+    beamAuthorization.setComments(comments);
+    beamAuthorization.setAuthorizationDate(new Date());
+    beamAuthorization.setAuthorizedBy(username);
+    beamAuthorization.setModifiedDate(beamAuthorization.getAuthorizationDate());
+    beamAuthorization.setModifiedBy(username);
 
-    create(authorization);
+    create(beamAuthorization);
 
-    for (DestinationAuthorization da : destinationAuthorizationList) {
+    for (BeamDestinationAuthorization da : beamDestinationAuthorizationList) {
 
       BeamDestination destination =
           destinationFacade.find(da.getDestinationAuthorizationPK().getBeamDestinationId());
       if (!"None".equals(da.getBeamMode())) { // CW or Tune
 
         // Check if credited control agrees
-        if (!(destination.getVerification().getVerificationId() <= 50)) {
+        if (!(destination.getVerification().getVerificationStatusId() <= 50)) {
           throw new UserFriendlyException(
               "Beam Destination \""
                   + destination.getName()
@@ -170,7 +171,7 @@ public void saveAuthorization(
         }
 
         // If provisional then there better be a comment
-        if (destination.getVerification().getVerificationId() == 50
+        if (destination.getVerification().getVerificationStatusId() == 50
             && (da.getComments() == null || da.getComments().trim().isEmpty())) {
           throw new UserFriendlyException(
               "Beam Destination \""
@@ -197,8 +198,9 @@ public void saveAuthorization(
         }
       }
 
-      da.setAuthorization(authorization);
-      da.getDestinationAuthorizationPK().setAuthorizationId(authorization.getAuthorizationId());
+      da.setAuthorization(beamAuthorization);
+      da.getDestinationAuthorizationPK()
+          .setAuthorizationId(beamAuthorization.getBeamAuthorizationId());
       em.persist(da);
     }
 
@@ -239,9 +241,9 @@ public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
   public long sendELog(String proxyServer, String logbookServer) throws UserFriendlyException {
     String username = checkAuthenticated();
 
-    Authorization authorization = findCurrent();
+    BeamAuthorization beamAuthorization = findCurrent();
 
-    if (authorization == null) {
+    if (beamAuthorization == null) {
       throw new UserFriendlyException("No authorizations found");
     }
 
diff --git a/src/main/java/org/jlab/jam/business/session/ControlVerificationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
similarity index 71%
rename from src/main/java/org/jlab/jam/business/session/ControlVerificationFacade.java
rename to src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
index c6de72c..91c8719 100644
--- a/src/main/java/org/jlab/jam/business/session/ControlVerificationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
@@ -15,14 +15,8 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
-import org.jlab.jam.persistence.entity.Authorization;
-import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.ControlVerification;
-import org.jlab.jam.persistence.entity.CreditedControl;
-import org.jlab.jam.persistence.entity.DestinationAuthorization;
-import org.jlab.jam.persistence.entity.DestinationAuthorizationPK;
-import org.jlab.jam.persistence.entity.VerificationHistory;
-import org.jlab.jam.persistence.entity.Workgroup;
+import org.jlab.jam.persistence.entity.*;
+import org.jlab.jam.persistence.entity.BeamAuthorization;
 import org.jlab.jlog.Body;
 import org.jlab.jlog.Library;
 import org.jlab.jlog.LogEntry;
@@ -40,16 +34,17 @@
  */
 @Stateless
 @DeclareRoles({"jam-admin"})
-public class ControlVerificationFacade extends AbstractFacade<ControlVerification> {
+public class BeamControlVerificationFacade extends AbstractFacade<BeamControlVerification> {
 
-  private static final Logger LOGGER = Logger.getLogger(ControlVerificationFacade.class.getName());
+  private static final Logger LOGGER =
+      Logger.getLogger(BeamControlVerificationFacade.class.getName());
 
   @PersistenceContext(unitName = "jamPU")
   private EntityManager em;
 
   @EJB CreditedControlFacade controlFacade;
   @EJB BeamDestinationFacade destinationFacade;
-  @EJB AuthorizationFacade authorizationFacade;
+  @EJB BeamAuthorizationFacade beamAuthorizationFacade;
   @EJB BeamDestinationFacade beamDestinationFacade;
 
   @Override
@@ -57,16 +52,16 @@ protected EntityManager getEntityManager() {
     return em;
   }
 
-  public ControlVerificationFacade() {
-    super(ControlVerification.class);
+  public BeamControlVerificationFacade() {
+    super(BeamControlVerification.class);
   }
 
   @PermitAll
-  public List<ControlVerification> findByBeamDestination(BigInteger beamDestinationId) {
-    TypedQuery<ControlVerification> q =
+  public List<BeamControlVerification> findByBeamDestination(BigInteger beamDestinationId) {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a join fetch a.creditedControl where a.beamDestination.beamDestinationId = :beamDestinationId order by a.creditedControl.weight asc",
-            ControlVerification.class);
+            "select a from BeamControlVerification a join fetch a.creditedControl where a.beamDestination.beamDestinationId = :beamDestinationId order by a.creditedControl.weight asc",
+            BeamControlVerification.class);
 
     q.setParameter("beamDestinationId", beamDestinationId);
 
@@ -75,19 +70,19 @@ public List<ControlVerification> findByBeamDestination(BigInteger beamDestinatio
 
   @RolesAllowed("jam-admin")
   public void toggle(BigInteger controlId, BigInteger destinationId) {
-    ControlVerification verification = find(controlId, destinationId);
+    BeamControlVerification verification = find(controlId, destinationId);
 
     String username = checkAuthenticated();
 
     if (verification == null) {
-      verification = new ControlVerification();
+      verification = new BeamControlVerification();
       verification.setModifiedBy(username);
       verification.setModifiedDate(new Date());
       CreditedControl control = controlFacade.find(controlId);
       verification.setCreditedControl(control);
       BeamDestination destination = destinationFacade.find(destinationId);
       verification.setBeamDestination(destination);
-      verification.setVerificationId(100);
+      verification.setVerificationStatusId(100);
       create(verification);
     } else {
       remove(verification);
@@ -95,18 +90,18 @@ public void toggle(BigInteger controlId, BigInteger destinationId) {
   }
 
   @PermitAll
-  public ControlVerification find(BigInteger controlId, BigInteger destinationId) {
-    TypedQuery<ControlVerification> q =
+  public BeamControlVerification find(BigInteger controlId, BigInteger destinationId) {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a where a.creditedControl.creditedControlId = :creditedControlId and a.beamDestination.beamDestinationId = :beamDestinationId",
-            ControlVerification.class);
+            "select a from BeamControlVerification a where a.creditedControl.creditedControlId = :creditedControlId and a.beamDestination.beamDestinationId = :beamDestinationId",
+            BeamControlVerification.class);
 
     q.setParameter("creditedControlId", controlId);
     q.setParameter("beamDestinationId", destinationId);
 
-    List<ControlVerification> verificationList = q.getResultList();
+    List<BeamControlVerification> verificationList = q.getResultList();
 
-    ControlVerification verification = null;
+    BeamControlVerification verification = null;
 
     if (verificationList != null && !verificationList.isEmpty()) {
       verification = verificationList.get(0);
@@ -116,7 +111,7 @@ public ControlVerification find(BigInteger controlId, BigInteger destinationId)
   }
 
   @PermitAll
-  public List<ControlVerification> edit(
+  public List<BeamControlVerification> edit(
       BigInteger[] controlVerificationIdArray,
       Integer verificationId,
       Date verificationDate,
@@ -152,7 +147,7 @@ public List<ControlVerification> edit(
       throw new UserFriendlyException("expiration date cannot be in the past");
     }
 
-    List<ControlVerification> downgradeList = new ArrayList<>();
+    List<BeamControlVerification> downgradeList = new ArrayList<>();
 
     UserAuthorizationService auth = UserAuthorizationService.getInstance();
 
@@ -161,7 +156,7 @@ public List<ControlVerification> edit(
         throw new UserFriendlyException("control verification ID must not be null");
       }
 
-      ControlVerification verification = find(controlVerificationId);
+      BeamControlVerification verification = find(controlVerificationId);
 
       if (verification == null) {
         throw new UserFriendlyException(
@@ -169,8 +164,8 @@ public List<ControlVerification> edit(
       }
 
       boolean downgrade =
-          verification.getVerificationId() != verificationId
-              && verification.getVerificationId() < verificationId;
+          verification.getVerificationStatusId() != verificationId
+              && verification.getVerificationStatusId() < verificationId;
 
       // If verificationId is changing and it is a downgrade
 
@@ -184,7 +179,7 @@ public List<ControlVerification> edit(
 
       verification.setModifiedBy(username);
       verification.setModifiedDate(modifiedDate);
-      verification.setVerificationId(verificationId);
+      verification.setVerificationStatusId(verificationId);
       verification.setVerificationDate(verificationDate);
       verification.setVerifiedBy(verifiedUsername);
       verification.setExpirationDate(expirationDate);
@@ -194,15 +189,15 @@ public List<ControlVerification> edit(
         downgradeList.add(verification);
       }
 
-      VerificationHistory history = new VerificationHistory();
-      history.setVerificationId(verificationId);
+      BeamControlVerificationHistory history = new BeamControlVerificationHistory();
+      history.setVerificationStatusId(verificationId);
       history.setModifiedBy(username);
       history.setModifiedDate(modifiedDate);
       history.setVerificationDate(verificationDate);
       history.setVerifiedBy(verifiedUsername);
       history.setExpirationDate(expirationDate);
       history.setComments(comments);
-      history.setControlVerification(verification);
+      history.setBeamControlVerification(verification);
       em.persist(history);
     }
 
@@ -216,17 +211,17 @@ public List<ControlVerification> edit(
   @PermitAll
   public String getExpiredMessageBody(
       String proxyServer,
-      List<DestinationAuthorization> expiredAuthorizationList,
-      List<ControlVerification> expiredVerificationList,
-      List<DestinationAuthorization> upcomingAuthorizationExpirationList,
-      List<ControlVerification> upcomingVerificationExpirationList) {
+      List<BeamDestinationAuthorization> expiredAuthorizationList,
+      List<BeamControlVerification> expiredVerificationList,
+      List<BeamDestinationAuthorization> upcomingAuthorizationExpirationList,
+      List<BeamControlVerification> upcomingVerificationExpirationList) {
     StringBuilder builder = new StringBuilder();
 
     SimpleDateFormat formatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
 
     if (expiredAuthorizationList != null && !expiredAuthorizationList.isEmpty()) {
       builder.append("<h1>--- Expired Director's Authorizations ---</h1>\n");
-      for (DestinationAuthorization authorization : expiredAuthorizationList) {
+      for (BeamDestinationAuthorization authorization : expiredAuthorizationList) {
         builder.append("</div>\n<div><b>Beam Destination:</b> ");
         builder.append(authorization.getDestination().getName());
         builder.append("</div>\n<div><b>Expired On:</b> ");
@@ -242,7 +237,7 @@ public String getExpiredMessageBody(
     if (expiredVerificationList != null && !expiredVerificationList.isEmpty()) {
       builder.append("<h1>--- Expired Credited Control Verifications ---</h1>\n");
 
-      for (ControlVerification v : expiredVerificationList) {
+      for (BeamControlVerification v : expiredVerificationList) {
 
         builder.append("<div><b>Credited Control:</b> ");
         builder.append(v.getCreditedControl().getName());
@@ -266,7 +261,7 @@ public String getExpiredMessageBody(
         && !upcomingAuthorizationExpirationList.isEmpty()) {
       builder.append("<h1>--- Director's Authorizations Expiring Soon ---</h1>\n");
 
-      for (DestinationAuthorization authorization : upcomingAuthorizationExpirationList) {
+      for (BeamDestinationAuthorization authorization : upcomingAuthorizationExpirationList) {
 
         builder.append("<div><b>Beam Destination:</b> ");
         builder.append(authorization.getDestination().getName());
@@ -286,7 +281,7 @@ public String getExpiredMessageBody(
         && !upcomingVerificationExpirationList.isEmpty()) {
       builder.append("<h1>--- Credited Control Verifications Expiring Soon ---</h1>\n");
 
-      for (ControlVerification v : upcomingVerificationExpirationList) {
+      for (BeamControlVerification v : upcomingVerificationExpirationList) {
 
         builder.append("<div><b>Credited Control:</b> ");
         builder.append(v.getCreditedControl().getName());
@@ -315,17 +310,17 @@ public String getExpiredMessageBody(
 
   @PermitAll
   public String getVerificationDowngradedMessageBody(
-      String proxyServer, List<ControlVerification> downgradeList) {
+      String proxyServer, List<BeamControlVerification> downgradeList) {
     StringBuilder builder = new StringBuilder();
 
     SimpleDateFormat formatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
 
-    ControlVerification verification = downgradeList.get(0);
+    BeamControlVerification verification = downgradeList.get(0);
 
     builder.append("<div><b>Credited Control:</b> ");
     builder.append(verification.getCreditedControl().getName());
     builder.append("</div>\n<div><b>Beam Destinations:</b> ");
-    for (ControlVerification v : downgradeList) {
+    for (BeamControlVerification v : downgradeList) {
       builder.append("<div>");
       builder.append(v.getBeamDestination().getName());
       builder.append("</div>");
@@ -336,9 +331,11 @@ public String getVerificationDowngradedMessageBody(
     builder.append(Functions.formatUsername(verification.getVerifiedBy()));
     builder.append("</div>\n<div><b>Verification:</b> ");
     builder.append(
-        verification.getVerificationId() == 1
+        verification.getVerificationStatusId() == 1
             ? "Verified"
-            : (verification.getVerificationId() == 50 ? "Provisionally Verified" : "Not Verified"));
+            : (verification.getVerificationStatusId() == 50
+                ? "Provisionally Verified"
+                : "Not Verified"));
     builder.append("</div>\n<div><b>Comments:</b> ");
     builder.append(IOUtil.escapeXml(verification.getComments()));
     builder
@@ -402,13 +399,14 @@ public void sendVerificationDowngradedEmail(String body) throws UserFriendlyExce
   }
 
   @PermitAll
-  public List<DestinationAuthorization> checkForAuthorizedButExpired(Authorization mostRecent) {
-    TypedQuery<DestinationAuthorization> q =
+  public List<BeamDestinationAuthorization> checkForAuthorizedButExpired(
+      BeamAuthorization mostRecent) {
+    TypedQuery<BeamDestinationAuthorization> q =
         em.createQuery(
-            "select a from DestinationAuthorization a where a.authorization.authorizationId = :authId and a.expirationDate < sysdate and a.beamMode != 'None' and a.destination.active = true order by a.destinationAuthorizationPK.beamDestinationId asc",
-            DestinationAuthorization.class);
+            "select a from BeamDestinationAuthorization a where a.beamAuthorization.beamAuthorizationId = :authId and a.expirationDate < sysdate and a.beamMode != 'None' and a.destination.active = true order by a.destinationAuthorizationPK.beamDestinationId asc",
+            BeamDestinationAuthorization.class);
 
-    BigInteger authId = mostRecent.getAuthorizationId();
+    BigInteger authId = mostRecent.getBeamAuthorizationId();
 
     q.setParameter("authId", authId);
 
@@ -416,44 +414,44 @@ public List<DestinationAuthorization> checkForAuthorizedButExpired(Authorization
   }
 
   @PermitAll
-  public List<ControlVerification> checkForExpired() {
-    TypedQuery<ControlVerification> q =
+  public List<BeamControlVerification> checkForExpired() {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.beamDestination.active = true order by a.creditedControl.weight asc",
-            ControlVerification.class);
+            "select a from BeamControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.beamDestination.active = true order by a.creditedControl.weight asc",
+            BeamControlVerification.class);
 
     return q.getResultList();
   }
 
   @PermitAll
-  public List<ControlVerification> checkForVerifiedButExpired() {
-    TypedQuery<ControlVerification> q =
+  public List<BeamControlVerification> checkForVerifiedButExpired() {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.beamDestination.active = true and a.verificationId in (1, 50) order by a.creditedControl.weight asc",
-            ControlVerification.class);
+            "select a from BeamControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.beamDestination.active = true and a.verificationStatusId in (1, 50) order by a.creditedControl.weight asc",
+            BeamControlVerification.class);
 
     return q.getResultList();
   }
 
   @PermitAll
-  public void revokeExpiredAuthorizations(List<DestinationAuthorization> authorizationList) {
+  public void revokeExpiredAuthorizations(List<BeamDestinationAuthorization> authorizationList) {
     LOGGER.log(Level.FINEST, "I think I've got something authorization-wise to downgrade");
     this.clearDirectorPermissionByDestinationAuthorization(authorizationList);
   }
 
   @PermitAll
-  public void revokeExpiredVerifications(List<ControlVerification> expiredList) {
+  public void revokeExpiredVerifications(List<BeamControlVerification> expiredList) {
     Query q =
         em.createQuery(
-            "update ControlVerification a set a.verificationId = 100, a.comments = 'Expired', a.verifiedBy = null, a.verificationDate = :vDate, a.modifiedDate = :vDate, a.modifiedBy = 'authadm' where a.controlVerificationId in :list");
+            "update BeamControlVerification a set a.verificationId = 100, a.comments = 'Expired', a.verifiedBy = null, a.verificationDate = :vDate, a.modifiedDate = :vDate, a.modifiedBy = 'authadm' where a.controlVerificationId in :list");
 
     List<BigInteger> expiredIdList = new ArrayList<>();
 
     Date modifiedDate = new Date();
 
     if (expiredList != null) {
-      for (ControlVerification v : expiredList) {
-        expiredIdList.add(v.getControlVerificationId());
+      for (BeamControlVerification v : expiredList) {
+        expiredIdList.add(v.getBeamControlVerificationId());
       }
     }
 
@@ -470,28 +468,28 @@ public void revokeExpiredVerifications(List<ControlVerification> expiredList) {
   }
 
   @PermitAll
-  public void clearDirectorPermissionForExpired(List<ControlVerification> verificationList) {
+  public void clearDirectorPermissionForExpired(List<BeamControlVerification> verificationList) {
     clearDirectorPermissionByCreditedControl(verificationList, true);
   }
 
   @PermitAll
-  public void clearDirectorPermissionForDowngrade(List<ControlVerification> verificationList) {
+  public void clearDirectorPermissionForDowngrade(List<BeamControlVerification> verificationList) {
     clearDirectorPermissionByCreditedControl(verificationList, false);
   }
 
   private void clearDirectorPermissionByCreditedControl(
-      List<ControlVerification> verificationList, Boolean expiration) {
+      List<BeamControlVerification> verificationList, Boolean expiration) {
     String reason = "expiration";
 
     if (!expiration) {
       reason = "downgrade";
     }
 
-    Authorization authorization = authorizationFacade.findCurrent();
+    BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
-    Authorization authClone = authorization.createAdminClone();
+    BeamAuthorization authClone = beamAuthorization.createAdminClone();
     // authClone.setDestinationAuthorizationList(new ArrayList<>());
-    List<DestinationAuthorization> newList = new ArrayList<>();
+    List<BeamDestinationAuthorization> newList = new ArrayList<>();
 
     boolean atLeastOne = false;
 
@@ -499,9 +497,10 @@ private void clearDirectorPermissionByCreditedControl(
     // are two ways in which a clear can happen and they can race to see who clears permissions
     // first:
     // (1) director's expiration vs (2) credited control expiration
-    if (authorization.getDestinationAuthorizationList() != null) {
-      for (DestinationAuthorization auth : authorization.getDestinationAuthorizationList()) {
-        DestinationAuthorization destClone = auth.createAdminClone(authClone);
+    if (beamAuthorization.getDestinationAuthorizationList() != null) {
+      for (BeamDestinationAuthorization auth :
+          beamAuthorization.getDestinationAuthorizationList()) {
+        BeamDestinationAuthorization destClone = auth.createAdminClone(authClone);
         // authClone.getDestinationAuthorizationList().add(destClone);
         newList.add(destClone);
 
@@ -509,7 +508,7 @@ private void clearDirectorPermissionByCreditedControl(
           continue; // Already None so no need to revoke; move on to next
         }
         BigInteger destinationId = auth.getDestinationAuthorizationPK().getBeamDestinationId();
-        for (ControlVerification verification : verificationList) {
+        for (BeamControlVerification verification : verificationList) {
           if (destinationId.equals(verification.getBeamDestination().getBeamDestinationId())) {
             destClone.setBeamMode("None");
             destClone.setCwLimit(null);
@@ -526,10 +525,10 @@ private void clearDirectorPermissionByCreditedControl(
 
     if (atLeastOne) {
       em.persist(authClone);
-      for (DestinationAuthorization da : newList) {
+      for (BeamDestinationAuthorization da : newList) {
         DestinationAuthorizationPK pk = new DestinationAuthorizationPK();
         pk.setBeamDestinationId(da.getDestination().getBeamDestinationId());
-        pk.setAuthorizationId(authClone.getAuthorizationId());
+        pk.setAuthorizationId(authClone.getBeamAuthorizationId());
         da.setDestinationAuthorizationPK(pk);
         em.persist(da);
       }
@@ -537,12 +536,12 @@ private void clearDirectorPermissionByCreditedControl(
   }
 
   private void clearDirectorPermissionByDestinationAuthorization(
-      List<DestinationAuthorization> destinationList) {
-    Authorization authorization = authorizationFacade.findCurrent();
+      List<BeamDestinationAuthorization> destinationList) {
+    BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
-    Authorization authClone = authorization.createAdminClone();
+    BeamAuthorization authClone = beamAuthorization.createAdminClone();
     // authClone.setDestinationAuthorizationList(new ArrayList<>());
-    List<DestinationAuthorization> newList = new ArrayList<>();
+    List<BeamDestinationAuthorization> newList = new ArrayList<>();
 
     boolean atLeastOne = false;
 
@@ -550,9 +549,10 @@ private void clearDirectorPermissionByDestinationAuthorization(
     // are two ways in which a clear can happen and they can race to see who clears permissions
     // first:
     // (1) director's expiration vs (2) credited control expiration
-    if (authorization.getDestinationAuthorizationList() != null) {
-      for (DestinationAuthorization auth : authorization.getDestinationAuthorizationList()) {
-        DestinationAuthorization destClone = auth.createAdminClone(authClone);
+    if (beamAuthorization.getDestinationAuthorizationList() != null) {
+      for (BeamDestinationAuthorization auth :
+          beamAuthorization.getDestinationAuthorizationList()) {
+        BeamDestinationAuthorization destClone = auth.createAdminClone(authClone);
         // authClone.getDestinationAuthorizationList().add(destClone);
         newList.add(destClone);
 
@@ -572,10 +572,10 @@ private void clearDirectorPermissionByDestinationAuthorization(
 
     if (atLeastOne) {
       em.persist(authClone);
-      for (DestinationAuthorization da : newList) {
+      for (BeamDestinationAuthorization da : newList) {
         DestinationAuthorizationPK pk = new DestinationAuthorizationPK();
         pk.setBeamDestinationId(da.getDestination().getBeamDestinationId());
-        pk.setAuthorizationId(authClone.getAuthorizationId());
+        pk.setAuthorizationId(authClone.getBeamAuthorizationId());
         da.setDestinationAuthorizationPK(pk);
         em.persist(da);
       }
@@ -583,34 +583,35 @@ private void clearDirectorPermissionByDestinationAuthorization(
   }
 
   @PermitAll
-  public void insertExpiredHistory(List<ControlVerification> verificationList, Date modifiedDate) {
-    for (ControlVerification v : verificationList) {
-      VerificationHistory history = new VerificationHistory();
+  public void insertExpiredHistory(
+      List<BeamControlVerification> verificationList, Date modifiedDate) {
+    for (BeamControlVerification v : verificationList) {
+      BeamControlVerificationHistory history = new BeamControlVerificationHistory();
       history.setModifiedBy("jam-admin");
       history.setModifiedDate(modifiedDate);
-      history.setVerificationId(100);
+      history.setVerificationStatusId(100);
       history.setVerificationDate(modifiedDate);
       history.setVerifiedBy(null);
       history.setExpirationDate(v.getExpirationDate());
       history.setComments("Expired");
-      history.setControlVerification(v);
+      history.setBeamControlVerification(v);
       em.persist(history);
     }
   }
 
   @PermitAll
-  public List<ControlVerification> checkForUpcomingVerificationExpirations() {
-    TypedQuery<ControlVerification> q =
+  public List<BeamControlVerification> checkForUpcomingVerificationExpirations() {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a join fetch a.creditedControl where a.expirationDate >= sysdate and (a.expirationDate - 7) <= sysdate and a.verificationId in (1, 50) and a.beamDestination.active = true order by a.creditedControl.weight asc",
-            ControlVerification.class);
+            "select a from BeamControlVerification a join fetch a.creditedControl where a.expirationDate >= sysdate and (a.expirationDate - 7) <= sysdate and a.verificationStatusId in (1, 50) and a.beamDestination.active = true order by a.creditedControl.weight asc",
+            BeamControlVerification.class);
 
     return q.getResultList();
   }
 
-  private List<DestinationAuthorization> checkForUpcomingAuthorizationExpirations(
-      Authorization auth) {
-    List<DestinationAuthorization> upcomingExpirations = new ArrayList<>();
+  private List<BeamDestinationAuthorization> checkForUpcomingAuthorizationExpirations(
+      BeamAuthorization auth) {
+    List<BeamDestinationAuthorization> upcomingExpirations = new ArrayList<>();
 
     Date now = new Date();
     Calendar cal = Calendar.getInstance();
@@ -618,7 +619,7 @@ private List<DestinationAuthorization> checkForUpcomingAuthorizationExpirations(
     Date threeDaysFromNow = cal.getTime();
 
     if (auth.getDestinationAuthorizationList() != null) {
-      for (DestinationAuthorization dest : auth.getDestinationAuthorizationList()) {
+      for (BeamDestinationAuthorization dest : auth.getDestinationAuthorizationList()) {
         if (!"None".equals(dest.getBeamMode())
             && dest.getExpirationDate().after(now)
             && dest.getExpirationDate().before(threeDaysFromNow)) {
@@ -632,10 +633,10 @@ private List<DestinationAuthorization> checkForUpcomingAuthorizationExpirations(
 
   @PermitAll
   public void notifyAdmins(
-      List<DestinationAuthorization> expiredAuthorizationList,
-      List<ControlVerification> expiredVerificationList,
-      List<DestinationAuthorization> upcomingAuthorizationExpirationList,
-      List<ControlVerification> upcomingVerificationExpirationList,
+      List<BeamDestinationAuthorization> expiredAuthorizationList,
+      List<BeamControlVerification> expiredVerificationList,
+      List<BeamDestinationAuthorization> upcomingAuthorizationExpirationList,
+      List<BeamControlVerification> upcomingVerificationExpirationList,
       String proxyServer)
       throws MessagingException, UserFriendlyException {
     String toCsv = System.getenv("BAM_UPCOMING_EXPIRATION_EMAIL_CSV");
@@ -659,8 +660,8 @@ public void notifyAdmins(
 
   @PermitAll
   public void notifyOps(
-      List<DestinationAuthorization> expiredAuthorizationList,
-      List<ControlVerification> expiredVerificationList,
+      List<BeamDestinationAuthorization> expiredAuthorizationList,
+      List<BeamControlVerification> expiredVerificationList,
       String proxyServer)
       throws MessagingException, UserFriendlyException {
     String toCsv = System.getenv("BAM_EXPIRED_EMAIL_CSV");
@@ -681,21 +682,21 @@ public void notifyOps(
 
   @PermitAll
   public void notifyGroups(
-      List<ControlVerification> expiredList,
-      List<ControlVerification> upcomingExpirationsList,
+      List<BeamControlVerification> expiredList,
+      List<BeamControlVerification> upcomingExpirationsList,
       String proxyServer)
       throws MessagingException, UserFriendlyException {
-    Map<Workgroup, List<ControlVerification>> expiredGroupMap = new HashMap<>();
-    Map<Workgroup, List<ControlVerification>> upcomingExpirationGroupMap = new HashMap<>();
+    Map<Workgroup, List<BeamControlVerification>> expiredGroupMap = new HashMap<>();
+    Map<Workgroup, List<BeamControlVerification>> upcomingExpirationGroupMap = new HashMap<>();
 
     String subject = System.getenv("BAM_UPCOMING_EXPIRATION_SUBJECT");
 
     LOGGER.log(Level.FINEST, "Expirations:");
     if (expiredList != null) {
-      for (ControlVerification c : expiredList) {
+      for (BeamControlVerification c : expiredList) {
         LOGGER.log(Level.FINEST, c.toString());
         Workgroup workgroup = c.getCreditedControl().getGroup();
-        List<ControlVerification> groupList = expiredGroupMap.get(workgroup);
+        List<BeamControlVerification> groupList = expiredGroupMap.get(workgroup);
         if (groupList == null) {
           groupList = new ArrayList<>();
           expiredGroupMap.put(workgroup, groupList);
@@ -708,10 +709,10 @@ public void notifyGroups(
 
     LOGGER.log(Level.FINEST, "Upcoming Expirations:");
     if (upcomingExpirationsList != null) {
-      for (ControlVerification c : upcomingExpirationsList) {
+      for (BeamControlVerification c : upcomingExpirationsList) {
         LOGGER.log(Level.FINEST, c.toString());
         Workgroup workgroup = c.getCreditedControl().getGroup();
-        List<ControlVerification> groupList = upcomingExpirationGroupMap.get(workgroup);
+        List<BeamControlVerification> groupList = upcomingExpirationGroupMap.get(workgroup);
         if (groupList == null) {
           groupList = new ArrayList<>();
           upcomingExpirationGroupMap.put(workgroup, groupList);
@@ -743,8 +744,9 @@ public void notifyGroups(
         }
       }
 
-      List<ControlVerification> groupExpiredList = expiredGroupMap.get(w);
-      List<ControlVerification> groupUpcomingExpirationsList = upcomingExpirationGroupMap.get(w);
+      List<BeamControlVerification> groupExpiredList = expiredGroupMap.get(w);
+      List<BeamControlVerification> groupUpcomingExpirationsList =
+          upcomingExpirationGroupMap.get(w);
 
       String sender = System.getenv("BAM_EMAIL_SENDER");
 
@@ -770,10 +772,10 @@ public void notifyGroups(
 
   @PermitAll
   public void notifyUsersOfExpirationsAndUpcomingExpirations(
-      List<DestinationAuthorization> expiredAuthorizationList,
-      List<ControlVerification> expiredVerificationList,
-      List<DestinationAuthorization> upcomingAuthorizationExpirationList,
-      List<ControlVerification> upcomingVerificationExpirationList) {
+      List<BeamDestinationAuthorization> expiredAuthorizationList,
+      List<BeamControlVerification> expiredVerificationList,
+      List<BeamDestinationAuthorization> upcomingAuthorizationExpirationList,
+      List<BeamControlVerification> upcomingVerificationExpirationList) {
 
     boolean expiredAuth = (expiredAuthorizationList != null && !expiredAuthorizationList.isEmpty());
     boolean expiredVer = (expiredVerificationList != null && !expiredVerificationList.isEmpty());
@@ -819,8 +821,8 @@ public void notifyUsersOfExpirationsAndUpcomingExpirations(
   @PermitAll
   public void performExpirationCheck(boolean checkForUpcoming) {
     LOGGER.log(Level.FINEST, "Expiration Check: Director's authorizations...");
-    Authorization auth = authorizationFacade.findCurrent();
-    List<DestinationAuthorization> expiredAuthorizationList = null;
+    BeamAuthorization auth = beamAuthorizationFacade.findCurrent();
+    List<BeamDestinationAuthorization> expiredAuthorizationList = null;
 
     if (auth != null) {
       expiredAuthorizationList = checkForAuthorizedButExpired(auth);
@@ -831,7 +833,7 @@ public void performExpirationCheck(boolean checkForUpcoming) {
     }
 
     LOGGER.log(Level.FINEST, "Expiration Check: Checking for expired verifications...");
-    List<ControlVerification> expiredVerificationList =
+    List<BeamControlVerification> expiredVerificationList =
         checkForVerifiedButExpired(); // only items which are "verified" or "provisionally
     // verified", but need to be "not verified" due to expiration
     if (expiredVerificationList != null && !expiredVerificationList.isEmpty()) {
@@ -839,8 +841,8 @@ public void performExpirationCheck(boolean checkForUpcoming) {
       revokeExpiredVerifications(expiredVerificationList);
     }
 
-    List<ControlVerification> upcomingVerificationExpirationList = null;
-    List<DestinationAuthorization> upcomingAuthorizationExpirationList = null;
+    List<BeamControlVerification> upcomingVerificationExpirationList = null;
+    List<BeamDestinationAuthorization> upcomingAuthorizationExpirationList = null;
     if (checkForUpcoming) {
       LOGGER.log(
           Level.FINEST, "Expiration Check: Checking for upcoming verification expirations...");
@@ -861,17 +863,17 @@ public void performExpirationCheck(boolean checkForUpcoming) {
   }
 
   @PermitAll
-  public ControlVerification findWithCreditedControl(BigInteger controlVerificationId) {
-    TypedQuery<ControlVerification> q =
+  public BeamControlVerification findWithCreditedControl(BigInteger controlVerificationId) {
+    TypedQuery<BeamControlVerification> q =
         em.createQuery(
-            "select a from ControlVerification a join fetch a.creditedControl where a.controlVerificationId = :id",
-            ControlVerification.class);
+            "select a from BeamControlVerification a join fetch a.creditedControl where a.beamControlVerificationId = :id",
+            BeamControlVerification.class);
 
     q.setParameter("id", controlVerificationId);
 
-    List<ControlVerification> resultList = q.getResultList();
+    List<BeamControlVerification> resultList = q.getResultList();
 
-    ControlVerification verification = null;
+    BeamControlVerification verification = null;
 
     if (resultList != null && !resultList.isEmpty()) {
       verification = resultList.get(0);
diff --git a/src/main/java/org/jlab/jam/business/session/DestinationAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java
similarity index 56%
rename from src/main/java/org/jlab/jam/business/session/DestinationAuthorizationFacade.java
rename to src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java
index 81116df..3375aee 100644
--- a/src/main/java/org/jlab/jam/business/session/DestinationAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationAuthorizationFacade.java
@@ -3,13 +3,14 @@
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import org.jlab.jam.persistence.entity.DestinationAuthorization;
+import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
 
 /**
  * @author ryans
  */
 @Stateless
-public class DestinationAuthorizationFacade extends AbstractFacade<DestinationAuthorization> {
+public class BeamDestinationAuthorizationFacade
+    extends AbstractFacade<BeamDestinationAuthorization> {
   @PersistenceContext(unitName = "jamPU")
   private EntityManager em;
 
@@ -18,7 +19,7 @@ protected EntityManager getEntityManager() {
     return em;
   }
 
-  public DestinationAuthorizationFacade() {
-    super(DestinationAuthorization.class);
+  public BeamDestinationAuthorizationFacade() {
+    super(BeamDestinationAuthorization.class);
   }
 }
diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
index a994f6d..a170b4c 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
@@ -12,8 +12,8 @@
 import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.*;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.ControlVerification;
 import org.jlab.jam.persistence.entity.Facility;
 
 /**
@@ -94,15 +94,15 @@ public BeamDestination findWithVerificationList(BigInteger destinationId) {
       destination = destinationList.get(0);
 
       // JPAUtil.initialize(destination.getControlVerificationList());
-      for (ControlVerification verification : destination.getControlVerificationList()) {
+      for (BeamControlVerification verification : destination.getBeamControlVerificationList()) {
         verification.getCreditedControl().getName();
       }
 
       Collections.sort(
-          destination.getControlVerificationList(),
-          new Comparator<ControlVerification>() {
+          destination.getBeamControlVerificationList(),
+          new Comparator<BeamControlVerification>() {
             @Override
-            public int compare(ControlVerification o1, ControlVerification o2) {
+            public int compare(BeamControlVerification o1, BeamControlVerification o2) {
               return o1.getCreditedControl().compareTo(o2.getCreditedControl());
             }
           });
diff --git a/src/main/java/org/jlab/jam/business/session/ComponentFacade.java b/src/main/java/org/jlab/jam/business/session/ComponentFacade.java
index 250cd19..ed4ed83 100644
--- a/src/main/java/org/jlab/jam/business/session/ComponentFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/ComponentFacade.java
@@ -7,9 +7,8 @@
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.criteria.*;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.Component;
-import org.jlab.jam.persistence.entity.ControlVerification;
 import org.jlab.smoothness.business.exception.UserFriendlyException;
 
 /**
@@ -25,7 +24,7 @@ protected EntityManager getEntityManager() {
     return em;
   }
 
-  @EJB ControlVerificationFacade controlVerificationFacade;
+  @EJB BeamControlVerificationFacade beamControlVerificationFacade;
 
   public ComponentFacade() {
     super(Component.class);
@@ -42,7 +41,7 @@ public void removeComponent(BigInteger verificationId, BigInteger componentId)
       throw new UserFriendlyException("componentId is required");
     }
 
-    ControlVerification verification = controlVerificationFacade.find(verificationId);
+    BeamControlVerification verification = beamControlVerificationFacade.find(verificationId);
 
     if (verification == null) {
       throw new UserFriendlyException("verification with ID " + verificationId + " not found");
@@ -58,7 +57,7 @@ public void removeComponent(BigInteger verificationId, BigInteger componentId)
         }
       }
       verification.setComponentList(newList);
-      controlVerificationFacade.edit(verification);
+      beamControlVerificationFacade.edit(verification);
     }
   }
 
@@ -73,7 +72,7 @@ public void addComponent(BigInteger verificationId, BigInteger componentId)
       throw new UserFriendlyException("componentId is required");
     }
 
-    ControlVerification verification = controlVerificationFacade.find(verificationId);
+    BeamControlVerification verification = beamControlVerificationFacade.find(verificationId);
 
     if (verification == null) {
       throw new UserFriendlyException("verification with ID " + verificationId + " not found");
@@ -93,6 +92,6 @@ public void addComponent(BigInteger verificationId, BigInteger componentId)
 
     componentList.add(component);
 
-    controlVerificationFacade.edit(verification);
+    beamControlVerificationFacade.edit(verification);
   }
 }
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 eaa57e0..3b0a746 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -34,7 +34,7 @@ public CreditedControlFacade() {
   public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
     TypedQuery<CreditedControl> q =
         em.createQuery(
-            "select a from CreditedControl a JOIN FETCH a.controlVerificationList as b where b.beamDestination.active = true and a.creditedControlId = :creditedControlId",
+            "select a from CreditedControl a JOIN FETCH a.beamControlVerificationList as b where b.beamDestination.active = true and a.creditedControlId = :creditedControlId",
             CreditedControl.class);
 
     q.setParameter("creditedControlId", creditedControlId);
@@ -47,7 +47,7 @@ public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
       cc = ccList.get(0);
 
       // JPAUtil.initialize(cc.getControlVerificationList());
-      Collections.sort(cc.getControlVerificationList());
+      Collections.sort(cc.getBeamControlVerificationList());
     }
 
     return cc;
@@ -63,7 +63,7 @@ public List<CreditedControl> findAllWithVerificationList() {
 
     if (ccList != null) {
       for (CreditedControl cc : ccList) {
-        JPAUtil.initialize(cc.getControlVerificationList());
+        JPAUtil.initialize(cc.getBeamControlVerificationList());
         // Collections.sort(cc.getControlVerificationList());
       }
     }
diff --git a/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java b/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java
index 00ca3cd..308b191 100644
--- a/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java
+++ b/src/main/java/org/jlab/jam/business/session/DailyScheduledCheck.java
@@ -21,7 +21,7 @@ public class DailyScheduledCheck {
 
   private Timer timer;
   @Resource private TimerService timerService;
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
 
   @PostConstruct
   private void init() {
diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
new file mode 100644
index 0000000..d7a85a4
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
@@ -0,0 +1,345 @@
+package org.jlab.jam.business.session;
+
+import java.io.*;
+import java.math.BigInteger;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.security.DeclareRoles;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import org.jlab.jam.persistence.entity.*;
+import org.jlab.jlog.Body;
+import org.jlab.jlog.Library;
+import org.jlab.jlog.LogEntry;
+import org.jlab.jlog.LogEntryAdminExtension;
+import org.jlab.jlog.exception.AttachmentSizeException;
+import org.jlab.jlog.exception.LogCertificateException;
+import org.jlab.jlog.exception.LogIOException;
+import org.jlab.jlog.exception.LogRuntimeException;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
+import org.jlab.smoothness.business.service.EmailService;
+import org.jlab.smoothness.business.util.IOUtil;
+
+/**
+ * @author ryans
+ */
+@Stateless
+@DeclareRoles({"jam-admin"})
+public class RFAuthorizationFacade extends AbstractFacade<RFAuthorization> {
+
+  private static final Logger LOGGER = Logger.getLogger(RFAuthorizationFacade.class.getName());
+
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @EJB RFSegmentFacade segmentFacade;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public RFAuthorizationFacade() {
+    super(RFAuthorization.class);
+  }
+
+  @SuppressWarnings("unchecked")
+  @PermitAll
+  public HashMap<BigInteger, String> getUnitsMap() {
+    HashMap<BigInteger, String> units = new HashMap<>();
+
+    Query q =
+        em.createNativeQuery(
+            "select a.BEAM_DESTINATION_ID, a.CURRENT_LIMIT_UNITS from beam_destination a where a.ACTIVE_YN = 'Y'");
+
+    List<Object[]> results = q.getResultList();
+
+    for (Object[] result : results) {
+      Object[] row = result;
+      Number id = (Number) row[0];
+      String unit = (String) row[1];
+      // LOGGER.log(Level.WARNING, "ID: {0}, Unit: {1}", new Object[]{id, unit});
+      units.put(BigInteger.valueOf(id.longValue()), unit);
+    }
+
+    return units;
+  }
+
+  @SuppressWarnings("unchecked")
+  @PermitAll
+  public BeamAuthorization findCurrent() {
+    Query q =
+        em.createNativeQuery(
+            "select * from (select * from authorization order by modified_date desc) where rownum <= 1",
+            BeamAuthorization.class);
+
+    List<BeamAuthorization> beamAuthorizationList = q.getResultList();
+
+    BeamAuthorization beamAuthorization = null;
+
+    if (beamAuthorizationList != null && !beamAuthorizationList.isEmpty()) {
+      beamAuthorization = beamAuthorizationList.get(0);
+    }
+
+    return beamAuthorization;
+  }
+
+  @SuppressWarnings("unchecked")
+  @PermitAll
+  public List<BeamAuthorization> findHistory(int offset, int maxPerPage) {
+    Query q =
+        em.createNativeQuery(
+            "select * from authorization order by authorization_date desc",
+            BeamAuthorization.class);
+
+    return q.setFirstResult(offset).setMaxResults(maxPerPage).getResultList();
+  }
+
+  @PermitAll
+  public Long countHistory() {
+    TypedQuery<Long> q = em.createQuery("select count(a) from BeamAuthorization a", Long.class);
+
+    return q.getSingleResult();
+  }
+
+  @PermitAll
+  public Map<BigInteger, BeamDestinationAuthorization> createDestinationAuthorizationMap(
+      BeamAuthorization beamAuthorization) {
+    Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap = new HashMap<>();
+
+    if (beamAuthorization != null && beamAuthorization.getDestinationAuthorizationList() != null) {
+      for (BeamDestinationAuthorization beamDestinationAuthorization :
+          beamAuthorization.getDestinationAuthorizationList()) {
+        destinationAuthorizationMap.put(
+            beamDestinationAuthorization.getDestinationAuthorizationPK().getBeamDestinationId(),
+            beamDestinationAuthorization);
+      }
+    }
+
+    return destinationAuthorizationMap;
+  }
+
+  @RolesAllowed("jam-admin")
+  public void saveAuthorization(
+      String comments, List<RFSegmentAuthorization> segmentAuthorizationList)
+      throws UserFriendlyException {
+    String username = checkAuthenticated();
+
+    RFAuthorization authorization = new RFAuthorization();
+    authorization.setComments(comments);
+    authorization.setAuthorizationDate(new Date());
+    authorization.setAuthorizedBy(username);
+    authorization.setModifiedDate(authorization.getAuthorizationDate());
+    authorization.setModifiedBy(username);
+
+    create(authorization);
+
+    for (RFSegmentAuthorization da : segmentAuthorizationList) {
+
+      RFSegment segment = segmentFacade.find(da.getSegmentAuthorizationPK().getRFSegmentId());
+      if (!"None".equals(da.getRFMode())) {
+
+        // Check if credited control agrees
+        if (!(segment.getVerification().getVerificationStatusId() <= 50)) {
+          throw new UserFriendlyException(
+              "Segment \""
+                  + segment.getName()
+                  + "\" cannot authorize RF when credited controls are not verified");
+        }
+
+        // If provisional then there better be a comment
+        if (segment.getVerification().getVerificationStatusId() == 50
+            && (da.getComments() == null || da.getComments().trim().isEmpty())) {
+          throw new UserFriendlyException(
+              "Segment \""
+                  + segment.getName()
+                  + "\" must have a comment to explain why RF is permitted with provisional credited control status");
+        }
+
+        // Must provide an expiration date since ON
+        if (da.getExpirationDate() == null) {
+          throw new UserFriendlyException(
+              "Segment \""
+                  + segment.getName()
+                  + "\" must have an expiration date since RF is allowed");
+        }
+
+        // Expiration must be in the future
+        Calendar cal = Calendar.getInstance();
+        cal.add(Calendar.HOUR_OF_DAY, 1);
+        if (da.getExpirationDate().before(cal.getTime())) {
+          throw new UserFriendlyException(
+              "Segment \""
+                  + segment.getName()
+                  + "\" must have a future expiration date and minimum expiration is 1 hour from now");
+        }
+      }
+
+      da.setRFAuthorization(authorization);
+      da.getSegmentAuthorizationPK().setRFAuthorizationId(authorization.getRfAuthorizationId());
+      em.persist(da);
+    }
+
+    LOGGER.log(Level.FINE, "Director's Authorization saved successfully");
+  }
+
+  @RolesAllowed("jam-admin")
+  public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
+      throws UserFriendlyException {
+
+    String toCsv = System.getenv("JAM_PERMISSIONS_EMAIL_CSV");
+
+    if (toCsv == null || toCsv.isEmpty()) {
+      LOGGER.log(
+          Level.WARNING, "Environment variable 'JAM_PERMISSIONS_EMAIL_CSV' not found, aborting");
+      return;
+    }
+
+    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
+
+    String body = "<a href=\"" + linkHostName + "/jam\">" + linkHostName + "/jam</a>";
+
+    body = body + "\n\n<p>Notes: " + comments + "</p>";
+
+    String sender = System.getenv("JAM_EMAIL_SENDER");
+
+    if (sender == null || sender.isEmpty()) {
+      LOGGER.log(Level.WARNING, "Environment variable 'JAM_EMAIL_SENDER' not found, aborting");
+      return;
+    }
+
+    EmailService emailService = new EmailService();
+
+    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+  }
+
+  @RolesAllowed("jam-admin")
+  public long sendELog(String proxyServer, String logbookServer) throws UserFriendlyException {
+    String username = checkAuthenticated();
+
+    BeamAuthorization beamAuthorization = findCurrent();
+
+    if (beamAuthorization == null) {
+      throw new UserFriendlyException("No authorizations found");
+    }
+
+    // String body = getELogHTMLBody(authorization);
+    String body = getAlternateELogHTMLBody(proxyServer);
+
+    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
+
+    String logbooks = System.getenv("JAM_BOOKS_CSV");
+
+    if (logbooks == null || logbooks.isEmpty()) {
+      logbooks = "TLOG";
+      LOGGER.log(
+          Level.WARNING, "Environment variable 'JAM_BOOKS_CSV' not found, using default TLOG");
+    }
+
+    Properties config = Library.getConfiguration();
+
+    config.setProperty("SUBMIT_URL", logbookServer + "/incoming");
+    config.setProperty("FETCH_URL", logbookServer + "/entry");
+
+    LogEntry entry = new LogEntry(subject, logbooks);
+
+    entry.setBody(body, Body.ContentType.HTML);
+    entry.setTags("Readme");
+
+    LogEntryAdminExtension extension = new LogEntryAdminExtension(entry);
+    extension.setAuthor(username);
+
+    long logId;
+
+    // System.out.println(entry.getXML());
+    File tmpFile = null;
+
+    try {
+      tmpFile = grabPermissionsScreenshot();
+      entry.addAttachment(tmpFile.getAbsolutePath());
+      logId = entry.submitNow();
+
+    } catch (IOException
+        | AttachmentSizeException
+        | LogIOException
+        | LogRuntimeException
+        | LogCertificateException e) {
+      throw new UserFriendlyException("Unable to send elog", e);
+    } finally {
+      if (tmpFile != null) {
+        boolean deleted = tmpFile.delete();
+        if (!deleted) {
+          LOGGER.log(
+              Level.WARNING, "Temporary image file was not deleted {0}", tmpFile.getAbsolutePath());
+        }
+      }
+    }
+
+    return logId;
+  }
+
+  private File grabPermissionsScreenshot() throws IOException {
+
+    String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL");
+    String internalServer = System.getenv("BACKEND_SERVER_URL");
+
+    if (puppetServer == null) {
+      puppetServer = "http://localhost";
+    }
+
+    if (internalServer == null) {
+      internalServer = "http://localhost";
+    }
+
+    internalServer = URLEncoder.encode(internalServer, StandardCharsets.UTF_8);
+
+    URL url =
+        new URL(
+            puppetServer
+                + "/puppet-show/screenshot?url="
+                + internalServer
+                + "%2Fjam%2Fpermissions%3Fprint%3DY&fullPage=true&filename=jam.png&ignoreHTTPSErrors=true");
+
+    LOGGER.log(Level.FINEST, "Fetching URL: {0}", url.toString());
+
+    File tmpFile = null;
+    InputStream in = null;
+    OutputStream out = null;
+
+    try {
+      URLConnection con = url.openConnection();
+      in = con.getInputStream();
+
+      tmpFile = File.createTempFile("jam", ".png");
+      out = new FileOutputStream(tmpFile);
+      IOUtil.copy(in, out);
+
+    } finally {
+      IOUtil.close(in, out);
+    }
+    return tmpFile;
+  }
+
+  private String getAlternateELogHTMLBody(String server) {
+    StringBuilder builder = new StringBuilder();
+
+    builder.append(
+        "[figure:1]<div>\n\n<b><span style=\"color: red;\">Always check the Beam Authorization web application for the latest credited controls status:</span></b> ");
+    builder.append("<a href=\"");
+    builder.append(server);
+    builder.append("/jam/\">JLab Authorization Manager</a></div>\n");
+
+    return builder.toString();
+  }
+}
diff --git a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
new file mode 100644
index 0000000..1431d16
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
@@ -0,0 +1,58 @@
+package org.jlab.jam.business.session;
+
+import java.util.ArrayList;
+import java.util.List;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import javax.persistence.criteria.*;
+import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.jam.persistence.entity.RFSegment;
+
+/**
+ * @author ryans
+ */
+@Stateless
+public class RFSegmentFacade extends AbstractFacade<RFSegment> {
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public RFSegmentFacade() {
+    super(RFSegment.class);
+  }
+
+  @PermitAll
+  public List<RFSegment> findByFacility(Facility facility) {
+    CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
+    CriteriaQuery<RFSegment> cq = cb.createQuery(RFSegment.class);
+    Root<RFSegment> root = cq.from(RFSegment.class);
+
+    List<Predicate> filters = new ArrayList<>();
+
+    filters.add(cb.equal(root.get("facility"), facility));
+
+    filters.add(cb.equal(root.get("active"), true));
+
+    if (!filters.isEmpty()) {
+      cq.where(cb.and(filters.toArray(new Predicate[] {})));
+    }
+
+    List<Order> orders = new ArrayList<>();
+    Path p0 = root.get("weight");
+    Order o0 = cb.desc(p0);
+    orders.add(o0);
+    cq.orderBy(orders);
+
+    cq.select(root);
+    TypedQuery<RFSegment> q = getEntityManager().createQuery(cq);
+
+    return q.getResultList();
+  }
+}
diff --git a/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java b/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java
index e6d8e31..06348ed 100644
--- a/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java
@@ -7,13 +7,13 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
-import org.jlab.jam.persistence.entity.VerificationHistory;
+import org.jlab.jam.persistence.entity.BeamControlVerificationHistory;
 
 /**
  * @author ryans
  */
 @Stateless
-public class VerificationHistoryFacade extends AbstractFacade<VerificationHistory> {
+public class VerificationHistoryFacade extends AbstractFacade<BeamControlVerificationHistory> {
   @PersistenceContext(unitName = "jamPU")
   private EntityManager em;
 
@@ -23,18 +23,18 @@ protected EntityManager getEntityManager() {
   }
 
   public VerificationHistoryFacade() {
-    super(VerificationHistory.class);
+    super(BeamControlVerificationHistory.class);
   }
 
   @PermitAll
-  public List<VerificationHistory> findHistory(
+  public List<BeamControlVerificationHistory> findHistory(
       BigInteger controlVerificationId,
       int offset,
       int maxPerPage) { // join fetch a.controlVerification b join fetch b.creditedControl
-    TypedQuery<VerificationHistory> q =
+    TypedQuery<BeamControlVerificationHistory> q =
         em.createQuery(
-            "select a from VerificationHistory a where a.controlVerification.controlVerificationId = :id order by a.verificationHistoryId desc",
-            VerificationHistory.class);
+            "select a from BeamControlVerificationHistory a where a.beamControlVerification.beamControlVerificationId = :id order by a.beamControlVerificationHistoryId desc",
+            BeamControlVerificationHistory.class);
 
     q.setParameter("id", controlVerificationId);
 
@@ -45,7 +45,7 @@ public List<VerificationHistory> findHistory(
   public Long countHistory(BigInteger controlVerificationId) {
     TypedQuery<Long> q =
         em.createQuery(
-            "select count(a) from VerificationHistory a where a.controlVerification.controlVerificationId = :id",
+            "select count(a) from BeamControlVerificationHistory a where a.beamControlVerification.beamControlVerificationId = :id",
             Long.class);
 
     q.setParameter("id", controlVerificationId);
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
new file mode 100644
index 0000000..4601e25
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
@@ -0,0 +1,168 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.List;
+import javax.persistence.Basic;
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.OneToMany;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(schema = "JAM_OWNER")
+@NamedQueries({
+  @NamedQuery(name = "BeamAuthorization.findAll", query = "SELECT a FROM BeamAuthorization a")
+})
+public class BeamAuthorization implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @SequenceGenerator(
+      name = "BeamAuthorizationId",
+      sequenceName = "BEAM_AUTHORIZATION_ID",
+      allocationSize = 1)
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "BeamAuthorizationId")
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "BEAM_AUTHORIZATION_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger beamAuthorizationId;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "AUTHORIZATION_DATE", nullable = false)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date authorizationDate;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "MODIFIED_DATE", nullable = false)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date modifiedDate;
+
+  @NotNull
+  @Column(name = "AUTHORIZED_BY", nullable = false)
+  private String authorizedBy;
+
+  @NotNull
+  @Column(name = "MODIFIED_BY", nullable = false)
+  private String modifiedBy;
+
+  @Size(max = 2048)
+  @Column(length = 2048)
+  private String comments;
+
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "beamAuthorization", fetch = FetchType.EAGER)
+  private List<BeamDestinationAuthorization> beamDestinationAuthorizationList;
+
+  public BeamAuthorization() {}
+
+  public BigInteger getBeamAuthorizationId() {
+    return beamAuthorizationId;
+  }
+
+  public void setBeamAuthorizationId(BigInteger beamAuthorizationId) {
+    this.beamAuthorizationId = beamAuthorizationId;
+  }
+
+  public Date getAuthorizationDate() {
+    return authorizationDate;
+  }
+
+  public void setAuthorizationDate(Date authorizationDate) {
+    this.authorizationDate = authorizationDate;
+  }
+
+  public Date getModifiedDate() {
+    return modifiedDate;
+  }
+
+  public void setModifiedDate(Date modifiedDate) {
+    this.modifiedDate = modifiedDate;
+  }
+
+  public String getAuthorizedBy() {
+    return authorizedBy;
+  }
+
+  public void setAuthorizedBy(String authorizedBy) {
+    this.authorizedBy = authorizedBy;
+  }
+
+  public String getModifiedBy() {
+    return modifiedBy;
+  }
+
+  public void setModifiedBy(String modifiedBy) {
+    this.modifiedBy = modifiedBy;
+  }
+
+  public String getComments() {
+    return comments;
+  }
+
+  public void setComments(String comments) {
+    this.comments = comments;
+  }
+
+  public List<BeamDestinationAuthorization> getDestinationAuthorizationList() {
+    return beamDestinationAuthorizationList;
+  }
+
+  public void setDestinationAuthorizationList(
+      List<BeamDestinationAuthorization> beamDestinationAuthorizationList) {
+    this.beamDestinationAuthorizationList = beamDestinationAuthorizationList;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 0;
+    hash += (beamAuthorizationId != null ? beamAuthorizationId.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    // TODO: Warning - this method won't work in the case the id fields are not set
+    if (!(object instanceof BeamAuthorization)) {
+      return false;
+    }
+    BeamAuthorization other = (BeamAuthorization) object;
+    return (this.beamAuthorizationId != null || other.beamAuthorizationId == null)
+        && (this.beamAuthorizationId == null
+            || this.beamAuthorizationId.equals(other.beamAuthorizationId));
+  }
+
+  @Override
+  public String toString() {
+    return "org.jlab.jam.persistence.entity.BeamAuthorization[beamAuthorizationId="
+        + beamAuthorizationId
+        + " ]";
+  }
+
+  public BeamAuthorization createAdminClone() {
+    BeamAuthorization other = new BeamAuthorization();
+    other.authorizationDate = this.authorizationDate;
+    other.authorizedBy = this.authorizedBy;
+    other.comments = this.comments;
+    other.setModifiedBy("jam-admin");
+    other.setModifiedDate(new Date());
+    return other;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/ControlVerification.java b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java
similarity index 60%
rename from src/main/java/org/jlab/jam/persistence/entity/ControlVerification.java
rename to src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java
index b83599d..948e5ed 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/ControlVerification.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerification.java
@@ -12,23 +12,25 @@
  * @author ryans
  */
 @Entity
-@Table(name = "CONTROL_VERIFICATION", schema = "JAM_OWNER")
+@Table(name = "BEAM_CONTROL_VERIFICATION", schema = "JAM_OWNER")
 @NamedQueries({
-  @NamedQuery(name = "ControlVerification.findAll", query = "SELECT c FROM ControlVerification c")
+  @NamedQuery(
+      name = "BeamControlVerification.findAll",
+      query = "SELECT c FROM BeamControlVerification c")
 })
-public class ControlVerification implements Serializable, Comparable<ControlVerification> {
+public class BeamControlVerification implements Serializable, Comparable<BeamControlVerification> {
   private static final long serialVersionUID = 1L;
 
   @Id
   @SequenceGenerator(
-      name = "ControlVerificationId",
-      sequenceName = "CONTROL_VERIFICATION_ID",
+      name = "BeamControlVerificationId",
+      sequenceName = "BEAM_CONTROL_VERIFICATION_ID",
       allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "ControlVerificationId")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "BeamControlVerificationId")
   @Basic(optional = false)
   @NotNull
-  @Column(name = "CONTROL_VERIFICATION_ID", nullable = false, precision = 22, scale = 0)
-  private BigInteger controlVerificationId;
+  @Column(name = "BEAM_CONTROL_VERIFICATION_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger beamControlVerificationId;
 
   @NotNull
   @JoinColumn(name = "BEAM_DESTINATION_ID", referencedColumnName = "BEAM_DESTINATION_ID")
@@ -36,9 +38,9 @@ public class ControlVerification implements Serializable, Comparable<ControlVeri
   private BeamDestination beamDestination;
 
   @Basic(optional = false)
-  @Column(name = "VERIFICATION_ID")
+  @Column(name = "VERIFICATION_STATUS_ID")
   @NotNull
-  private Integer verificationId;
+  private Integer verificationStatusId;
 
   @Column(name = "MODIFIED_BY", nullable = false)
   private String modifiedBy;
@@ -64,8 +66,8 @@ public class ControlVerification implements Serializable, Comparable<ControlVeri
   @Column(length = 2048)
   private String comments;
 
-  @OneToMany(mappedBy = "controlVerification", fetch = FetchType.LAZY)
-  private List<VerificationHistory> verificationHistoryList;
+  @OneToMany(mappedBy = "beamControlVerification", fetch = FetchType.LAZY)
+  private List<BeamControlVerificationHistory> beamControlVerificationHistoryList;
 
   @JoinColumn(name = "CREDITED_CONTROL_ID", referencedColumnName = "CREDITED_CONTROL_ID")
   @ManyToOne(fetch = FetchType.LAZY)
@@ -73,19 +75,19 @@ public class ControlVerification implements Serializable, Comparable<ControlVeri
 
   @ManyToMany(fetch = FetchType.EAGER)
   @JoinTable(
-      name = "VERIFICATION_COMPONENT",
-      joinColumns = @JoinColumn(name = "CONTROL_VERIFICATION_ID"),
+      name = "BEAM_CONTROL_VERIFICATION_COMPONENT",
+      joinColumns = @JoinColumn(name = "BEAM_CONTROL_VERIFICATION_ID"),
       inverseJoinColumns = @JoinColumn(name = "COMPONENT_ID"))
   private List<Component> componentList;
 
-  public ControlVerification() {}
+  public BeamControlVerification() {}
 
-  public BigInteger getControlVerificationId() {
-    return controlVerificationId;
+  public BigInteger getBeamControlVerificationId() {
+    return beamControlVerificationId;
   }
 
-  public void setControlVerificationId(BigInteger controlVerificationId) {
-    this.controlVerificationId = controlVerificationId;
+  public void setBeamControlVerificationId(BigInteger beamControlVerificationId) {
+    this.beamControlVerificationId = beamControlVerificationId;
   }
 
   public String getModifiedBy() {
@@ -112,12 +114,12 @@ public void setBeamDestination(BeamDestination beamDestination) {
     this.beamDestination = beamDestination;
   }
 
-  public Integer getVerificationId() {
-    return verificationId;
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
   }
 
-  public void setVerificationId(Integer verificationId) {
-    this.verificationId = verificationId;
+  public void setVerificationStatusId(Integer verificationStatusId) {
+    this.verificationStatusId = verificationStatusId;
   }
 
   public Date getVerificationDate() {
@@ -152,12 +154,13 @@ public void setComments(String comments) {
     this.comments = comments;
   }
 
-  public List<VerificationHistory> getVerificationHistoryList() {
-    return verificationHistoryList;
+  public List<BeamControlVerificationHistory> getVerificationHistoryList() {
+    return beamControlVerificationHistoryList;
   }
 
-  public void setVerificationHistoryList(List<VerificationHistory> verificationHistoryList) {
-    this.verificationHistoryList = verificationHistoryList;
+  public void setVerificationHistoryList(
+      List<BeamControlVerificationHistory> beamControlVerificationHistoryList) {
+    this.beamControlVerificationHistoryList = beamControlVerificationHistoryList;
   }
 
   public CreditedControl getCreditedControl() {
@@ -179,31 +182,31 @@ public void setComponentList(List<Component> componentList) {
   @Override
   public int hashCode() {
     int hash = 0;
-    hash += (controlVerificationId != null ? controlVerificationId.hashCode() : 0);
+    hash += (beamControlVerificationId != null ? beamControlVerificationId.hashCode() : 0);
     return hash;
   }
 
   @Override
   public boolean equals(Object object) {
     // TODO: Warning - this method won't work in the case the id fields are not set
-    if (!(object instanceof ControlVerification)) {
+    if (!(object instanceof BeamControlVerification)) {
       return false;
     }
-    ControlVerification other = (ControlVerification) object;
-    return (this.controlVerificationId != null || other.controlVerificationId == null)
-        && (this.controlVerificationId == null
-            || this.controlVerificationId.equals(other.controlVerificationId));
+    BeamControlVerification other = (BeamControlVerification) object;
+    return (this.beamControlVerificationId != null || other.beamControlVerificationId == null)
+        && (this.beamControlVerificationId == null
+            || this.beamControlVerificationId.equals(other.beamControlVerificationId));
   }
 
   @Override
   public String toString() {
-    return "org.jlab.beamauth.persistence.entity.ControlVerification[ controlVerificationId="
-        + controlVerificationId
+    return "org.jlab.jam.persistence.entity.BeamControlVerification[ beamControlVerificationId="
+        + beamControlVerificationId
         + " ]";
   }
 
   @Override
-  public int compareTo(ControlVerification o) {
+  public int compareTo(BeamControlVerification o) {
     return this.beamDestination.getWeight().compareTo(o.beamDestination.getWeight());
   }
 }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/VerificationHistory.java b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java
similarity index 55%
rename from src/main/java/org/jlab/jam/persistence/entity/VerificationHistory.java
rename to src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java
index 7d49046..603cc0a 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/VerificationHistory.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamControlVerificationHistory.java
@@ -22,24 +22,30 @@
  * @author ryans
  */
 @Entity
-@Table(name = "VERIFICATION_HISTORY", schema = "JAM_OWNER")
-public class VerificationHistory implements Serializable {
+@Table(name = "BEAM_CONTROL_VERIFICATION_HISTORY", schema = "JAM_OWNER")
+public class BeamControlVerificationHistory implements Serializable {
   private static final long serialVersionUID = 1L;
 
   @Id
   @SequenceGenerator(
-      name = "VerificationHistoryId",
-      sequenceName = "VERIFICATION_HISTORY_ID",
+      name = "BeamControlVerificationHistoryId",
+      sequenceName = "BEAM_CONTROL_VERIFICATION_HISTORY_ID",
       allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "VerificationHistoryId")
+  @GeneratedValue(
+      strategy = GenerationType.SEQUENCE,
+      generator = "BeamControlVerificationHistoryId")
   @Basic(optional = false)
   @NotNull
-  @Column(name = "VERIFICATION_HISTORY_ID", nullable = false, precision = 22, scale = 0)
-  private BigInteger verificationHistoryId;
-
-  @Column(name = "VERIFICATION_ID")
+  @Column(
+      name = "BEAM_CONTROL_VERIFICATION_HISTORY_ID",
+      nullable = false,
+      precision = 22,
+      scale = 0)
+  private BigInteger beamControlVerificationHistoryId;
+
+  @Column(name = "VERIFICATION_STATUS_ID")
   @NotNull
-  private Integer verificationId;
+  private Integer verificationStatusId;
 
   @Column(name = "MODIFIED_BY", nullable = false)
   private String modifiedBy;
@@ -68,26 +74,28 @@ public class VerificationHistory implements Serializable {
   @Column(name = "COMMENTS", nullable = true)
   private String comments;
 
-  @JoinColumn(name = "CONTROL_VERIFICATION_ID", referencedColumnName = "CONTROL_VERIFICATION_ID")
+  @JoinColumn(
+      name = "BEAM_CONTROL_VERIFICATION_ID",
+      referencedColumnName = "BEAM_CONTROL_VERIFICATION_ID")
   @ManyToOne(optional = false, fetch = FetchType.LAZY)
-  private ControlVerification controlVerification;
+  private BeamControlVerification beamControlVerification;
 
-  public VerificationHistory() {}
+  public BeamControlVerificationHistory() {}
 
-  public BigInteger getVerificationHistoryId() {
-    return verificationHistoryId;
+  public BigInteger getBeamControlVerificationHistoryId() {
+    return beamControlVerificationHistoryId;
   }
 
-  public void setVerificationHistoryId(BigInteger verificationHistoryId) {
-    this.verificationHistoryId = verificationHistoryId;
+  public void setBeamControlVerificationHistoryId(BigInteger beamControlVerificationHistoryId) {
+    this.beamControlVerificationHistoryId = beamControlVerificationHistoryId;
   }
 
-  public Integer getVerificationId() {
-    return verificationId;
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
   }
 
-  public void setVerificationId(Integer verificationId) {
-    this.verificationId = verificationId;
+  public void setVerificationStatusId(Integer verificationStatusId) {
+    this.verificationStatusId = verificationStatusId;
   }
 
   public String getModifiedBy() {
@@ -138,37 +146,42 @@ public void setComments(String comments) {
     this.comments = comments;
   }
 
-  public ControlVerification getControlVerification() {
-    return controlVerification;
+  public BeamControlVerification getBeamControlVerification() {
+    return beamControlVerification;
   }
 
-  public void setControlVerification(ControlVerification controlVerificationId) {
-    this.controlVerification = controlVerificationId;
+  public void setBeamControlVerification(BeamControlVerification beamControlVerificationId) {
+    this.beamControlVerification = beamControlVerificationId;
   }
 
   @Override
   public int hashCode() {
     int hash = 0;
-    hash += (verificationHistoryId != null ? verificationHistoryId.hashCode() : 0);
+    hash +=
+        (beamControlVerificationHistoryId != null
+            ? beamControlVerificationHistoryId.hashCode()
+            : 0);
     return hash;
   }
 
   @Override
   public boolean equals(Object object) {
     // TODO: Warning - this method won't work in the case the id fields are not set
-    if (!(object instanceof VerificationHistory)) {
+    if (!(object instanceof BeamControlVerificationHistory)) {
       return false;
     }
-    VerificationHistory other = (VerificationHistory) object;
-    return (this.verificationHistoryId != null || other.verificationHistoryId == null)
-        && (this.verificationHistoryId == null
-            || this.verificationHistoryId.equals(other.verificationHistoryId));
+    BeamControlVerificationHistory other = (BeamControlVerificationHistory) object;
+    return (this.beamControlVerificationHistoryId != null
+            || other.beamControlVerificationHistoryId == null)
+        && (this.beamControlVerificationHistoryId == null
+            || this.beamControlVerificationHistoryId.equals(
+                other.beamControlVerificationHistoryId));
   }
 
   @Override
   public String toString() {
-    return "org.jlab.beamauth.persistence.entity.VerificationHistory[ verificationHistoryId="
-        + verificationHistoryId
+    return "org.jlab.jam.persistence.entity.BeamControlVerificationHistory[ beamControlVerificationHistoryId="
+        + beamControlVerificationHistoryId
         + " ]";
   }
 }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
index 3d50124..e3c3922 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestination.java
@@ -40,12 +40,12 @@ public class BeamDestination {
   private String name;
 
   @OneToMany(mappedBy = "beamDestination", fetch = FetchType.LAZY)
-  private List<ControlVerification> controlVerificationList;
+  private List<BeamControlVerification> beamControlVerificationList;
 
   private BigInteger weight;
 
-  public List<ControlVerification> getControlVerificationList() {
-    return controlVerificationList;
+  public List<BeamControlVerification> getBeamControlVerificationList() {
+    return beamControlVerificationList;
   }
 
   public String getName() {
diff --git a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
similarity index 75%
rename from src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorization.java
rename to src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
index 0bd683b..01fb78c 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
@@ -23,13 +23,13 @@
  * @author ryans
  */
 @Entity
-@Table(name = "DESTINATION_AUTHORIZATION", schema = "JAM_OWNER")
+@Table(name = "BEAM_DESTINATION_AUTHORIZATION", schema = "JAM_OWNER")
 @NamedQueries({
   @NamedQuery(
-      name = "DestinationAuthorization.findAll",
-      query = "SELECT d FROM DestinationAuthorization d")
+      name = "BeamDestinationAuthorization.findAll",
+      query = "SELECT d FROM BeamDestinationAuthorization d")
 })
-public class DestinationAuthorization implements Serializable {
+public class BeamDestinationAuthorization implements Serializable {
 
   private static final long serialVersionUID = 1L;
   @EmbeddedId protected DestinationAuthorizationPK destinationAuthorizationPK;
@@ -62,27 +62,27 @@ public class DestinationAuthorization implements Serializable {
   private BeamDestination destination;
 
   @JoinColumn(
-      name = "AUTHORIZATION_ID",
-      referencedColumnName = "AUTHORIZATION_ID",
+      name = "BEAM_AUTHORIZATION_ID",
+      referencedColumnName = "BEAM_AUTHORIZATION_ID",
       nullable = false,
       insertable = false,
       updatable = false)
   @ManyToOne(optional = false, fetch = FetchType.LAZY)
-  private Authorization authorization;
+  private BeamAuthorization beamAuthorization;
 
-  public DestinationAuthorization() {}
+  public BeamDestinationAuthorization() {}
 
-  public DestinationAuthorization(DestinationAuthorizationPK destinationAuthorizationPK) {
+  public BeamDestinationAuthorization(DestinationAuthorizationPK destinationAuthorizationPK) {
     this.destinationAuthorizationPK = destinationAuthorizationPK;
   }
 
-  public DestinationAuthorization(
+  public BeamDestinationAuthorization(
       DestinationAuthorizationPK destinationAuthorizationPK, String beamMode) {
     this.destinationAuthorizationPK = destinationAuthorizationPK;
     this.beamMode = beamMode;
   }
 
-  public DestinationAuthorization(BigInteger beamDestinationId, BigInteger authorizationId) {
+  public BeamDestinationAuthorization(BigInteger beamDestinationId, BigInteger authorizationId) {
     this.destinationAuthorizationPK =
         new DestinationAuthorizationPK(beamDestinationId, authorizationId);
   }
@@ -131,12 +131,12 @@ public void setExpirationDate(Date expirationDate) {
     this.expirationDate = expirationDate;
   }
 
-  public Authorization getAuthorization() {
-    return authorization;
+  public BeamAuthorization getAuthorization() {
+    return beamAuthorization;
   }
 
-  public void setAuthorization(Authorization authorization) {
-    this.authorization = authorization;
+  public void setAuthorization(BeamAuthorization beamAuthorization) {
+    this.beamAuthorization = beamAuthorization;
   }
 
   @Override
@@ -149,10 +149,10 @@ public int hashCode() {
   @Override
   public boolean equals(Object object) {
     // TODO: Warning - this method won't work in the case the id fields are not set
-    if (!(object instanceof DestinationAuthorization)) {
+    if (!(object instanceof BeamDestinationAuthorization)) {
       return false;
     }
-    DestinationAuthorization other = (DestinationAuthorization) object;
+    BeamDestinationAuthorization other = (BeamDestinationAuthorization) object;
     return (this.destinationAuthorizationPK != null || other.destinationAuthorizationPK == null)
         && (this.destinationAuthorizationPK == null
             || this.destinationAuthorizationPK.equals(other.destinationAuthorizationPK));
@@ -160,14 +160,14 @@ public boolean equals(Object object) {
 
   @Override
   public String toString() {
-    return "org.jlab.beamauth.persistence.entity.DestinationAuthorization[ destinationAuthorizationPK="
+    return "org.jlab.jam.persistence.entity.BeamDestinationAuthorization[destinationAuthorizationPK="
         + destinationAuthorizationPK
         + " ]";
   }
 
-  public DestinationAuthorization createAdminClone(Authorization authClone) {
-    DestinationAuthorization other = new DestinationAuthorization();
-    other.authorization = authClone;
+  public BeamDestinationAuthorization createAdminClone(BeamAuthorization authClone) {
+    BeamDestinationAuthorization other = new BeamDestinationAuthorization();
+    other.beamAuthorization = authClone;
     other.beamMode = this.beamMode;
     other.comments = this.comments;
     other.cwLimit = this.cwLimit;
diff --git a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
index 10b7b9f..623d3f7 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
@@ -61,7 +61,7 @@ public class CreditedControl implements Serializable, Comparable<CreditedControl
   private String comments;
 
   @OneToMany(mappedBy = "creditedControl", fetch = FetchType.LAZY)
-  private List<ControlVerification> controlVerificationList;
+  private List<BeamControlVerification> beamControlVerificationList;
 
   public CreditedControl() {}
 
@@ -125,18 +125,19 @@ public void setVerificationFrequency(String verificationFrequency) {
     this.verificationFrequency = verificationFrequency;
   }
 
-  public List<ControlVerification> getControlVerificationList() {
-    return controlVerificationList;
+  public List<BeamControlVerification> getBeamControlVerificationList() {
+    return beamControlVerificationList;
   }
 
-  public void setControlVerificationList(List<ControlVerification> controlVerificationList) {
-    this.controlVerificationList = controlVerificationList;
+  public void setBeamControlVerificationList(
+      List<BeamControlVerification> beamControlVerificationList) {
+    this.beamControlVerificationList = beamControlVerificationList;
   }
 
   public boolean hasBeamDestination(BeamDestination destination) {
     boolean hasDestination = false;
-    if (controlVerificationList != null) {
-      for (ControlVerification verification : controlVerificationList) {
+    if (beamControlVerificationList != null) {
+      for (BeamControlVerification verification : beamControlVerificationList) {
         if (verification.getBeamDestination().equals(destination)) {
           hasDestination = true;
           break;
diff --git a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java b/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java
index dcc74d6..80bc7e5 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/DestinationAuthorizationPK.java
@@ -19,14 +19,14 @@ public class DestinationAuthorizationPK implements Serializable {
 
   @Basic(optional = false)
   @NotNull
-  @Column(name = "AUTHORIZATION_ID", nullable = false)
-  private BigInteger authorizationId;
+  @Column(name = "BEAM_AUTHORIZATION_ID", nullable = false)
+  private BigInteger beamAuthorizationId;
 
   public DestinationAuthorizationPK() {}
 
-  public DestinationAuthorizationPK(BigInteger beamDestinationId, BigInteger authorizationId) {
+  public DestinationAuthorizationPK(BigInteger beamDestinationId, BigInteger beamAuthorizationId) {
     this.beamDestinationId = beamDestinationId;
-    this.authorizationId = authorizationId;
+    this.beamAuthorizationId = beamAuthorizationId;
   }
 
   public BigInteger getBeamDestinationId() {
@@ -37,19 +37,19 @@ public void setBeamDestinationId(BigInteger beamDestinationId) {
     this.beamDestinationId = beamDestinationId;
   }
 
-  public BigInteger getAuthorizationId() {
-    return authorizationId;
+  public BigInteger getBeamAuthorizationId() {
+    return beamAuthorizationId;
   }
 
-  public void setAuthorizationId(BigInteger authorizationId) {
-    this.authorizationId = authorizationId;
+  public void setAuthorizationId(BigInteger beamAuthorizationId) {
+    this.beamAuthorizationId = beamAuthorizationId;
   }
 
   @Override
   public int hashCode() {
     int hash = 0;
     hash += (beamDestinationId != null ? beamDestinationId.hashCode() : 0);
-    hash += (authorizationId != null ? authorizationId.hashCode() : 0);
+    hash += (beamAuthorizationId != null ? beamAuthorizationId.hashCode() : 0);
     return hash;
   }
 
@@ -65,16 +65,17 @@ public boolean equals(Object object) {
             && !this.beamDestinationId.equals(other.beamDestinationId))) {
       return false;
     }
-    return (this.authorizationId != null || other.authorizationId == null)
-        && (this.authorizationId == null || this.authorizationId.equals(other.authorizationId));
+    return (this.beamAuthorizationId != null || other.beamAuthorizationId == null)
+        && (this.beamAuthorizationId == null
+            || this.beamAuthorizationId.equals(other.beamAuthorizationId));
   }
 
   @Override
   public String toString() {
-    return "org.jlab.beamauth.persistence.entity.DestinationAuthorizationPK[ beamDestinationId="
+    return "org.jlab.jam.persistence.entity.DestinationAuthorizationPK[ beamDestinationId="
         + beamDestinationId
-        + ", authorizationId="
-        + authorizationId
+        + ", beamAuthorizationId="
+        + beamAuthorizationId
         + " ]";
   }
 }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/Authorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
similarity index 65%
rename from src/main/java/org/jlab/jam/persistence/entity/Authorization.java
rename to src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
index 4122905..132e145 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/Authorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
@@ -28,21 +28,21 @@
 @Entity
 @Table(schema = "JAM_OWNER")
 @NamedQueries({
-  @NamedQuery(name = "Authorization.findAll", query = "SELECT a FROM Authorization a")
+  @NamedQuery(name = "RFAuthorization.findAll", query = "SELECT a FROM RFAuthorization a")
 })
-public class Authorization implements Serializable {
+public class RFAuthorization implements Serializable {
   private static final long serialVersionUID = 1L;
 
   @Id
   @SequenceGenerator(
-      name = "AuthorizationId",
-      sequenceName = "AUTHORIZATION_ID",
+      name = "RFAuthorizationId",
+      sequenceName = "RF_AUTHORIZATION_ID",
       allocationSize = 1)
-  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "AuthorizationId")
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "RFAuthorizationId")
   @Basic(optional = false)
   @NotNull
-  @Column(name = "AUTHORIZATION_ID", nullable = false, precision = 22, scale = 0)
-  private BigInteger authorizationId;
+  @Column(name = "RF_AUTHORIZATION_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger rfAuthorizationId;
 
   @Basic(optional = false)
   @NotNull
@@ -68,17 +68,17 @@ public class Authorization implements Serializable {
   @Column(length = 2048)
   private String comments;
 
-  @OneToMany(cascade = CascadeType.ALL, mappedBy = "authorization", fetch = FetchType.EAGER)
-  private List<DestinationAuthorization> destinationAuthorizationList;
+  @OneToMany(cascade = CascadeType.ALL, mappedBy = "rfAuthorization", fetch = FetchType.EAGER)
+  private List<RFSegmentAuthorization> rfSegmentAuthorizationList;
 
-  public Authorization() {}
+  public RFAuthorization() {}
 
-  public BigInteger getAuthorizationId() {
-    return authorizationId;
+  public BigInteger getRfAuthorizationId() {
+    return rfAuthorizationId;
   }
 
-  public void setAuthorizationId(BigInteger authorizationId) {
-    this.authorizationId = authorizationId;
+  public void setRfAuthorizationId(BigInteger rfAuthorizationId) {
+    this.rfAuthorizationId = rfAuthorizationId;
   }
 
   public Date getAuthorizationDate() {
@@ -121,42 +121,43 @@ public void setComments(String comments) {
     this.comments = comments;
   }
 
-  public List<DestinationAuthorization> getDestinationAuthorizationList() {
-    return destinationAuthorizationList;
+  public List<RFSegmentAuthorization> getRFSegmentAuthorizationList() {
+    return rfSegmentAuthorizationList;
   }
 
-  public void setDestinationAuthorizationList(
-      List<DestinationAuthorization> destinationAuthorizationList) {
-    this.destinationAuthorizationList = destinationAuthorizationList;
+  public void setRFSegmentAuthorizationList(
+      List<RFSegmentAuthorization> rfSegmentAuthorizationList) {
+    this.rfSegmentAuthorizationList = rfSegmentAuthorizationList;
   }
 
   @Override
   public int hashCode() {
     int hash = 0;
-    hash += (authorizationId != null ? authorizationId.hashCode() : 0);
+    hash += (rfAuthorizationId != null ? rfAuthorizationId.hashCode() : 0);
     return hash;
   }
 
   @Override
   public boolean equals(Object object) {
     // TODO: Warning - this method won't work in the case the id fields are not set
-    if (!(object instanceof Authorization)) {
+    if (!(object instanceof RFAuthorization)) {
       return false;
     }
-    Authorization other = (Authorization) object;
-    return (this.authorizationId != null || other.authorizationId == null)
-        && (this.authorizationId == null || this.authorizationId.equals(other.authorizationId));
+    RFAuthorization other = (RFAuthorization) object;
+    return (this.rfAuthorizationId != null || other.rfAuthorizationId == null)
+        && (this.rfAuthorizationId == null
+            || this.rfAuthorizationId.equals(other.rfAuthorizationId));
   }
 
   @Override
   public String toString() {
-    return "org.jlab.beamauth.persistence.entity.Authorization[ authorizationId="
-        + authorizationId
+    return "org.jlab.jam.persistence.entity.RFAuthorization[rfAuthorizationId="
+        + rfAuthorizationId
         + " ]";
   }
 
-  public Authorization createAdminClone() {
-    Authorization other = new Authorization();
+  public RFAuthorization createAdminClone() {
+    RFAuthorization other = new RFAuthorization();
     other.authorizationDate = this.authorizationDate;
     other.authorizedBy = this.authorizedBy;
     other.comments = this.comments;
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java
new file mode 100644
index 0000000..5f01049
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerification.java
@@ -0,0 +1,212 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import java.util.List;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "RF_CONTROL_VERIFICATION", schema = "JAM_OWNER")
+@NamedQueries({
+  @NamedQuery(
+      name = "RFControlVerification.findAll",
+      query = "SELECT c FROM RFControlVerification c")
+})
+public class RFControlVerification implements Serializable, Comparable<RFControlVerification> {
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @SequenceGenerator(
+      name = "RFControlVerificationId",
+      sequenceName = "RF_CONTROL_VERIFICATION_ID",
+      allocationSize = 1)
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "RFControlVerificationId")
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "RF_CONTROL_VERIFICATION_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger rfControlVerificationId;
+
+  @NotNull
+  @JoinColumn(name = "RF_SEGMENT_ID", referencedColumnName = "RF_SEGMENT_ID")
+  @ManyToOne(fetch = FetchType.EAGER)
+  private RFSegment rfSegment;
+
+  @Basic(optional = false)
+  @Column(name = "VERIFICATION_STATUS_ID")
+  @NotNull
+  private Integer verificationStatusId;
+
+  @Column(name = "MODIFIED_BY", nullable = false)
+  private String modifiedBy;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "MODIFIED_DATE", nullable = false)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date modifiedDate;
+
+  @Column(name = "VERIFICATION_DATE")
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date verificationDate;
+
+  @Column(name = "VERIFIED_BY", nullable = true)
+  private String verifiedBy;
+
+  @Column(name = "EXPIRATION_DATE")
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date expirationDate;
+
+  @Size(max = 2048)
+  @Column(length = 2048)
+  private String comments;
+
+  @OneToMany(mappedBy = "rfControlVerification", fetch = FetchType.LAZY)
+  private List<RFControlVerificationHistory> rfControlVerificationHistoryList;
+
+  @JoinColumn(name = "CREDITED_CONTROL_ID", referencedColumnName = "CREDITED_CONTROL_ID")
+  @ManyToOne(fetch = FetchType.LAZY)
+  private CreditedControl creditedControl;
+
+  @ManyToMany(fetch = FetchType.EAGER)
+  @JoinTable(
+      name = "RF_CONTROL_VERIFICATION_COMPONENT",
+      joinColumns = @JoinColumn(name = "RF_CONTROL_VERIFICATION_ID"),
+      inverseJoinColumns = @JoinColumn(name = "COMPONENT_ID"))
+  private List<Component> componentList;
+
+  public RFControlVerification() {}
+
+  public BigInteger getRFControlVerificationId() {
+    return rfControlVerificationId;
+  }
+
+  public void setRFControlVerificationId(BigInteger rfControlVerificationId) {
+    this.rfControlVerificationId = rfControlVerificationId;
+  }
+
+  public String getModifiedBy() {
+    return modifiedBy;
+  }
+
+  public void setModifiedBy(String modifiedBy) {
+    this.modifiedBy = modifiedBy;
+  }
+
+  public Date getModifiedDate() {
+    return modifiedDate;
+  }
+
+  public void setModifiedDate(Date modifiedDate) {
+    this.modifiedDate = modifiedDate;
+  }
+
+  public RFSegment getRFSegment() {
+    return rfSegment;
+  }
+
+  public void setRFSegment(RFSegment rfSegment) {
+    this.rfSegment = rfSegment;
+  }
+
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
+  }
+
+  public void setVerificationStatusId(Integer verificationStatusId) {
+    this.verificationStatusId = verificationStatusId;
+  }
+
+  public Date getVerificationDate() {
+    return verificationDate;
+  }
+
+  public void setVerificationDate(Date verificationDate) {
+    this.verificationDate = verificationDate;
+  }
+
+  public String getVerifiedBy() {
+    return verifiedBy;
+  }
+
+  public void setVerifiedBy(String verifiedBy) {
+    this.verifiedBy = verifiedBy;
+  }
+
+  public Date getExpirationDate() {
+    return expirationDate;
+  }
+
+  public void setExpirationDate(Date expirationDate) {
+    this.expirationDate = expirationDate;
+  }
+
+  public String getComments() {
+    return comments;
+  }
+
+  public void setComments(String comments) {
+    this.comments = comments;
+  }
+
+  public List<RFControlVerificationHistory> getRFControlVerificationHistoryList() {
+    return rfControlVerificationHistoryList;
+  }
+
+  public void setRFControlVerificationHistoryList(
+      List<RFControlVerificationHistory> rfControlVerificationHistoryList) {
+    this.rfControlVerificationHistoryList = rfControlVerificationHistoryList;
+  }
+
+  public CreditedControl getCreditedControl() {
+    return creditedControl;
+  }
+
+  public void setCreditedControl(CreditedControl creditedControl) {
+    this.creditedControl = creditedControl;
+  }
+
+  public List<Component> getComponentList() {
+    return componentList;
+  }
+
+  public void setComponentList(List<Component> componentList) {
+    this.componentList = componentList;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 0;
+    hash += (rfControlVerificationId != null ? rfControlVerificationId.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    // TODO: Warning - this method won't work in the case the id fields are not set
+    if (!(object instanceof RFControlVerification)) {
+      return false;
+    }
+    RFControlVerification other = (RFControlVerification) object;
+    return (this.rfControlVerificationId != null || other.rfControlVerificationId == null)
+        && (this.rfControlVerificationId == null
+            || this.rfControlVerificationId.equals(other.rfControlVerificationId));
+  }
+
+  @Override
+  public String toString() {
+    return "org.jlab.jam.persistence.entity.RFControlVerification[ rfControlVerificationId="
+        + rfControlVerificationId
+        + " ]";
+  }
+
+  @Override
+  public int compareTo(RFControlVerification o) {
+    return this.rfSegment.getWeight().compareTo(o.rfSegment.getWeight());
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java
new file mode 100644
index 0000000..50e5405
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFControlVerificationHistory.java
@@ -0,0 +1,166 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "RF_CONTROL_VERIFICATION_HISTORY", schema = "JAM_OWNER")
+public class RFControlVerificationHistory implements Serializable {
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @SequenceGenerator(
+      name = "RFControlVerificationHistoryId",
+      sequenceName = "RF_CONTROL_VERIFICATION_HISTORY_ID",
+      allocationSize = 1)
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "RFControlVerificationHistoryId")
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "RF_CONTROL_VERIFICATION_HISTORY_ID", nullable = false, precision = 22, scale = 0)
+  private BigInteger rfControlVerificationHistoryId;
+
+  @Column(name = "VERIFICATION_STATUS_ID")
+  @NotNull
+  private Integer verificationStatusId;
+
+  @Column(name = "MODIFIED_BY", nullable = false)
+  private String modifiedBy;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "MODIFIED_DATE", nullable = false)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date modifiedDate;
+
+  @Column(name = "VERIFIED_BY", nullable = true)
+  private String verifiedBy;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "VERIFICATION_DATE", nullable = false)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date verificationDate;
+
+  @Basic(optional = true)
+  @Column(name = "EXPIRATION_DATE", nullable = true)
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date expirationDate;
+
+  @Basic(optional = true)
+  @Column(name = "COMMENTS", nullable = true)
+  private String comments;
+
+  @JoinColumn(
+      name = "RF_CONTROL_VERIFICATION_ID",
+      referencedColumnName = "RF_CONTROL_VERIFICATION_ID")
+  @ManyToOne(optional = false, fetch = FetchType.LAZY)
+  private RFControlVerification rfControlVerification;
+
+  public RFControlVerificationHistory() {}
+
+  public BigInteger getRFControlVerificationHistoryId() {
+    return rfControlVerificationHistoryId;
+  }
+
+  public void setRFControlVerificationHistoryId(BigInteger rfControlVerificationHistoryId) {
+    this.rfControlVerificationHistoryId = rfControlVerificationHistoryId;
+  }
+
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
+  }
+
+  public void setVerificationStatusId(Integer verificationStatusId) {
+    this.verificationStatusId = verificationStatusId;
+  }
+
+  public String getModifiedBy() {
+    return modifiedBy;
+  }
+
+  public void setModifiedBy(String modifiedBy) {
+    this.modifiedBy = modifiedBy;
+  }
+
+  public Date getModifiedDate() {
+    return modifiedDate;
+  }
+
+  public void setModifiedDate(Date modifiedDate) {
+    this.modifiedDate = modifiedDate;
+  }
+
+  public String getVerifiedBy() {
+    return verifiedBy;
+  }
+
+  public void setVerifiedBy(String verifiedBy) {
+    this.verifiedBy = verifiedBy;
+  }
+
+  public Date getVerificationDate() {
+    return verificationDate;
+  }
+
+  public void setVerificationDate(Date verificationDate) {
+    this.verificationDate = verificationDate;
+  }
+
+  public Date getExpirationDate() {
+    return expirationDate;
+  }
+
+  public void setExpirationDate(Date expirationDate) {
+    this.expirationDate = expirationDate;
+  }
+
+  public String getComments() {
+    return comments;
+  }
+
+  public void setComments(String comments) {
+    this.comments = comments;
+  }
+
+  public RFControlVerification getRFControlVerification() {
+    return rfControlVerification;
+  }
+
+  public void setRFControlVerification(RFControlVerification rfControlVerificationId) {
+    this.rfControlVerification = rfControlVerificationId;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 0;
+    hash +=
+        (rfControlVerificationHistoryId != null ? rfControlVerificationHistoryId.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    // TODO: Warning - this method won't work in the case the id fields are not set
+    if (!(object instanceof RFControlVerificationHistory)) {
+      return false;
+    }
+    RFControlVerificationHistory other = (RFControlVerificationHistory) object;
+    return (this.rfControlVerificationHistoryId != null
+            || other.rfControlVerificationHistoryId == null)
+        && (this.rfControlVerificationHistoryId == null
+            || this.rfControlVerificationHistoryId.equals(other.rfControlVerificationHistoryId));
+  }
+
+  @Override
+  public String toString() {
+    return "org.jlab.jam.persistence.entity.RFControlVerificationHistory[ rfControlVerificationHistoryId="
+        + rfControlVerificationHistoryId
+        + " ]";
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
new file mode 100644
index 0000000..2f563e8
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
@@ -0,0 +1,125 @@
+package org.jlab.jam.persistence.entity;
+
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Objects;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+import org.jlab.smoothness.persistence.util.YnStringToBoolean;
+
+@Entity
+@Table(name = "RF_SEGMENT", schema = "JAM_OWNER")
+public class RFSegment {
+
+  @Id
+  @Column(name = "RF_SEGMENT_ID", nullable = false, precision = 0)
+  private BigInteger rfSegmentId;
+
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
+  @Basic
+  @Column(name = "ACTIVE_YN", nullable = false, length = 1)
+  @Convert(converter = YnStringToBoolean.class)
+  private boolean active;
+
+  @OneToOne(fetch = FetchType.EAGER)
+  @JoinColumn(name = "RF_SEGMENT_ID")
+  private RFControlVerification verification;
+
+  @Size(max = 128)
+  @Column(length = 128)
+  private String name;
+
+  @OneToMany(mappedBy = "rfSegment", fetch = FetchType.LAZY)
+  private List<RFControlVerification> rfControlVerificationList;
+
+  private BigInteger weight;
+
+  public List<RFControlVerification> getRFControlVerificationList() {
+    return rfControlVerificationList;
+  }
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public BigInteger getWeight() {
+    return weight;
+  }
+
+  public void setWeight(BigInteger weight) {
+    this.weight = weight;
+  }
+
+  public RFControlVerification getVerification() {
+    return verification;
+  }
+
+  public BigInteger getRFSegmentId() {
+    return rfSegmentId;
+  }
+
+  public void setRFSegmentId(BigInteger rfSegmentId) {
+    this.rfSegmentId = rfSegmentId;
+  }
+
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
+  public boolean isActive() {
+    return active;
+  }
+
+  public void setActive(boolean active) {
+    this.active = active;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    RFSegment that = (RFSegment) o;
+    return Objects.equals(rfSegmentId, that.rfSegmentId)
+        && Objects.equals(facility, that.facility)
+        && Objects.equals(name, that.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(rfSegmentId, facility, name);
+  }
+
+  @Override
+  public String toString() {
+    return "BeamDestination{"
+        + "rfSegmentId="
+        + rfSegmentId
+        + ", facility='"
+        + facility
+        + ", active="
+        + active
+        + ", verification="
+        + verification
+        + ", name='"
+        + name
+        + '\''
+        +
+        // ", controlVerificationList=" + controlVerificationList +
+        ", weight="
+        + weight
+        + '}';
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
new file mode 100644
index 0000000..695d501
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
@@ -0,0 +1,158 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.EmbeddedId;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.NamedQueries;
+import javax.persistence.NamedQuery;
+import javax.persistence.Table;
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Size;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "RF_SEGMENT_AUTHORIZATION", schema = "JAM_OWNER")
+@NamedQueries({
+  @NamedQuery(
+      name = "RFSegmentAuthorization.findAll",
+      query = "SELECT d FROM RFSegmentAuthorization d")
+})
+public class RFSegmentAuthorization implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+  @EmbeddedId protected SegmentAuthorizationPK segmentAuthorizationPK;
+
+  @Basic(optional = false)
+  @NotNull
+  @Size(min = 1, max = 16)
+  @Column(name = "RF_MODE", nullable = false, length = 16)
+  private String rfMode;
+
+  @Basic(optional = true)
+  @Size(max = 256)
+  @Column(name = "COMMENTS", nullable = true, length = 256)
+  private String comments;
+
+  @Column(name = "EXPIRATION_DATE")
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date expirationDate;
+
+  @JoinColumn(
+      name = "RF_SEGMENT_ID",
+      referencedColumnName = "RF_SEGMENT_ID",
+      nullable = false,
+      insertable = false,
+      updatable = false)
+  @ManyToOne(optional = false, fetch = FetchType.LAZY)
+  private RFSegment segment;
+
+  @JoinColumn(
+      name = "RF_AUTHORIZATION_ID",
+      referencedColumnName = "RF_AUTHORIZATION_ID",
+      nullable = false,
+      insertable = false,
+      updatable = false)
+  @ManyToOne(optional = false, fetch = FetchType.LAZY)
+  private RFAuthorization rfAuthorization;
+
+  public RFSegmentAuthorization() {}
+
+  public RFSegmentAuthorization(SegmentAuthorizationPK segmentAuthorizationPK) {
+    this.segmentAuthorizationPK = segmentAuthorizationPK;
+  }
+
+  public RFSegmentAuthorization(BigInteger rfSegmentId, BigInteger rfAuthorizationId) {
+    this.segmentAuthorizationPK = new SegmentAuthorizationPK(rfSegmentId, rfAuthorizationId);
+  }
+
+  public SegmentAuthorizationPK getSegmentAuthorizationPK() {
+    return segmentAuthorizationPK;
+  }
+
+  public void setSegmentAuthorizationPK(SegmentAuthorizationPK segmentAuthorizationPK) {
+    this.segmentAuthorizationPK = segmentAuthorizationPK;
+  }
+
+  public RFSegment getSegment() {
+    return segment;
+  }
+
+  public String getRFMode() {
+    return rfMode;
+  }
+
+  public void setRFMode(String rfMode) {
+    this.rfMode = rfMode;
+  }
+
+  public String getComments() {
+    return comments;
+  }
+
+  public void setComments(String comments) {
+    this.comments = comments;
+  }
+
+  public Date getExpirationDate() {
+    return expirationDate;
+  }
+
+  public void setExpirationDate(Date expirationDate) {
+    this.expirationDate = expirationDate;
+  }
+
+  public RFAuthorization getRFAuthorization() {
+    return rfAuthorization;
+  }
+
+  public void setRFAuthorization(RFAuthorization rfAuthorization) {
+    this.rfAuthorization = rfAuthorization;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 0;
+    hash += (segmentAuthorizationPK != null ? segmentAuthorizationPK.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    // TODO: Warning - this method won't work in the case the id fields are not set
+    if (!(object instanceof RFSegmentAuthorization)) {
+      return false;
+    }
+    RFSegmentAuthorization other = (RFSegmentAuthorization) object;
+    return (this.segmentAuthorizationPK != null || other.segmentAuthorizationPK == null)
+        && (this.segmentAuthorizationPK == null
+            || this.segmentAuthorizationPK.equals(other.segmentAuthorizationPK));
+  }
+
+  @Override
+  public String toString() {
+    return "org.jlab.jam.persistence.entity.RFSegmentAuthorization[segmentAuthorizationPK="
+        + segmentAuthorizationPK
+        + " ]";
+  }
+
+  public RFSegmentAuthorization createAdminClone(RFAuthorization authClone) {
+    RFSegmentAuthorization other = new RFSegmentAuthorization();
+    other.rfAuthorization = authClone;
+    other.comments = this.comments;
+    other.expirationDate = this.expirationDate;
+    other.segment = this.segment;
+
+    return other;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java b/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java
new file mode 100644
index 0000000..ed327bd
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/entity/SegmentAuthorizationPK.java
@@ -0,0 +1,80 @@
+package org.jlab.jam.persistence.entity;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import javax.persistence.Basic;
+import javax.persistence.Column;
+import javax.persistence.Embeddable;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author ryans
+ */
+@Embeddable
+public class SegmentAuthorizationPK implements Serializable {
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "RF_SEGMENT_ID", nullable = false)
+  private BigInteger rfSegmentId;
+
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "RF_AUTHORIZATION_ID", nullable = false)
+  private BigInteger rfAuthorizationId;
+
+  public SegmentAuthorizationPK() {}
+
+  public SegmentAuthorizationPK(BigInteger rfSegmentId, BigInteger rfAuthorizationId) {
+    this.rfSegmentId = rfSegmentId;
+    this.rfAuthorizationId = rfAuthorizationId;
+  }
+
+  public BigInteger getRFSegmentId() {
+    return rfSegmentId;
+  }
+
+  public void setRFSegmentId(BigInteger rfSegmentId) {
+    this.rfSegmentId = rfSegmentId;
+  }
+
+  public BigInteger getRFAuthorizationId() {
+    return rfAuthorizationId;
+  }
+
+  public void setRFAuthorizationId(BigInteger rfAuthorizationId) {
+    this.rfAuthorizationId = rfAuthorizationId;
+  }
+
+  @Override
+  public int hashCode() {
+    int hash = 0;
+    hash += (rfSegmentId != null ? rfSegmentId.hashCode() : 0);
+    hash += (rfAuthorizationId != null ? rfAuthorizationId.hashCode() : 0);
+    return hash;
+  }
+
+  @Override
+  public boolean equals(Object object) {
+    // TODO: Warning - this method won't work in the case the id fields are not set
+    if (!(object instanceof SegmentAuthorizationPK)) {
+      return false;
+    }
+    SegmentAuthorizationPK other = (SegmentAuthorizationPK) object;
+    if ((this.rfSegmentId == null && other.rfSegmentId != null)
+        || (this.rfSegmentId != null && !this.rfSegmentId.equals(other.rfSegmentId))) {
+      return false;
+    }
+    return (this.rfAuthorizationId != null || other.rfAuthorizationId == null)
+        && (this.rfAuthorizationId == null
+            || this.rfAuthorizationId.equals(other.rfAuthorizationId));
+  }
+
+  @Override
+  public String toString() {
+    return "org.jlab.jam.persistence.entity.SegmentAuthorizationPK[ rfSegmentId="
+        + rfSegmentId
+        + ", authorizationId="
+        + rfAuthorizationId
+        + " ]";
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java b/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java
index 85d91f9..11af102 100644
--- a/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java
+++ b/src/main/java/org/jlab/jam/persistence/view/BeamDestinationVerification.java
@@ -27,8 +27,8 @@ public class BeamDestinationVerification implements Serializable {
   @Column(name = "BEAM_DESTINATION_ID", nullable = false)
   private BigInteger beamDestinationId;
 
-  @Column(name = "VERIFICATION_ID")
-  private Integer verificationId;
+  @Column(name = "VERIFICATION_STATUS_ID")
+  private Integer verificationStatusId;
 
   @Column(name = "EXPIRATION_DATE")
   @Temporal(TemporalType.TIMESTAMP)
@@ -40,8 +40,8 @@ public BigInteger getBeamDestinationId() {
     return beamDestinationId;
   }
 
-  public Integer getVerificationId() {
-    return verificationId;
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
   }
 
   public Date getExpirationDate() {
diff --git a/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java
index a07434f..ca7017f 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java
@@ -9,8 +9,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.AuthorizationFacade;
-import org.jlab.jam.persistence.entity.Authorization;
+import org.jlab.jam.business.session.BeamAuthorizationFacade;
+import org.jlab.jam.persistence.entity.BeamAuthorization;
 import org.jlab.smoothness.presentation.util.Paginator;
 import org.jlab.smoothness.presentation.util.ParamUtil;
 
@@ -22,7 +22,7 @@
     urlPatterns = {"/permissions/authorization-history"})
 public class AuthorizationHistoryController extends HttpServlet {
 
-  @EJB AuthorizationFacade historyFacade;
+  @EJB BeamAuthorizationFacade historyFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -39,7 +39,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
     int maxPerPage = 10;
 
-    List<Authorization> historyList = historyFacade.findHistory(offset, maxPerPage);
+    List<BeamAuthorization> historyList = historyFacade.findHistory(offset, maxPerPage);
     Long totalRecords = historyFacade.countHistory();
 
     Paginator paginator = new Paginator(totalRecords.intValue(), offset, maxPerPage);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java b/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
index 2d8cd5b..22926fd 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
@@ -9,10 +9,10 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
 import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.business.session.ControlVerificationFacade;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.ControlVerification;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -24,7 +24,7 @@
 public class BeamDestinationInformation extends HttpServlet {
 
   @EJB BeamDestinationFacade beamDestinationFacade;
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -41,7 +41,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     BigInteger beamDestinationId = ParamConverter.convertBigInteger(request, "beamDestinationId");
 
     BeamDestination beamDestination = null;
-    List<ControlVerification> verificationList = null;
+    List<BeamControlVerification> verificationList = null;
 
     if (beamDestinationId != null) {
       beamDestination = beamDestinationFacade.find(beamDestinationId);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java b/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
index a8ea903..bfc4430 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
@@ -10,9 +10,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.AbstractFacade.OrderDirective;
-import org.jlab.jam.business.session.ControlVerificationFacade;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
 import org.jlab.jam.business.session.CreditedControlFacade;
-import org.jlab.jam.persistence.entity.ControlVerification;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.CreditedControl;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
@@ -25,7 +25,7 @@
 public class CreditedControls extends HttpServlet {
 
   @EJB CreditedControlFacade ccFacade;
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -41,8 +41,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     BigInteger creditedControlId = ParamConverter.convertBigInteger(request, "creditedControlId");
 
-    List<ControlVerification> expiredList = null;
-    List<ControlVerification> expiringList = null;
+    List<BeamControlVerification> expiredList = null;
+    List<BeamControlVerification> expiringList = null;
     CreditedControl creditedControl = null;
     boolean adminOrLeader = false;
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index 05d8fbc..8d804ea 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -10,11 +10,11 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.AuthorizationFacade;
+import org.jlab.jam.business.session.BeamAuthorizationFacade;
 import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.persistence.entity.Authorization;
+import org.jlab.jam.persistence.entity.BeamAuthorization;
 import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.DestinationAuthorization;
+import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -25,7 +25,7 @@
     urlPatterns = {"/permissions/destinations-authorization-history"})
 public class DestinationsAuthorizationHistoryController extends HttpServlet {
 
-  @EJB AuthorizationFacade authorizationFacade;
+  @EJB BeamAuthorizationFacade beamAuthorizationFacade;
   @EJB BeamDestinationFacade beamDestinationFacade;
 
   /**
@@ -42,21 +42,21 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     BigInteger authorizationId = ParamConverter.convertBigInteger(request, "authorizationId");
 
-    Authorization authorization = null;
+    BeamAuthorization beamAuthorization = null;
 
     if (authorizationId != null) {
-      authorization = authorizationFacade.find(authorizationId);
+      beamAuthorization = beamAuthorizationFacade.find(authorizationId);
     }
 
     List<BeamDestination> cebafDestinationList = beamDestinationFacade.findCebafDestinations();
     List<BeamDestination> lerfDestinationList = beamDestinationFacade.findLerfDestinations();
     List<BeamDestination> uitfDestinationList = beamDestinationFacade.findUitfDestinations();
 
-    Map<BigInteger, DestinationAuthorization> destinationAuthorizationMap =
-        authorizationFacade.createDestinationAuthorizationMap(authorization);
+    Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
+        beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
 
-    request.setAttribute("unitsMap", authorizationFacade.getUnitsMap());
-    request.setAttribute("authorization", authorization);
+    request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
+    request.setAttribute("authorization", beamAuthorization);
     request.setAttribute("cebafDestinationList", cebafDestinationList);
     request.setAttribute("lerfDestinationList", lerfDestinationList);
     request.setAttribute("uitfDestinationList", uitfDestinationList);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 0d292f0..8963535 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -36,10 +36,11 @@
 public class FacilityAuthorization extends HttpServlet {
 
   private static final Logger LOGGER = Logger.getLogger(FacilityAuthorization.class.getName());
-  @EJB AuthorizationFacade authorizationFacade;
+  @EJB BeamAuthorizationFacade beamAuthorizationFacade;
   @EJB BeamDestinationFacade beamDestinationFacade;
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
   @EJB FacilityFacade facilityFacade;
+  @EJB RFSegmentFacade rfSegmentFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -68,17 +69,19 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     verificationFacade.performExpirationCheck(false);
 
-    Authorization authorization = authorizationFacade.findCurrent();
+    BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
+    List<RFSegment> rfList = rfSegmentFacade.findByFacility(facility);
     List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
 
-    Map<BigInteger, DestinationAuthorization> destinationAuthorizationMap =
-        authorizationFacade.createDestinationAuthorizationMap(authorization);
+    Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
+        beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
 
     request.setAttribute("facility", facility);
     request.setAttribute("facilityList", facilityList);
-    request.setAttribute("unitsMap", authorizationFacade.getUnitsMap());
-    request.setAttribute("authorization", authorization);
+    request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
+    request.setAttribute("authorization", beamAuthorization);
+    request.setAttribute("rfList", rfList);
     request.setAttribute("beamList", beamList);
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
@@ -118,10 +121,10 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     }
 
     try {
-      List<DestinationAuthorization> destinationAuthorizationList =
+      List<BeamDestinationAuthorization> beamDestinationAuthorizationList =
           convertDestinationAuthorizationList(request);
 
-      authorizationFacade.saveAuthorization(comments, destinationAuthorizationList);
+      beamAuthorizationFacade.saveAuthorization(comments, beamDestinationAuthorizationList);
     } catch (UserFriendlyException e) {
       errorReason = e.getUserMessage();
       LOGGER.log(Level.INFO, "Unable to save authorization: " + errorReason);
@@ -134,7 +137,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       String proxyServer = System.getenv("FRONTEND_SERVER_URL");
 
       try {
-        authorizationFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
+        beamAuthorizationFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
       } catch (UserFriendlyException e) {
         errorReason = "Authorization was saved, but we were unable to send to ops an email.  ";
         LOGGER.log(Level.SEVERE, errorReason, e);
@@ -143,7 +146,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       try {
         String logbookServer = System.getenv("LOGBOOK_SERVER_URL");
 
-        logId = authorizationFacade.sendELog(proxyServer, logbookServer);
+        logId = beamAuthorizationFacade.sendELog(proxyServer, logbookServer);
       } catch (Exception e) {
         errorReason = "Authorization was saved, but we were unable to send to eLog";
         LOGGER.log(Level.SEVERE, errorReason, e);
@@ -179,9 +182,9 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     }
   }
 
-  private List<DestinationAuthorization> convertDestinationAuthorizationList(
+  private List<BeamDestinationAuthorization> convertDestinationAuthorizationList(
       HttpServletRequest request) throws UserFriendlyException {
-    List<DestinationAuthorization> destinationAuthorizationList = new ArrayList<>();
+    List<BeamDestinationAuthorization> beamDestinationAuthorizationList = new ArrayList<>();
     String[] modeArray = request.getParameterValues("mode[]");
     String[] limitStrArray = request.getParameterValues("limit[]");
     String[] commentsArray = request.getParameterValues("comment[]");
@@ -203,7 +206,7 @@ private List<DestinationAuthorization> convertDestinationAuthorizationList(
       for (int i = 0; i < modeArray.length; i++) {
         String mode = modeArray[i];
 
-        DestinationAuthorization da = new DestinationAuthorization();
+        BeamDestinationAuthorization da = new BeamDestinationAuthorization();
 
         da.setBeamMode(mode);
 
@@ -247,10 +250,10 @@ private List<DestinationAuthorization> convertDestinationAuthorizationList(
         pk.setBeamDestinationId(beamDestinationId);
         da.setDestinationAuthorizationPK(pk);
 
-        destinationAuthorizationList.add(da);
+        beamDestinationAuthorizationList.add(da);
       }
     }
 
-    return destinationAuthorizationList;
+    return beamDestinationAuthorizationList;
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java
index 46e9ed6..7bb6a68 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java
@@ -10,11 +10,11 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.ControlVerificationFacade;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
 import org.jlab.jam.business.session.CreditedControlFacade;
 import org.jlab.jam.business.session.VerificationHistoryFacade;
-import org.jlab.jam.persistence.entity.ControlVerification;
-import org.jlab.jam.persistence.entity.VerificationHistory;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
+import org.jlab.jam.persistence.entity.BeamControlVerificationHistory;
 import org.jlab.smoothness.presentation.util.Paginator;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 import org.jlab.smoothness.presentation.util.ParamUtil;
@@ -28,7 +28,7 @@
 public class VerificationHistoryController extends HttpServlet {
 
   @EJB VerificationHistoryFacade historyFacade;
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
   @EJB CreditedControlFacade creditedControlFacade;
 
   /**
@@ -48,10 +48,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
     int maxPerPage = 10;
 
-    ControlVerification verification =
+    BeamControlVerification verification =
         verificationFacade.findWithCreditedControl(controlVerificationId);
 
-    List<VerificationHistory> historyList =
+    List<BeamControlVerificationHistory> historyList =
         historyFacade.findHistory(controlVerificationId, offset, maxPerPage);
     Long totalRecords = historyFacade.countHistory(controlVerificationId);
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditCc.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditCc.java
index 5c4cfde..abe7c78 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditCc.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditCc.java
@@ -13,8 +13,8 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.ControlVerificationFacade;
-import org.jlab.jam.persistence.entity.ControlVerification;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.smoothness.business.exception.UserFriendlyException;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
@@ -27,7 +27,7 @@
 public class EditCc extends HttpServlet {
 
   private static final Logger logger = Logger.getLogger(EditCc.class.getName());
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
 
   /**
    * Handles the HTTP <code>POST</code> method.
@@ -42,7 +42,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     String errorReason = null;
 
-    List<ControlVerification> downgradeList = null;
+    List<BeamControlVerification> downgradeList = null;
 
     try {
       BigInteger[] verificationIdArray =
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java
index 9067407..5e1a00d 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java
@@ -12,7 +12,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.ControlVerificationFacade;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -25,7 +25,7 @@ public class ToggleControlParticipation extends HttpServlet {
 
   private static final Logger logger = Logger.getLogger(ToggleControlParticipation.class.getName());
 
-  @EJB ControlVerificationFacade verificationFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
 
   /**
    * Handles the HTTP <code>POST</code> method.
diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
index b0c1724..d634073 100644
--- a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
+++ b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
@@ -28,14 +28,14 @@
     </thead>
     <tbody>
         <c:forEach items="${beamList}" var="destination">
-            <c:set var="destinationAuthorization" value="${destinationAuthorizationMap[destination.beamDestinationId]}"/>
+            <c:set var="beamDestinationAuthorization" value="${destinationAuthorizationMap[destination.beamDestinationId]}"/>
             <c:set var="units" value="${unitsMap[destination.beamDestinationId] ne null ? unitsMap[destination.beamDestinationId] : 'uA'}"/>
             <tr>
                 <td><a data-dialog-title="${destination.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${destination.beamDestinationId}"><c:out value="${destination.name}"/></a></td>
                     <c:if test="${not isHistory}">
                     <td class="icon-cell">
                         <c:choose>
-                            <c:when test="${(destination.verification.verificationId eq 1 or destination.verification.verificationId eq 50) and destinationAuthorization.beamMode ne null and destinationAuthorization.beamMode ne 'None'}">
+                            <c:when test="${(destination.verification.verificationStatusId eq 1 or destination.verification.verificationStatusId eq 50) and beamDestinationAuthorization.beamMode ne null and beamDestinationAuthorization.beamMode ne 'None'}">
                                 <span title="Approved" class="small-icon verified-icon"></span>
                             </c:when>
                             <c:otherwise>
@@ -45,7 +45,7 @@
                     </td>
                 </c:if>
                 <td>
-                    <c:set var="selectedBeamMode" value="${destinationAuthorization.beamMode eq null ? 'None' : destinationAuthorization.beamMode}"/>
+                    <c:set var="selectedBeamMode" value="${beamDestinationAuthorization.beamMode eq null ? 'None' : beamDestinationAuthorization.beamMode}"/>
                     <div class="readonly-field"><c:out value="${selectedBeamMode}"/></div>
                     <div class="editable-field">
                         <select name="mode[]" class="mode-select">
@@ -57,7 +57,7 @@
                     </div>
                 </td>
                 <td>
-                    <c:set var="selectedLimit" value="${destinationAuthorization.cwLimit eq null ? '' : destinationAuthorization.cwLimit}"/>
+                    <c:set var="selectedLimit" value="${beamDestinationAuthorization.cwLimit eq null ? '' : beamDestinationAuthorization.cwLimit}"/>
                     <span class="readonly-field">
                         <c:choose>
                             <c:when test="${fn:contains(destination.name, 'RF Operations')}">
@@ -80,8 +80,8 @@
                     </span>
                     <input type="hidden" name="beamDestinationId[]" value="${destination.beamDestinationId}"/>
                 </td>
-                <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (destination.verification.verificationId eq 50) ? 'provisional-comments' : ''}">
-                    <c:set var="selectedComment" value="${destinationAuthorization.comments eq null ? '' : destinationAuthorization.comments}"/>
+                <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (destination.verification.verificationStatusId eq 50) ? 'provisional-comments' : ''}">
+                    <c:set var="selectedComment" value="${beamDestinationAuthorization.comments eq null ? '' : beamDestinationAuthorization.comments}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedComment}"/>
                     </span>
@@ -90,10 +90,10 @@
                     </span>
                 </td>
                 <td>
-                    <fmt:formatDate var="selectedExpiration" value="${destinationAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                    <fmt:formatDate var="selectedExpiration" value="${beamDestinationAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedExpiration}"/>
-                        <span class="expiring-soon" style="<c:out value="${destinationAuthorization.expirationDate ne null and destinationAuthorization.expirationDate.time > beamauth:now().time and destinationAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                        <span class="expiring-soon" style="<c:out value="${beamDestinationAuthorization.expirationDate ne null and beamDestinationAuthorization.expirationDate.time > beamauth:now().time and beamDestinationAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
                     </span>
                     <span class="editable-field">
                         <input name="expiration[]" type="text" class="expiration-input date-time-field" autocomplete="off" placeholder="${s:getFriendlyDateTimePlaceholder()}" value="${selectedBeamMode eq 'None' ? '' : selectedExpiration}"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}/>
@@ -103,10 +103,10 @@
                     <td class="icon-cell">
                         <a data-dialog-title="${destination.name} Information" class="dialog-ready" href="beam-destination-information?beamDestinationId=${destination.beamDestinationId}">
                             <c:choose>
-                                <c:when test="${destination.verification.verificationId eq 1}">
+                                <c:when test="${destination.verification.verificationStatusId eq 1}">
                                     <span title="Verified" class="small-icon verified-icon"></span>
                                 </c:when>
-                                <c:when test="${destination.verification.verificationId eq 50}">
+                                <c:when test="${destination.verification.verificationStatusId eq 50}">
                                     <span title="Provisonally Verified" class="small-icon provisional-icon"></span>
                                 </c:when>
                                 <c:otherwise>
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/permissions-page.tag
index ada3cde..986e6f5 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/permissions-page.tag
@@ -9,64 +9,68 @@
 <%@attribute name="beamList" required="true" type="java.util.List"%>
 <%@attribute name="isEditable" required="true" type="java.lang.Boolean"%>
 <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%>
-<form id="authorization-form" method="post" action="permissions">
+<form id="beamAuthorization-form" method="post" action="permissions">
     <div class="chart-wrap-backdrop">
         <h2><c:out value="${facility.name}"/>
             <c:if test="${isEditable}">
                 <span class="readonly-field"><button id="edit-button" type="button">Edit</button></span>
             </c:if>            
         </h2>
-        <h3>RF Operations</h3>
-        <table class="data-table">
-            <tbody>
-
-            </tbody>
-        </table>
-        <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-        <h3>Beam Operations</h3>
-        <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
-        <h3>Notes</h3>
-        <div class="notes-field">
+        <div class="accordion">
+            <h3>RF Operations</h3>
+            <div class="content">
+                <t:rf-operations-table rfList="${rfList}" isHistory="${isHistory}"/>
+            </div>
+        </div>
+        <div class="accordion">
+            <h3>Beam Operations</h3>
+            <div class="content">
+                <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
+                <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
+                <h3>Notes</h3>
+                <div class="notes-field">
             <span class="readonly-field">
-                <c:out value="${fn:length(authorization.comments) == 0 ? 'None' : authorization.comments}"/>
+                <c:out value="${fn:length(beamAuthorization.comments) == 0 ? 'None' : beamAuthorization.comments}"/>
             </span>
-            <span class="editable-field">
-                <textarea id="comments" name="comments"><c:out value="${authorization.comments}"/></textarea>
+                    <span class="editable-field">
+                <textarea id="comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
             </span>
-        </div>
-        <h3>Digital Signature</h3>
-        <div class="footer">
-            <div class="footer-row">
-                <div class="signature-field">
-                    <c:choose>
-                        <c:when test="${authorization ne null}">
-                            <div class="readonly-field">Authorized by ${s:formatUsername(authorization.authorizedBy)} on <fmt:formatDate value="${authorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
-                        </c:when>
-                        <c:otherwise>
-                            <div class="readonly-field">None</div>
-                        </c:otherwise>
-                    </c:choose>
-                    <div class="editable-field notification-option-panel">
-                        <p>
-                            <label for="generate-elog-checkbox">Generate elog and email:</label>
-                            <input id="generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
-                        </p>
-                    </div>     
-                    <div class="editable-field">Click the Save button to sign:
-                        <span>
+                </div>
+                <h3>Digital Signature</h3>
+                <div class="footer">
+                    <div class="footer-row">
+                        <div class="signature-field">
+                            <c:choose>
+                                <c:when test="${beamAuthorization ne null}">
+                                    <div class="readonly-field">Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on <fmt:formatDate value="${beamAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
+                                </c:when>
+                                <c:otherwise>
+                                    <div class="readonly-field">None</div>
+                                </c:otherwise>
+                            </c:choose>
+                            <div class="editable-field notification-option-panel">
+                                <p>
+                                    <label for="generate-elog-checkbox">Generate elog and email:</label>
+                                    <input id="generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                                </p>
+                            </div>
+                            <div class="editable-field">Click the Save button to sign:
+                                <span>
                             <button id="save-button" class="ajax-button inline-button" type="button">Save</button>
                             <span class="cancel-text">
-                                or 
+                                or
                                 <a id="cancel-button" href="#">Cancel</a>
                             </span>
                         </span>
+                            </div>
+                        </div>
+                        <div class="history-panel">
+                            <c:if test="${not isHistory}">
+                                <a data-dialog-title="Authorization History" href="permissions/beamAuthorization-history" title="Click for beamAuthorization history">History</a>
+                            </c:if>
+                        </div>
                     </div>
                 </div>
-                <div class="history-panel">
-                    <c:if test="${not isHistory}">
-                        <a data-dialog-title="Authorization History" href="permissions/authorization-history" title="Click for authorization history">History</a>
-                    </c:if>
-                </div>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
new file mode 100644
index 0000000..2e37b94
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
@@ -0,0 +1,85 @@
+<%@tag description="RF Operations Table Tag" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<%@attribute name="rfList" required="true" type="java.util.List"%>
+<%@attribute name="isHistory" required="true" type="java.lang.Boolean"%>
+<table class="destinations-table data-table stripped-table">
+    <thead>
+        <tr>
+            <th rowspan="2" class="destination-header">Segment</th>
+                <c:if test="${not isHistory}">
+                <th rowspan="2" class="approval-header">Approval</th>
+                </c:if>
+            <th colspan="2">Director's Status</th>
+                <c:if test="${not isHistory}">
+                <th rowspan="2" class="cc-status-header">Credited Controls Status</th>
+                </c:if>
+        </tr>
+        <tr>
+            <th>Comment</th>
+            <th class="expiration-header">Expiration</th>
+        </tr>
+    </thead>
+    <tbody>
+        <c:forEach items="${rfList}" var="segment">
+            <c:set var="beamDestinationAuthorization" value="${destinationAuthorizationMap[segment.beamDestinationId]}"/>
+            <c:set var="units" value="${unitsMap[segment.beamDestinationId] ne null ? unitsMap[segment.beamDestinationId] : 'uA'}"/>
+            <tr>
+                <td><a data-dialog-title="${segment.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${segment.beamDestinationId}"><c:out value="${segment.name}"/></a></td>
+                    <c:if test="${not isHistory}">
+                    <td class="icon-cell">
+                        <c:choose>
+                            <c:when test="${(segment.verification.verificationStatusId eq 1 or segment.verification.verificationStatusId eq 50) and beamDestinationAuthorization.beamMode ne null and beamDestinationAuthorization.beamMode ne 'None'}">
+                                <span title="Approved" class="small-icon verified-icon"></span>
+                            </c:when>
+                            <c:otherwise>
+                                <span title="Not Approved" class="small-icon not-verified-icon"></span>
+                            </c:otherwise>
+                        </c:choose>                                         
+                    </td>
+                </c:if>
+                <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (segment.verification.verificationStatusId eq 50) ? 'provisional-comments' : ''}">
+                    <c:set var="selectedComment" value="${beamDestinationAuthorization.comments eq null ? '' : beamDestinationAuthorization.comments}"/>
+                    <span class="readonly-field">
+                        <c:out value="${selectedComment}"/>
+                    </span>
+                    <span class="editable-field">
+                        <textarea name="comment[]" class="comment-input" type="text"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}><c:out value="${selectedBeamMode eq 'None' ? '' : selectedComment}"/></textarea>
+                    </span>
+                </td>
+                <td>
+                    <fmt:formatDate var="selectedExpiration" value="${beamDestinationAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                    <span class="readonly-field">
+                        <c:out value="${selectedExpiration}"/>
+                        <span class="expiring-soon" style="<c:out value="${beamDestinationAuthorization.expirationDate ne null and beamDestinationAuthorization.expirationDate.time > beamauth:now().time and beamDestinationAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                    </span>
+                    <span class="editable-field">
+                        <input name="expiration[]" type="text" class="expiration-input date-time-field" autocomplete="off" placeholder="${s:getFriendlyDateTimePlaceholder()}" value="${selectedBeamMode eq 'None' ? '' : selectedExpiration}"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}/>
+                    </span>
+                </td>
+                <c:if test="${not isHistory}">
+                    <td class="icon-cell">
+                        <a data-dialog-title="${segment.name} Information" class="dialog-ready" href="beam-destination-information?beamDestinationId=${segment.beamDestinationId}">
+                            <c:choose>
+                                <c:when test="${segment.verification.verificationStatusId eq 1}">
+                                    <span title="Verified" class="small-icon verified-icon"></span>
+                                </c:when>
+                                <c:when test="${segment.verification.verificationStatusId eq 50}">
+                                    <span title="Provisonally Verified" class="small-icon provisional-icon"></span>
+                                </c:when>
+                                <c:otherwise>
+                                    <span title="Not Verified" class="small-icon not-verified-icon"></span>
+                                </c:otherwise>
+                            </c:choose>
+                            <span class="expiring-soon" style="<c:out value="${segment.verification.expirationDate ne null and segment.verification.expirationDate.time > beamauth:now().time and segment.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                        </a>
+                    </td>
+                </c:if>
+            </tr>
+        </c:forEach> 
+    </tbody>
+</table>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/beam-destination-information.jsp b/src/main/webapp/WEB-INF/views/beam-destination-information.jsp
index 654d79d..03395ce 100644
--- a/src/main/webapp/WEB-INF/views/beam-destination-information.jsp
+++ b/src/main/webapp/WEB-INF/views/beam-destination-information.jsp
@@ -18,10 +18,10 @@
             <div class="dialog-content">
                 <h3>
                     <c:choose>
-                        <c:when test="${beamDestination.verification.verificationId eq 1}">
+                        <c:when test="${beamDestination.verification.verificationStatusId eq 1}">
                             <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
                         </c:when>
-                        <c:when test="${beamDestination.verification.verificationId eq 50}">
+                        <c:when test="${beamDestination.verification.verificationStatusId eq 50}">
                             <span title="Verified" class="small-icon baseline-small-icon provisional-icon"></span>
                         </c:when>
                         <c:otherwise>
@@ -46,10 +46,10 @@
                                         <td><a href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${verification.creditedControl.creditedControlId}"><c:out value="${verification.creditedControl.name}"/></a></td>
                                         <td class="icon-cell">
                                             <c:choose>
-                                                <c:when test="${verification.verificationId eq 1}">
+                                                <c:when test="${verification.verificationStatusId eq 1}">
                                                     <span title="Verified" class="small-icon verified-icon"></span>
                                                 </c:when>
-                                                <c:when test="${verification.verificationId eq 50}">
+                                                <c:when test="${verification.verificationStatusId eq 50}">
                                                     <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
                                                 </c:when>
                                                 <c:otherwise>
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index fed382e..401ca40 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -80,7 +80,7 @@
                         </c:if>
                         <h3>Verifications</h3>
                         <c:choose>
-                            <c:when test="${fn:length(creditedControl.controlVerificationList) < 1}">
+                            <c:when test="${fn:length(creditedControl.beamControlVerificationList) < 1}">
                                 <div class="message-box">None</div>
                             </c:when>
                             <c:otherwise>
@@ -112,16 +112,16 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <c:forEach items="${creditedControl.controlVerificationList}" var="verification">
-                                            <tr data-control-verification-id="${verification.controlVerificationId}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationId}">
+                                        <c:forEach items="${creditedControl.beamControlVerificationList}" var="verification">
+                                            <tr data-control-verification-id="${verification.beamControlVerificationId}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationStatusId}">
                                                 <c:if test="${adminOrLeader && param.notEditable eq null}">
                                                     <td>
-                                                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification.controlVerificationId}"/>
+                                                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification.beamControlVerificationId}"/>
                                                     </td>
                                                 </c:if>
                                                 <td><c:out value="${verification.beamDestination.name}"/></td>
                                                 <td class="verified-cell">
-                                                  <div title="${verification.verificationId eq 1 ? 'Verified' : (verification.verificationId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationId eq 1 ? 'verified-icon' : (verification.verificationId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></div>
+                                                  <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>
                                                   <div class="verified-date"><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.verificationDate}"/></div>
                                                   <div class="verified-by"><c:out value="${s:formatUsername(verification.verifiedBy)}"/></div>
                                                 </td>
@@ -142,7 +142,7 @@
                                                 </td>
                                                 <td><c:out value="${verification.comments}"/></td>
                                                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                                <td><a data-dialog-title="Verification History" href="credited-controls/verification-history?controlVerificationId=${verification.controlVerificationId}" title="Click for verification history">History</a></td>
+                                                <td><a data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification.beamControlVerificationId}" title="Click for verification history">History</a></td>
                                             </tr>
                                         </c:forEach>
                                     </tbody>
diff --git a/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp b/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp
index 56c0d1a..694c3f6 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp
@@ -58,7 +58,7 @@
                                         <td><c:out value="${s:formatUsername(history.modifiedBy)}"/></td>
                                         <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.verificationDate}"/></td>
                                         <td><c:out value="${s:formatUsername(history.verifiedBy)}"/></td>
-                                        <td class="icon-cell"><span title="${history.verificationId eq 1 ? 'Verified' : (history.verificationId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${history.verificationId eq 1 ? 'verified-icon' : (history.verificationId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></span></td>
+                                        <td class="icon-cell"><span title="${history.verificationStatusId eq 1 ? 'Verified' : (history.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${history.verificationStatusId eq 1 ? 'verified-icon' : (history.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></span></td>
                                         <td><c:out value="${history.comments}"/></td>
                                         <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.expirationDate}"/></td>
                                     </tr>
@@ -66,7 +66,7 @@
                             </tbody>
                         </table>
                         <form id="filter-form" action="${pageContext.request.contextPath}/credited-controls/verification-history" method="get">
-                            <input type="hidden" name="controlVerificationId" value="${fn:escapeXml(param.controlVerificationId)}"/>
+                            <input type="hidden" name="beamControlVerificationId" value="${fn:escapeXml(param.beamControlVerificationId)}"/>
                             <input type="hidden" id="offset-input" name="offset" value="0"/>
                         </form>
                         <button id="previous-button" type="button" data-offset="${paginator.previousOffset}" value="Previous"${paginator.previous ? '' : ' disabled="disabled"'}>Previous</button>                        
diff --git a/src/main/webapp/WEB-INF/views/destinations.jsp b/src/main/webapp/WEB-INF/views/destinations.jsp
index ef7a8a5..000bae2 100644
--- a/src/main/webapp/WEB-INF/views/destinations.jsp
+++ b/src/main/webapp/WEB-INF/views/destinations.jsp
@@ -49,7 +49,7 @@
                     <div class="dialog-content">
                         <h3>Verifications</h3>
                         <c:choose>
-                            <c:when test="${fn:length(destination.controlVerificationList) < 1}">
+                            <c:when test="${fn:length(destination.beamControlVerificationList) < 1}">
                                 <div class="message-box">None</div>
                             </c:when>
                             <c:otherwise>
@@ -79,20 +79,20 @@
                                         </tr>
                                     </thead>
                                     <tbody>
-                                        <c:forEach items="${destination.controlVerificationList}" var="verification">
-                                            <tr data-control-verification-id="${verification.controlVerificationId}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationId}">
+                                        <c:forEach items="${destination.beamControlVerificationList}" var="verification">
+                                            <tr data-control-verification-id="${verification.beamControlVerificationId}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationStatusId}">
                                                 <c:if test="${adminOrLeader && param.notEditable eq null}">
                                                     <td>
-                                                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification.controlVerificationId}"/>
+                                                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification.beamControlVerificationId}"/>
                                                     </td>
                                                 </c:if>
                                                 <td><c:out value="${verification.creditedControl.name}"/>; <c:out value="${verification.creditedControl.group.name}"/></td>
-                                                <td class="icon-cell"><span title="${verification.verificationId eq 1 ? 'Verified' : (verification.verificationId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${verification.verificationId eq 1 ? 'verified-icon' : (verification.verificationId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></span></td>
+                                                <td class="icon-cell"><span 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')}"></span></td>
                                                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.verificationDate}"/></td>
                                                 <td><c:out value="${s:formatUsername(verification.verifiedBy)}"/></td>
                                                 <td><c:out value="${verification.comments}"/></td>
                                                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                                <td><a class="small-icon dialog-ready comment-icon" data-dialog-title="Verification History" href="credited-controls/verification-history?controlVerificationId=${verification.controlVerificationId}" title="Click for verification history"></a></td>
+                                                <td><a class="small-icon dialog-ready comment-icon" data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification.beamControlVerificationId}" title="Click for verification history"></a></td>
                                             </tr>
                                         </c:forEach>
                                     </tbody>
diff --git a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
index c2afc80..49dc88c 100644
--- a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
@@ -35,7 +35,7 @@
                     </c:when>
                     <c:otherwise>
                         <div class="message-box"><c:out value="${selectionMessage}"/></div>
-                        <table id="authorization-table" class="data-table stripped-table">
+                        <table id="beamAuthorization-table" class="data-table stripped-table">
                             <thead>
                                 <tr>
                                     <th>Modified Date</th>
@@ -54,12 +54,12 @@
                                         <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.authorizationDate}"/></td>
                                         <td><c:out value="${s:formatUsername(history.authorizedBy)}"/></td>
                                         <td><c:out value="${history.comments}"/></td>
-                                        <td><a href="destinations-authorization-history?authorizationId=${history.authorizationId}">Destination Details</a></td>
+                                        <td><a href="destinations-beamAuthorization-history?authorizationId=${history.authorizationId}">Destination Details</a></td>
                                     </tr>
                                 </c:forEach>
                             </tbody>
                         </table>
-                        <form id="filter-form" action="authorization-history" method="get">
+                        <form id="filter-form" action="beamAuthorization-history" method="get">
                             <input type="hidden" id="offset-input" name="offset" value="0"/>
                         </form>
                         <button id="previous-button" type="button" data-offset="${paginator.previousOffset}" value="Previous"${paginator.previous ? '' : ' disabled="disabled"'}>Previous</button>                        
diff --git a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
index 07bcb0a..13c7e7e 100644
--- a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
@@ -18,16 +18,16 @@
                     <a href="${pageContext.request.contextPath}/permissions">Director's Authorization</a>
                 </li>
                 <li>
-                    <a href="${pageContext.request.contextPath}/permissions/authorization-history">Historic Authorizations</a>
+                    <a href="${pageContext.request.contextPath}/permissions/beamAuthorization-history">Historic Authorizations</a>
                 </li>
                 <li>
-                    <span><fmt:formatDate value="${authorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/> History</span>
+                    <span><fmt:formatDate value="${beamAuthorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/> History</span>
                 </li>
             </ul>
         </div>        
         <section>
             <c:choose>
-                <c:when test="${authorization ne null}">
+                <c:when test="${beamAuthorization ne null}">
                     <t:permissions-page cebafDestinationList="${cebafDestinationList}" lerfDestinationList="${lerfDestinationList}" isEditable="${false}" isHistory="${true}"/>
                 </c:when>
                 <c:otherwise>
diff --git a/src/main/webapp/resources/css/permissions.css b/src/main/webapp/resources/css/permissions.css
index c362e0c..943159c 100644
--- a/src/main/webapp/resources/css/permissions.css
+++ b/src/main/webapp/resources/css/permissions.css
@@ -65,4 +65,11 @@ textarea[readonly] {
 }
 #cancel-button {
     vertical-align: bottom;
+}
+
+.accordion .ui-widget-content a {
+    color: blue;
+}
+.accordion .ui-widget-content a:hover {
+    color: red;
 }
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/permissions.js b/src/main/webapp/resources/js/permissions.js
index 132c7c4..31b42ca 100644
--- a/src/main/webapp/resources/js/permissions.js
+++ b/src/main/webapp/resources/js/permissions.js
@@ -139,4 +139,10 @@ $(function () {
         hour: 8,
         beforeShow: function(i) { if ($(i).attr('readonly')) { return false; } }
     }).mask("99-aaa-9999 99:99", {placeholder: " "});
-});
+
+    $( ".accordion" ).accordion({
+        collapsible: true,
+        heightStyle: "content",
+        active: 0
+    });
+});
\ No newline at end of file

From 1d4e62d5dc8366b859fa05ffbd8ac9ed26c2f4a6 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 16:45:22 -0500
Subject: [PATCH 03/44] Separate Facilities

---
 container/oracle/initdb.d/03_default_data.sql | 12 ++-
 .../session/BeamDestinationFacade.java        |  2 +-
 .../session/RFAuthorizationFacade.java        | 42 +++++-----
 .../jam/business/session/RFSegmentFacade.java |  2 +-
 .../controller/FacilityAuthorization.java     |  7 +-
 .../webapp/WEB-INF/tags/permissions-page.tag  | 82 +++++++++++--------
 .../WEB-INF/tags/rf-operations-table.tag      | 15 ++--
 7 files changed, 92 insertions(+), 70 deletions(-)

diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index fbf2f52..75c44b6 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -35,6 +35,15 @@ insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WOR
 insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 5','Control 5 Description',1,5,'1 Year');
 insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 6','Control 6 Description',1,6,'1 Year');
 
+-- Populate RF Segments
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Injector', 1, 'Y', 1);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'North Linac', 1, 'Y', 2);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'South Linac', 1, 'Y', 3);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 2, 'Y', 1);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 3, 'Y', 1);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 4, 'Y', 1);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 5, 'Y', 1);
+
 -- Populate Beam Destinations
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 1', 1, 'uA', 'Y', 1);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 2', 1, 'uA', 'Y', 2);
@@ -45,9 +54,8 @@ insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID,
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 7', 3, 'uA', 'Y', 7);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 8', 3, 'uA', 'Y', 8);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 9', 3, 'uA', 'Y', 9);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Injector RF Operations', 1, 'uA', 'Y', 9);
 
--- Populate Initial Control Verification
+-- Populate Initial Beam Control Verification
 insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 1, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
 insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 2, 2, 100, sysdate, 'admin', null, null, 'admin', sysdate);
 insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 3, 3, 100, sysdate, 'admin', null, null, 'admin', sysdate);
diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
index a170b4c..2b1f07d 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
@@ -129,7 +129,7 @@ public List<BeamDestination> findByFacility(Facility facility) {
 
     List<Order> orders = new ArrayList<>();
     Path p0 = root.get("weight");
-    Order o0 = cb.desc(p0);
+    Order o0 = cb.asc(p0);
     orders.add(o0);
     cq.orderBy(orders);
 
diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
index d7a85a4..14aee2f 100644
--- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
@@ -78,21 +78,21 @@ public HashMap<BigInteger, String> getUnitsMap() {
 
   @SuppressWarnings("unchecked")
   @PermitAll
-  public BeamAuthorization findCurrent() {
+  public RFAuthorization findCurrent() {
     Query q =
         em.createNativeQuery(
-            "select * from (select * from authorization order by modified_date desc) where rownum <= 1",
-            BeamAuthorization.class);
+            "select * from (select * from rf_authorization order by modified_date desc) where rownum <= 1",
+            RFAuthorization.class);
 
-    List<BeamAuthorization> beamAuthorizationList = q.getResultList();
+    List<RFAuthorization> rfAuthorizationList = q.getResultList();
 
-    BeamAuthorization beamAuthorization = null;
+    RFAuthorization rfAuthorization = null;
 
-    if (beamAuthorizationList != null && !beamAuthorizationList.isEmpty()) {
-      beamAuthorization = beamAuthorizationList.get(0);
+    if (rfAuthorizationList != null && !rfAuthorizationList.isEmpty()) {
+      rfAuthorization = rfAuthorizationList.get(0);
     }
 
-    return beamAuthorization;
+    return rfAuthorization;
   }
 
   @SuppressWarnings("unchecked")
@@ -114,20 +114,20 @@ public Long countHistory() {
   }
 
   @PermitAll
-  public Map<BigInteger, BeamDestinationAuthorization> createDestinationAuthorizationMap(
-      BeamAuthorization beamAuthorization) {
-    Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap = new HashMap<>();
-
-    if (beamAuthorization != null && beamAuthorization.getDestinationAuthorizationList() != null) {
-      for (BeamDestinationAuthorization beamDestinationAuthorization :
-          beamAuthorization.getDestinationAuthorizationList()) {
-        destinationAuthorizationMap.put(
-            beamDestinationAuthorization.getDestinationAuthorizationPK().getBeamDestinationId(),
-            beamDestinationAuthorization);
+  public Map<BigInteger, RFSegmentAuthorization> createSegmentAuthorizationMap(
+      RFAuthorization rfAuthorization) {
+    Map<BigInteger, RFSegmentAuthorization> segmentAuthorizationMap = new HashMap<>();
+
+    if (rfAuthorization != null && rfAuthorization.getRFSegmentAuthorizationList() != null) {
+      for (RFSegmentAuthorization rfSegmentAuthorization :
+          rfAuthorization.getRFSegmentAuthorizationList()) {
+        segmentAuthorizationMap.put(
+            rfSegmentAuthorization.getSegmentAuthorizationPK().getRFSegmentId(),
+            rfSegmentAuthorization);
       }
     }
 
-    return destinationAuthorizationMap;
+    return segmentAuthorizationMap;
   }
 
   @RolesAllowed("jam-admin")
@@ -228,9 +228,9 @@ public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
   public long sendELog(String proxyServer, String logbookServer) throws UserFriendlyException {
     String username = checkAuthenticated();
 
-    BeamAuthorization beamAuthorization = findCurrent();
+    RFAuthorization rfAuthorization = findCurrent();
 
-    if (beamAuthorization == null) {
+    if (rfAuthorization == null) {
       throw new UserFriendlyException("No authorizations found");
     }
 
diff --git a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
index 1431d16..97ec999 100644
--- a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
@@ -46,7 +46,7 @@ public List<RFSegment> findByFacility(Facility facility) {
 
     List<Order> orders = new ArrayList<>();
     Path p0 = root.get("weight");
-    Order o0 = cb.desc(p0);
+    Order o0 = cb.asc(p0);
     orders.add(o0);
     cq.orderBy(orders);
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 8963535..82d349c 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -36,6 +36,7 @@
 public class FacilityAuthorization extends HttpServlet {
 
   private static final Logger LOGGER = Logger.getLogger(FacilityAuthorization.class.getName());
+  @EJB RFAuthorizationFacade rfAuthorizationFacade;
   @EJB BeamAuthorizationFacade beamAuthorizationFacade;
   @EJB BeamDestinationFacade beamDestinationFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
@@ -56,8 +57,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     String pathInfo = request.getPathInfo();
 
-    System.err.println("PathInfo: " + pathInfo);
-
     Facility facility = facilityFacade.findByPath(pathInfo);
 
     if (facility == null) {
@@ -69,6 +68,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     verificationFacade.performExpirationCheck(false);
 
+    RFAuthorization rfAuthorization = rfAuthorizationFacade.findCurrent();
     BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
     List<RFSegment> rfList = rfSegmentFacade.findByFacility(facility);
@@ -77,6 +77,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
         beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
 
+    Map<BigInteger, RFSegmentAuthorization> segmentAuthorizationMap =
+        rfAuthorizationFacade.createSegmentAuthorizationMap(rfAuthorization);
+
     request.setAttribute("facility", facility);
     request.setAttribute("facilityList", facilityList);
     request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/permissions-page.tag
index 986e6f5..34e2eae 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/permissions-page.tag
@@ -19,58 +19,72 @@
         <div class="accordion">
             <h3>RF Operations</h3>
             <div class="content">
-                <t:rf-operations-table rfList="${rfList}" isHistory="${isHistory}"/>
+                <c:choose>
+                    <c:when test="${not empty rfList}">
+                        <t:rf-operations-table rfList="${rfList}" isHistory="${isHistory}"/>
+                    </c:when>
+                    <c:otherwise>
+                        None
+                    </c:otherwise>
+                </c:choose>
             </div>
         </div>
         <div class="accordion">
             <h3>Beam Operations</h3>
             <div class="content">
-                <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-                <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
-                <h3>Notes</h3>
-                <div class="notes-field">
+                <c:choose>
+                    <c:when test="${not empty beamList}">
+                        <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
+                        <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
+                        <h3>Notes</h3>
+                        <div class="notes-field">
             <span class="readonly-field">
                 <c:out value="${fn:length(beamAuthorization.comments) == 0 ? 'None' : beamAuthorization.comments}"/>
             </span>
-                    <span class="editable-field">
+                            <span class="editable-field">
                 <textarea id="comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
             </span>
-                </div>
-                <h3>Digital Signature</h3>
-                <div class="footer">
-                    <div class="footer-row">
-                        <div class="signature-field">
-                            <c:choose>
-                                <c:when test="${beamAuthorization ne null}">
-                                    <div class="readonly-field">Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on <fmt:formatDate value="${beamAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
-                                </c:when>
-                                <c:otherwise>
-                                    <div class="readonly-field">None</div>
-                                </c:otherwise>
-                            </c:choose>
-                            <div class="editable-field notification-option-panel">
-                                <p>
-                                    <label for="generate-elog-checkbox">Generate elog and email:</label>
-                                    <input id="generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
-                                </p>
-                            </div>
-                            <div class="editable-field">Click the Save button to sign:
-                                <span>
+                        </div>
+                        <h3>Digital Signature</h3>
+                        <div class="footer">
+                            <div class="footer-row">
+                                <div class="signature-field">
+                                    <c:choose>
+                                        <c:when test="${beamAuthorization ne null}">
+                                            <div class="readonly-field">Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on <fmt:formatDate value="${beamAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <div class="readonly-field">None</div>
+                                        </c:otherwise>
+                                    </c:choose>
+                                    <div class="editable-field notification-option-panel">
+                                        <p>
+                                            <label for="generate-elog-checkbox">Generate elog and email:</label>
+                                            <input id="generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                                        </p>
+                                    </div>
+                                    <div class="editable-field">Click the Save button to sign:
+                                        <span>
                             <button id="save-button" class="ajax-button inline-button" type="button">Save</button>
                             <span class="cancel-text">
                                 or
                                 <a id="cancel-button" href="#">Cancel</a>
                             </span>
                         </span>
+                                    </div>
+                                </div>
+                                <div class="history-panel">
+                                    <c:if test="${not isHistory}">
+                                        <a data-dialog-title="Authorization History" href="permissions/beamAuthorization-history" title="Click for beamAuthorization history">History</a>
+                                    </c:if>
+                                </div>
                             </div>
                         </div>
-                        <div class="history-panel">
-                            <c:if test="${not isHistory}">
-                                <a data-dialog-title="Authorization History" href="permissions/beamAuthorization-history" title="Click for beamAuthorization history">History</a>
-                            </c:if>
-                        </div>
-                    </div>
-                </div>
+                    </c:when>
+                    <c:otherwise>
+                        None
+                    </c:otherwise>
+                </c:choose>
             </div>
         </div>
     </div>
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
index 2e37b94..5c5cbd0 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
@@ -26,14 +26,13 @@
     </thead>
     <tbody>
         <c:forEach items="${rfList}" var="segment">
-            <c:set var="beamDestinationAuthorization" value="${destinationAuthorizationMap[segment.beamDestinationId]}"/>
-            <c:set var="units" value="${unitsMap[segment.beamDestinationId] ne null ? unitsMap[segment.beamDestinationId] : 'uA'}"/>
+            <c:set var="rfSegmentAuthorization" value="${rfAuthorizationMap[segment.getRFSegmentId()]}"/>
             <tr>
-                <td><a data-dialog-title="${segment.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${segment.beamDestinationId}"><c:out value="${segment.name}"/></a></td>
+                <td><c:out value="${segment.name}"/></td>
                     <c:if test="${not isHistory}">
                     <td class="icon-cell">
                         <c:choose>
-                            <c:when test="${(segment.verification.verificationStatusId eq 1 or segment.verification.verificationStatusId eq 50) and beamDestinationAuthorization.beamMode ne null and beamDestinationAuthorization.beamMode ne 'None'}">
+                            <c:when test="${(segment.verification.verificationStatusId eq 1 or segment.verification.verificationStatusId eq 50) and rfSegmentAuthorization.getRFMode() ne null and rfSegmentAuthorization.getRFMode() ne 'None'}">
                                 <span title="Approved" class="small-icon verified-icon"></span>
                             </c:when>
                             <c:otherwise>
@@ -43,16 +42,16 @@
                     </td>
                 </c:if>
                 <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (segment.verification.verificationStatusId eq 50) ? 'provisional-comments' : ''}">
-                    <c:set var="selectedComment" value="${beamDestinationAuthorization.comments eq null ? '' : beamDestinationAuthorization.comments}"/>
+                    <c:set var="selectedComment" value="${rfSegmentAuthorization.comments eq null ? '' : rfSegmentAuthorization.comments}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedComment}"/>
                     </span>
                     <span class="editable-field">
-                        <textarea name="comment[]" class="comment-input" type="text"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}><c:out value="${selectedBeamMode eq 'None' ? '' : selectedComment}"/></textarea>
+                        <textarea name="comment[]" class="comment-input" type="text"${selectedRfMode eq 'None' ? ' readonly="readonly"' : ''}><c:out value="${selectedBeamMode eq 'None' ? '' : selectedComment}"/></textarea>
                     </span>
                 </td>
                 <td>
-                    <fmt:formatDate var="selectedExpiration" value="${beamDestinationAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                    <fmt:formatDate var="selectedExpiration" value="${rfSegmentAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedExpiration}"/>
                         <span class="expiring-soon" style="<c:out value="${beamDestinationAuthorization.expirationDate ne null and beamDestinationAuthorization.expirationDate.time > beamauth:now().time and beamDestinationAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
@@ -63,7 +62,6 @@
                 </td>
                 <c:if test="${not isHistory}">
                     <td class="icon-cell">
-                        <a data-dialog-title="${segment.name} Information" class="dialog-ready" href="beam-destination-information?beamDestinationId=${segment.beamDestinationId}">
                             <c:choose>
                                 <c:when test="${segment.verification.verificationStatusId eq 1}">
                                     <span title="Verified" class="small-icon verified-icon"></span>
@@ -76,7 +74,6 @@
                                 </c:otherwise>
                             </c:choose>
                             <span class="expiring-soon" style="<c:out value="${segment.verification.expirationDate ne null and segment.verification.expirationDate.time > beamauth:now().time and segment.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
-                        </a>
                     </td>
                 </c:if>
             </tr>

From cdf831dba38063cf1ffbf3c5aa806ed6b6e496ef Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 17:01:31 -0500
Subject: [PATCH 04/44] Separate Facilities

---
 .../jam/presentation/util/BeamAuthFunctions.java  |  7 +++++++
 src/main/webapp/WEB-INF/functions.tld             |  5 +++++
 .../webapp/WEB-INF/tags/rf-operations-table.tag   | 15 ++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java b/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
index 5a94768..d2da32c 100644
--- a/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
+++ b/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
@@ -47,6 +47,13 @@ public static List<String> beamModeList(String facility, String destination) {
     return modes;
   }
 
+  public static List<String> rfModeList(String facility, String segment) {
+    List<String> modes = Arrays.asList("None", "RF On");
+    ;
+
+    return modes;
+  }
+
   public static List<String> laseModeList() {
     return Arrays.asList("None", "UV", "IR");
   }
diff --git a/src/main/webapp/WEB-INF/functions.tld b/src/main/webapp/WEB-INF/functions.tld
index ea78d72..84c9f3a 100644
--- a/src/main/webapp/WEB-INF/functions.tld
+++ b/src/main/webapp/WEB-INF/functions.tld
@@ -15,6 +15,11 @@
         <function-class>org.jlab.jam.presentation.util.BeamAuthFunctions</function-class>
         <function-signature>java.util.List beamModeList(java.lang.String, java.lang.String)</function-signature>
     </function>
+    <function>
+        <name>rfModeList</name>
+        <function-class>org.jlab.jam.presentation.util.BeamAuthFunctions</function-class>
+        <function-signature>java.util.List rfModeList(java.lang.String, java.lang.String)</function-signature>
+    </function>
     <function>
         <name>laseModeList</name>
         <function-class>org.jlab.jam.presentation.util.BeamAuthFunctions</function-class>
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
index 5c5cbd0..2f536b2 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
@@ -14,12 +14,13 @@
                 <c:if test="${not isHistory}">
                 <th rowspan="2" class="approval-header">Approval</th>
                 </c:if>
-            <th colspan="2">Director's Status</th>
+            <th colspan="3">Director's Status</th>
                 <c:if test="${not isHistory}">
                 <th rowspan="2" class="cc-status-header">Credited Controls Status</th>
                 </c:if>
         </tr>
         <tr>
+            <th>RF Mode</th>
             <th>Comment</th>
             <th class="expiration-header">Expiration</th>
         </tr>
@@ -41,6 +42,18 @@
                         </c:choose>                                         
                     </td>
                 </c:if>
+                <td>
+                    <c:set var="selectedRFMode" value="${rfSegmentAuthorization.getRFMode() eq null ? 'None' : rfSegmentAuthorization.getRFMode()}"/>
+                    <div class="readonly-field"><c:out value="${selectedRFMode}"/></div>
+                    <div class="editable-field">
+                        <select name="mode[]" class="mode-select">
+                            <c:forEach items="${beamauth:rfModeList(facility.name, segment.name)}" var="mode">
+                                <option${mode eq selectedRFMode ? ' selected="selected"' : ''}><c:out value="${mode}"/></option>
+                            </c:forEach>
+                        </select>
+                        <c:out value="${mode}"/>
+                    </div>
+                </td>
                 <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (segment.verification.verificationStatusId eq 50) ? 'provisional-comments' : ''}">
                     <c:set var="selectedComment" value="${rfSegmentAuthorization.comments eq null ? '' : rfSegmentAuthorization.comments}"/>
                     <span class="readonly-field">

From ac53394de2f254f78240aad4da8ab0509f3501d6 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 17:32:21 -0500
Subject: [PATCH 05/44] Separate Facilities

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 1bb85d2..fab5ad9 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # jam [![CI](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/jam?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/jam)
-A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations beamAuthorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
+A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations Authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
 
 ![Screenshot](https://github.com/JeffersonLab/jam/raw/main/Screenshot.png?raw=true "Screenshot")
 
@@ -16,7 +16,7 @@ A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both
 ---
 
 ## Overview
-The Authorization application allows the Director of Operations (or a delegate) to clearly communicate and document beamAuthorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director beamAuthorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
+The Authorization application allows the Director of Operations (or a delegate) to clearly communicate and document Authorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director Authorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
 
 ### Roles
  - **Operations Director** - Responsible for authorizing beam

From d795a595383b2fa4bb229f7cdc84c30cd391721e Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Mon, 27 Jan 2025 17:33:18 -0500
Subject: [PATCH 06/44] Separate Facilities

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index fab5ad9..8fe990d 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # jam [![CI](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml/badge.svg)](https://github.com/JeffersonLab/jam/actions/workflows/ci.yaml) [![Docker](https://img.shields.io/docker/v/jeffersonlab/jam?sort=semver&label=DockerHub)](https://hub.docker.com/r/jeffersonlab/jam)
-A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations Authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
+A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both beam and RF operations authorization at Jefferson Lab built with the [Smoothness](https://github.com/JeffersonLab/smoothness) web template.
 
 ![Screenshot](https://github.com/JeffersonLab/jam/raw/main/Screenshot.png?raw=true "Screenshot")
 
@@ -16,7 +16,7 @@ A [Java EE 8](https://en.wikipedia.org/wiki/Jakarta_EE) web application for both
 ---
 
 ## Overview
-The Authorization application allows the Director of Operations (or a delegate) to clearly communicate and document Authorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director Authorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
+The authorization application allows the Director of Operations (or a delegate) to clearly communicate and document authorization for various facilities at JLab to either generate beam or engage in RF operations. For beam generation the maximum current and beam mode ("permissions") that are authorized are provided for a given beam destination.  This information is stored in a database and presented via the web for easy access.   There are three beam generating facilities, each with their own set of beam destinations and beam modes: CEBAF, LERF, UITF.  There are seven facilities which generate RF: CEBAF Injector, CEBAF North Linac, CEBAF South Linac, LERF, CMTF, and VTA.  In addition to director authorization, the app also tracks Credited Controls and their verification.  Each beam destination is assigned a set of controls and each control is assigned to a particular responsible group.  A beam desintation is ready for beam only if all the controls assigned are verified by their responsible group.  Both group verifications and director permissions have expirations.   Emails and Jefferson Lab logbook entires are created to aid communication of new director permissions, responsible group verifications (upgrades and downgrades), and verification and permissions expirations.
 
 ### Roles
  - **Operations Director** - Responsible for authorizing beam

From ce358db0343fcd39d3474ab20794745a31557ff0 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 07:06:52 -0500
Subject: [PATCH 07/44] Separate Facilities

---
 src/main/webapp/WEB-INF/tags/rf-operations-table.tag | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
index 2f536b2..0a37742 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
@@ -80,7 +80,7 @@
                                     <span title="Verified" class="small-icon verified-icon"></span>
                                 </c:when>
                                 <c:when test="${segment.verification.verificationStatusId eq 50}">
-                                    <span title="Provisonally Verified" class="small-icon provisional-icon"></span>
+                                    <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
                                 </c:when>
                                 <c:otherwise>
                                     <span title="Not Verified" class="small-icon not-verified-icon"></span>

From 060aef67b474b06a1b0d23371028f4188cf70b25 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 07:20:24 -0500
Subject: [PATCH 08/44] Separate Facilities

---
 .../webapp/WEB-INF/tags/destination-permissions-table.tag     | 4 ++--
 src/main/webapp/WEB-INF/tags/permissions-page.tag             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
index d634073..a8559da 100644
--- a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
+++ b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
@@ -101,13 +101,13 @@
                 </td>
                 <c:if test="${not isHistory}">
                     <td class="icon-cell">
-                        <a data-dialog-title="${destination.name} Information" class="dialog-ready" href="beam-destination-information?beamDestinationId=${destination.beamDestinationId}">
+                        <a data-dialog-title="${destination.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${destination.beamDestinationId}">
                             <c:choose>
                                 <c:when test="${destination.verification.verificationStatusId eq 1}">
                                     <span title="Verified" class="small-icon verified-icon"></span>
                                 </c:when>
                                 <c:when test="${destination.verification.verificationStatusId eq 50}">
-                                    <span title="Provisonally Verified" class="small-icon provisional-icon"></span>
+                                    <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
                                 </c:when>
                                 <c:otherwise>
                                     <span title="Not Verified" class="small-icon not-verified-icon"></span>
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/permissions-page.tag
index 34e2eae..136c5e3 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/permissions-page.tag
@@ -75,7 +75,7 @@
                                 </div>
                                 <div class="history-panel">
                                     <c:if test="${not isHistory}">
-                                        <a data-dialog-title="Authorization History" href="permissions/beamAuthorization-history" title="Click for beamAuthorization history">History</a>
+                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/permissions/authorization-history" title="Click for authorization history">History</a>
                                     </c:if>
                                 </div>
                             </div>

From 8f106ead7c17737c722cb4465fea74682296b665 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 08:31:16 -0500
Subject: [PATCH 09/44] Separate Facilities

---
 .../session/BeamAuthorizationFacade.java      |  2 +-
 .../persistence/entity/BeamAuthorization.java |  2 +-
 .../persistence/entity/RFAuthorization.java   |  2 +-
 ...> BeamAuthorizationHistoryController.java} |  8 ++--
 ...nationsAuthorizationHistoryController.java | 33 ++++++-------
 .../controller/FacilityAuthorization.java     | 48 +++++++++++++++++--
 .../webapp/WEB-INF/tags/permissions-page.tag  |  2 +-
 .../permissions/authorization-history.jsp     |  4 +-
 .../destinations-authorization-history.jsp    |  8 ++--
 9 files changed, 76 insertions(+), 33 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{AuthorizationHistoryController.java => BeamAuthorizationHistoryController.java} (92%)

diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
index e587c50..7520462 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
@@ -111,7 +111,7 @@ public BeamAuthorization findCurrent() {
   public List<BeamAuthorization> findHistory(int offset, int maxPerPage) {
     Query q =
         em.createNativeQuery(
-            "select * from authorization order by authorization_date desc",
+            "select * from beam_authorization order by authorization_date desc",
             BeamAuthorization.class);
 
     return q.setFirstResult(offset).setMaxResults(maxPerPage).getResultList();
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
index 4601e25..20d6762 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
@@ -26,7 +26,7 @@
  * @author ryans
  */
 @Entity
-@Table(schema = "JAM_OWNER")
+@Table(name = "BEAM_AUTHORIZATION", schema = "JAM_OWNER")
 @NamedQueries({
   @NamedQuery(name = "BeamAuthorization.findAll", query = "SELECT a FROM BeamAuthorization a")
 })
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
index 132e145..f6b4ccc 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
@@ -26,7 +26,7 @@
  * @author ryans
  */
 @Entity
-@Table(schema = "JAM_OWNER")
+@Table(name = "RF_AUTHORIZATION", schema = "JAM_OWNER")
 @NamedQueries({
   @NamedQuery(name = "RFAuthorization.findAll", query = "SELECT a FROM RFAuthorization a")
 })
diff --git a/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
similarity index 92%
rename from src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java
rename to src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
index ca7017f..8149901 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/AuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
@@ -17,10 +17,8 @@
 /**
  * @author ryans
  */
-@WebServlet(
-    name = "AuthorizationHistoryController",
-    urlPatterns = {"/permissions/authorization-history"})
-public class AuthorizationHistoryController extends HttpServlet {
+@WebServlet(name = "BeamAuthorizationHistoryController")
+public class BeamAuthorizationHistoryController extends HttpServlet {
 
   @EJB BeamAuthorizationFacade historyFacade;
 
@@ -36,6 +34,8 @@ public class AuthorizationHistoryController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
+    System.out.println("BeamAuthorizationHistoryController says hello");
+
     int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
     int maxPerPage = 10;
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index 8d804ea..c66d3a0 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -12,17 +12,13 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.BeamAuthorizationFacade;
 import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.persistence.entity.BeamAuthorization;
-import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
+import org.jlab.jam.persistence.entity.*;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
  * @author ryans
  */
-@WebServlet(
-    name = "DestinationsAuthorizationHistoryController",
-    urlPatterns = {"/permissions/destinations-authorization-history"})
+@WebServlet(name = "DestinationsAuthorizationHistoryController")
 public class DestinationsAuthorizationHistoryController extends HttpServlet {
 
   @EJB BeamAuthorizationFacade beamAuthorizationFacade;
@@ -40,26 +36,31 @@ public class DestinationsAuthorizationHistoryController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
-    BigInteger authorizationId = ParamConverter.convertBigInteger(request, "authorizationId");
+    BigInteger beamAuthorizationId =
+        ParamConverter.convertBigInteger(request, "beamAuthorizationId");
 
     BeamAuthorization beamAuthorization = null;
 
-    if (authorizationId != null) {
-      beamAuthorization = beamAuthorizationFacade.find(authorizationId);
+    if (beamAuthorizationId != null) {
+      beamAuthorization = beamAuthorizationFacade.find(beamAuthorizationId);
     }
 
-    List<BeamDestination> cebafDestinationList = beamDestinationFacade.findCebafDestinations();
-    List<BeamDestination> lerfDestinationList = beamDestinationFacade.findLerfDestinations();
-    List<BeamDestination> uitfDestinationList = beamDestinationFacade.findUitfDestinations();
+    Facility facility = (Facility) request.getAttribute("facility");
+
+    // TODO: Instead of querying for current list of destinations / segments then mapping to
+    // authorization,
+    // it would be better to grab list of destinations and segments that existed at time of
+    // authorization.
+    List<RFSegment> rfList = null;
+    List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
 
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
         beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
 
     request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
-    request.setAttribute("authorization", beamAuthorization);
-    request.setAttribute("cebafDestinationList", cebafDestinationList);
-    request.setAttribute("lerfDestinationList", lerfDestinationList);
-    request.setAttribute("uitfDestinationList", uitfDestinationList);
+    request.setAttribute("beamAuthorization", beamAuthorization);
+    request.setAttribute("rfList", rfList);
+    request.setAttribute("beamList", beamList);
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
     request
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 82d349c..ae54d19 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -4,6 +4,8 @@
 import java.io.PrintWriter;
 import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -57,7 +59,21 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     String pathInfo = request.getPathInfo();
 
-    Facility facility = facilityFacade.findByPath(pathInfo);
+    if (pathInfo == null || pathInfo.isEmpty()) {
+      throw new ServletException("Path is empty");
+    }
+
+    Path path = Paths.get(pathInfo);
+
+    if (path.getNameCount() == 0) {
+      throw new ServletException("Path is root only");
+    }
+
+    String facilityPath = "/" + path.getName(0);
+
+    System.err.println("facilityPath: " + facilityPath);
+
+    Facility facility = facilityFacade.findByPath(facilityPath);
 
     if (facility == null) {
       throw new ServletException("Facility not found");
@@ -66,6 +82,34 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     List<Facility> facilityList =
         facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
 
+    request.setAttribute("facility", facility);
+    request.setAttribute("facilityList", facilityList);
+
+    switch (path.getNameCount()) {
+      case 1:
+        System.err.println("1: facility");
+        handleFacility(request, response, facility);
+        break;
+      case 2:
+        System.err.println("2: auth history");
+        getServletContext()
+            .getNamedDispatcher("BeamAuthorizationHistoryController")
+            .forward(request, response);
+        break;
+      case 3:
+        System.err.println("3: destination history");
+        getServletContext()
+            .getNamedDispatcher("DestinationsAuthorizationHistoryController")
+            .forward(request, response);
+        break;
+      default:
+        throw new ServletException("Path has too many segments");
+    }
+  }
+
+  private void handleFacility(
+      HttpServletRequest request, HttpServletResponse response, Facility facility)
+      throws ServletException, IOException {
     verificationFacade.performExpirationCheck(false);
 
     RFAuthorization rfAuthorization = rfAuthorizationFacade.findCurrent();
@@ -80,8 +124,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     Map<BigInteger, RFSegmentAuthorization> segmentAuthorizationMap =
         rfAuthorizationFacade.createSegmentAuthorizationMap(rfAuthorization);
 
-    request.setAttribute("facility", facility);
-    request.setAttribute("facilityList", facilityList);
     request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
     request.setAttribute("authorization", beamAuthorization);
     request.setAttribute("rfList", rfList);
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/permissions-page.tag
index 136c5e3..ca0ff80 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/permissions-page.tag
@@ -75,7 +75,7 @@
                                 </div>
                                 <div class="history-panel">
                                     <c:if test="${not isHistory}">
-                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/permissions/authorization-history" title="Click for authorization history">History</a>
+                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history" title="Click for authorization history">History</a>
                                     </c:if>
                                 </div>
                             </div>
diff --git a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
index 49dc88c..c556772 100644
--- a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
@@ -20,7 +20,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/permissions">Director's Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Director's Authorization</a>
                 </li>
                 <li>
                     <span>Historic Authorizations</span>
@@ -54,7 +54,7 @@
                                         <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.authorizationDate}"/></td>
                                         <td><c:out value="${s:formatUsername(history.authorizedBy)}"/></td>
                                         <td><c:out value="${history.comments}"/></td>
-                                        <td><a href="destinations-beamAuthorization-history?authorizationId=${history.authorizationId}">Destination Details</a></td>
+                                        <td><a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history/destinations?beamAuthorizationId=${history.beamAuthorizationId}">Destination Details</a></td>
                                     </tr>
                                 </c:forEach>
                             </tbody>
diff --git a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
index 13c7e7e..3940fd5 100644
--- a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
@@ -15,10 +15,10 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/permissions">Director's Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Director's Authorization</a>
                 </li>
                 <li>
-                    <a href="${pageContext.request.contextPath}/permissions/beamAuthorization-history">Historic Authorizations</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history">Historic Authorizations</a>
                 </li>
                 <li>
                     <span><fmt:formatDate value="${beamAuthorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/> History</span>
@@ -28,10 +28,10 @@
         <section>
             <c:choose>
                 <c:when test="${beamAuthorization ne null}">
-                    <t:permissions-page cebafDestinationList="${cebafDestinationList}" lerfDestinationList="${lerfDestinationList}" isEditable="${false}" isHistory="${true}"/>
+                    <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
                 </c:when>
                 <c:otherwise>
-                    <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.authorizationId)}</div>
+                    <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.beamAuthorizationId)}</div>
                 </c:otherwise>
             </c:choose>
         </section>          

From cb3888fdab3b60cedc773c76372959bef4da443f Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 09:01:27 -0500
Subject: [PATCH 10/44] Separate Facilities

---
 .../BeamAuthorizationHistoryController.java   |  2 -
 .../controller/FacilityAuthorization.java     | 38 +++++++++++++++----
 .../WEB-INF/tags/authorization-page.tag       |  2 +-
 3 files changed, 31 insertions(+), 11 deletions(-)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
index 8149901..d3d28dd 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
@@ -34,8 +34,6 @@ public class BeamAuthorizationHistoryController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
-    System.out.println("BeamAuthorizationHistoryController says hello");
-
     int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
     int maxPerPage = 10;
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index ae54d19..1ae4e3e 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -69,6 +69,12 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throw new ServletException("Path is root only");
     }
 
+    // WARNING: String.endWith("/") and Path.endWith("/") return DIFFERENT results!
+    if (pathInfo.endsWith("/")) {
+      // TODO: probably redirect?
+      throw new ServletException("Path ends with /");
+    }
+
     String facilityPath = "/" + path.getName(0);
 
     System.err.println("facilityPath: " + facilityPath);
@@ -87,20 +93,36 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     switch (path.getNameCount()) {
       case 1:
-        System.err.println("1: facility");
         handleFacility(request, response, facility);
         break;
       case 2:
-        System.err.println("2: auth history");
-        getServletContext()
-            .getNamedDispatcher("BeamAuthorizationHistoryController")
-            .forward(request, response);
+        String secondName = path.getName(1).toString();
+
+        if ("beam-history".equals(secondName)) {
+          getServletContext()
+              .getNamedDispatcher("BeamAuthorizationHistoryController")
+              .forward(request, response);
+        } else if ("rf-history".equals(secondName)) {
+          throw new ServletException("rf-history not implemented yet!");
+        } else {
+          // TODO: This should probably be 404
+          throw new ServletException("Unknown authorizations path: " + pathInfo);
+        }
         break;
       case 3:
         System.err.println("3: destination history");
-        getServletContext()
-            .getNamedDispatcher("DestinationsAuthorizationHistoryController")
-            .forward(request, response);
+        String thirdName = path.getName(2).toString();
+
+        if ("destinations".equals(thirdName)) {
+          getServletContext()
+              .getNamedDispatcher("DestinationsAuthorizationHistoryController")
+              .forward(request, response);
+        } else if ("segments".equals(thirdName)) {
+          throw new ServletException("segment-history not implemented yet!");
+        } else {
+          // TODO: This should probably be 404
+          throw new ServletException("Unknown authorizations path: " + pathInfo);
+        }
         break;
       default:
         throw new ServletException("Path has too many segments");
diff --git a/src/main/webapp/WEB-INF/tags/authorization-page.tag b/src/main/webapp/WEB-INF/tags/authorization-page.tag
index e79dca5..2faecd6 100644
--- a/src/main/webapp/WEB-INF/tags/authorization-page.tag
+++ b/src/main/webapp/WEB-INF/tags/authorization-page.tag
@@ -21,7 +21,7 @@
                     <nav id="secondary-nav">
                         <ul>
                         <c:forEach items="${facilityList}" var="facility">
-                            <li${facility.path eq currentPathInfo ? ' class="current-secondary"' : ''}><a
+                            <li${fn:startsWith(currentPathInfo, facility.path) ? ' class="current-secondary"' : ''}><a
                                     href="${pageContext.request.contextPath}/authorizations${facility.path}">${facility.name}</a>
                             </li>
                         </c:forEach>

From 5c8191c16511b8bd213dc6d98f65ca642342228c Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 09:30:11 -0500
Subject: [PATCH 11/44] Separate Facilities

---
 .../webapp/WEB-INF/tags/destination-permissions-table.tag   | 4 ++--
 src/main/webapp/WEB-INF/tags/rf-operations-table.tag        | 4 ++--
 .../WEB-INF/views/permissions/authorization-history.jsp     | 4 ++--
 .../permissions/destinations-authorization-history.jsp      | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
index a8559da..d7acaaf 100644
--- a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
+++ b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
@@ -12,9 +12,9 @@
         <tr>
             <th rowspan="2" class="destination-header">Beam Destination</th>
                 <c:if test="${not isHistory}">
-                <th rowspan="2" class="approval-header">Approval</th>
+                <th rowspan="2" class="approval-header">Auth</th>
                 </c:if>
-            <th colspan="4">Director's Status</th>
+            <th colspan="4">Director's Permission</th>
                 <c:if test="${not isHistory}">
                 <th rowspan="2" class="cc-status-header">Credited Controls Status</th>
                 </c:if>
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
index 0a37742..c40c95d 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
@@ -12,9 +12,9 @@
         <tr>
             <th rowspan="2" class="destination-header">Segment</th>
                 <c:if test="${not isHistory}">
-                <th rowspan="2" class="approval-header">Approval</th>
+                <th rowspan="2" class="approval-header">Auth</th>
                 </c:if>
-            <th colspan="3">Director's Status</th>
+            <th colspan="3">Director's Permission</th>
                 <c:if test="${not isHistory}">
                 <th rowspan="2" class="cc-status-header">Credited Controls Status</th>
                 </c:if>
diff --git a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
index c556772..ff9c42e 100644
--- a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
@@ -20,10 +20,10 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Director's Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Current Authorization</a>
                 </li>
                 <li>
-                    <span>Historic Authorizations</span>
+                    <span>Beam History</span>
                 </li>
             </ul>
         </div>        
diff --git a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
index 3940fd5..e576201 100644
--- a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
@@ -15,13 +15,13 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Director's Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Current Authorization</a>
                 </li>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history">Historic Authorizations</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history">Beam History</a>
                 </li>
                 <li>
-                    <span><fmt:formatDate value="${beamAuthorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/> History</span>
+                    <span><fmt:formatDate value="${beamAuthorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/></span>
                 </li>
             </ul>
         </div>        

From f4fb7852dc32e0971fb7449568eab3db1b36048e Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 09:55:15 -0500
Subject: [PATCH 12/44] Separate Facilities

---
 .../controller/BeamAuthorizationHistoryController.java      | 2 +-
 .../DestinationsAuthorizationHistoryController.java         | 2 +-
 .../tags/{permissions-page.tag => authorizations-panel.tag} | 2 +-
 ...tion-permissions-table.tag => beam-operations-table.tag} | 0
 ...horization-page.tag => facility-authorizations-page.tag} | 0
 src/main/webapp/WEB-INF/views/facility-authorization.jsp    | 6 +++---
 .../authorization-history.jsp => history/beam-history.jsp}  | 0
 .../destinations-history.jsp}                               | 2 +-
 8 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/webapp/WEB-INF/tags/{permissions-page.tag => authorizations-panel.tag} (97%)
 rename src/main/webapp/WEB-INF/tags/{destination-permissions-table.tag => beam-operations-table.tag} (100%)
 rename src/main/webapp/WEB-INF/tags/{authorization-page.tag => facility-authorizations-page.tag} (100%)
 rename src/main/webapp/WEB-INF/views/{permissions/authorization-history.jsp => history/beam-history.jsp} (100%)
 rename src/main/webapp/WEB-INF/views/{permissions/destinations-authorization-history.jsp => history/destinations-history.jsp} (93%)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
index d3d28dd..3bb3fa2 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
@@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("paginator", paginator);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/permissions/authorization-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/history/beam-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index c66d3a0..92f7566 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -64,7 +64,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/permissions/destinations-authorization-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/history/destinations-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/webapp/WEB-INF/tags/permissions-page.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
similarity index 97%
rename from src/main/webapp/WEB-INF/tags/permissions-page.tag
rename to src/main/webapp/WEB-INF/tags/authorizations-panel.tag
index ca0ff80..c4a4175 100644
--- a/src/main/webapp/WEB-INF/tags/permissions-page.tag
+++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
@@ -35,7 +35,7 @@
                 <c:choose>
                     <c:when test="${not empty beamList}">
                         <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-                        <t:destination-permissions-table beamList="${beamList}" isHistory="${isHistory}"/>
+                        <t:beam-operations-table beamList="${beamList}" isHistory="${isHistory}"/>
                         <h3>Notes</h3>
                         <div class="notes-field">
             <span class="readonly-field">
diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/beam-operations-table.tag
similarity index 100%
rename from src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
rename to src/main/webapp/WEB-INF/tags/beam-operations-table.tag
diff --git a/src/main/webapp/WEB-INF/tags/authorization-page.tag b/src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag
similarity index 100%
rename from src/main/webapp/WEB-INF/tags/authorization-page.tag
rename to src/main/webapp/WEB-INF/tags/facility-authorizations-page.tag
diff --git a/src/main/webapp/WEB-INF/views/facility-authorization.jsp b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
index ddb8bcf..1e8208c 100644
--- a/src/main/webapp/WEB-INF/views/facility-authorization.jsp
+++ b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:authorization-page title="${facility.name}">
+<t:facility-authorizations-page title="${facility.name}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
     </jsp:attribute>
@@ -13,7 +13,7 @@
     </jsp:attribute>        
     <jsp:body>
         <section>
-            <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
+            <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
         </section>
         <div id="success-dialog" class="dialog" title="Authorization Saved Successfully">
             <span class="logentry-success">A new log entry was created: <a id="new-entry-url" href="#"></a></span>
@@ -22,4 +22,4 @@
             </div>
         </div>
     </jsp:body>         
-</t:authorization-page>
+</t:facility-authorizations-page>
diff --git a/src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/permissions/authorization-history.jsp
rename to src/main/webapp/WEB-INF/views/history/beam-history.jsp
diff --git a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
similarity index 93%
rename from src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
rename to src/main/webapp/WEB-INF/views/history/destinations-history.jsp
index e576201..f876447 100644
--- a/src/main/webapp/WEB-INF/views/permissions/destinations-authorization-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
@@ -28,7 +28,7 @@
         <section>
             <c:choose>
                 <c:when test="${beamAuthorization ne null}">
-                    <t:permissions-page rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
+                    <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
                 </c:when>
                 <c:otherwise>
                     <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.beamAuthorizationId)}</div>

From 902028b1df76ff1bf7fe31f8c1e5b07501cdb3b4 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 11:02:18 -0500
Subject: [PATCH 13/44] Separate Facilities

---
 .../controller/FacilityAuthorization.java     |  3 -
 .../ajax/EditBeamAuthorization.java           | 93 +++++++++++++++++++
 .../WEB-INF/tags/authorizations-panel.tag     | 71 +++++++++++---
 .../WEB-INF/views/facility-authorization.jsp  |  5 +-
 .../WEB-INF/views/history/beam-history.jsp    |  6 +-
 .../views/history/destinations-history.jsp    |  6 +-
 .../{permissions.css => authorizations.css}   |  0
 .../js/{permissions.js => authorizations.js}  | 24 ++---
 8 files changed, 173 insertions(+), 35 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
 rename src/main/webapp/resources/css/{permissions.css => authorizations.css} (100%)
 rename src/main/webapp/resources/js/{permissions.js => authorizations.js} (87%)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 1ae4e3e..0ca35d7 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -77,8 +77,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     String facilityPath = "/" + path.getName(0);
 
-    System.err.println("facilityPath: " + facilityPath);
-
     Facility facility = facilityFacade.findByPath(facilityPath);
 
     if (facility == null) {
@@ -110,7 +108,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         }
         break;
       case 3:
-        System.err.println("3: destination history");
         String thirdName = path.getName(2).toString();
 
         if ("destinations".equals(thirdName)) {
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
new file mode 100644
index 0000000..0d6a643
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
@@ -0,0 +1,93 @@
+package org.jlab.jam.presentation.controller.ajax;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.ejb.EJB;
+import javax.ejb.EJBAccessException;
+import javax.ejb.EJBException;
+import javax.json.Json;
+import javax.json.stream.JsonGenerator;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.ConstraintViolationException;
+import org.jlab.jam.business.session.ComponentFacade;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
+import org.jlab.smoothness.business.util.ExceptionUtil;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "EditBeamAuthorization",
+    urlPatterns = {"/ajax/edit-beam-auth"})
+public class EditBeamAuthorization extends HttpServlet {
+
+  private static final Logger LOGGER = Logger.getLogger(EditBeamAuthorization.class.getName());
+
+  @EJB ComponentFacade componentFacade;
+
+  /**
+   * Handles the HTTP <code>POST</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    String errorReason = null;
+
+    try {
+      BigInteger verificationId = ParamConverter.convertBigInteger(request, "verificationId");
+      BigInteger componentId = ParamConverter.convertBigInteger(request, "componentId");
+
+      componentFacade.addComponent(verificationId, componentId);
+    } catch (UserFriendlyException e) {
+      errorReason = e.getUserMessage();
+    } catch (EJBException e) {
+      Throwable root = ExceptionUtil.getRootCause(e);
+      if (e instanceof EJBAccessException || root instanceof EJBAccessException) {
+        LOGGER.log(Level.WARNING, "Not authorized", e);
+        errorReason = "Not authorized";
+      } else if (root instanceof ConstraintViolationException) {
+        LOGGER.log(Level.WARNING, "Invalid input data", e);
+        errorReason = root.getMessage();
+      } else {
+        LOGGER.log(Level.WARNING, "Transaction rolled back", e);
+        errorReason =
+            "Unknown Exception of type: " + e.getCausedByException().getClass().getSimpleName();
+      }
+    } catch (Exception e) {
+      LOGGER.log(Level.SEVERE, "Unable to add component", e);
+      errorReason = e.getClass().getSimpleName();
+    }
+
+    String stat = "ok";
+
+    if (errorReason != null) {
+      stat = "fail";
+    }
+
+    response.setContentType("application/json");
+
+    OutputStream out = response.getOutputStream();
+
+    try (JsonGenerator gen = Json.createGenerator(out)) {
+      gen.writeStartObject().write("stat", stat); // This is unnecessary - if 200 OK then it worked
+      if (errorReason != null) {
+        response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        gen.write("error", errorReason);
+      }
+      gen.writeEnd();
+    }
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
index c4a4175..0dc9a57 100644
--- a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
@@ -9,19 +9,61 @@
 <%@attribute name="beamList" required="true" type="java.util.List"%>
 <%@attribute name="isEditable" required="true" type="java.lang.Boolean"%>
 <%@attribute name="isHistory" required="true" type="java.lang.Boolean"%>
-<form id="beamAuthorization-form" method="post" action="permissions">
+<div id="authorization-panel">
     <div class="chart-wrap-backdrop">
-        <h2><c:out value="${facility.name}"/>
-            <c:if test="${isEditable}">
-                <span class="readonly-field"><button id="edit-button" type="button">Edit</button></span>
-            </c:if>            
-        </h2>
         <div class="accordion">
             <h3>RF Operations</h3>
             <div class="content">
                 <c:choose>
                     <c:when test="${not empty rfList}">
+                        <c:if test="${isEditable}">
+                            <span class="readonly-field"><button id="rf-edit-button" type="button">Edit RF Operations</button></span>
+                        </c:if>
                         <t:rf-operations-table rfList="${rfList}" isHistory="${isHistory}"/>
+                        <h3>Notes</h3>
+                        <div class="notes-field">
+            <span class="readonly-field">
+                <c:out value="${fn:length(rfAuthorization.comments) == 0 ? 'None' : rfAuthorization.comments}"/>
+            </span>
+                            <span class="editable-field">
+                <textarea id="rf-comments" name="comments"><c:out value="${rfAuthorization.comments}"/></textarea>
+            </span>
+                        </div>
+                        <h3>Digital Signature</h3>
+                        <div class="footer">
+                            <div class="footer-row">
+                                <div class="signature-field">
+                                    <c:choose>
+                                        <c:when test="${rfAuthorization ne null}">
+                                            <div class="readonly-field">Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on <fmt:formatDate value="${rfAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <div class="readonly-field">None</div>
+                                        </c:otherwise>
+                                    </c:choose>
+                                    <div class="editable-field notification-option-panel">
+                                        <p>
+                                            <label for="rf-generate-elog-checkbox">Generate elog and email:</label>
+                                            <input id="rf-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                                        </p>
+                                    </div>
+                                    <div class="editable-field">Click the Save button to sign:
+                                        <span>
+                            <button id="rf-save-button" class="ajax-button inline-button" type="button">Save</button>
+                            <span class="cancel-text">
+                                or
+                                <a id="rf-cancel-button" href="#">Cancel</a>
+                            </span>
+                        </span>
+                                    </div>
+                                </div>
+                                <div class="history-panel">
+                                    <c:if test="${not isHistory}">
+                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history" title="Click for authorization history">History</a>
+                                    </c:if>
+                                </div>
+                            </div>
+                        </div>
                     </c:when>
                     <c:otherwise>
                         None
@@ -32,8 +74,12 @@
         <div class="accordion">
             <h3>Beam Operations</h3>
             <div class="content">
+                <form id="beam-authorization-form" method="post" action="${pageContext.request.contextPath}/ajax/edit-beam-auth">
                 <c:choose>
                     <c:when test="${not empty beamList}">
+                        <c:if test="${isEditable}">
+                            <span class="readonly-field"><button id="beam-edit-button" type="button">Edit Beam Operations</button></span>
+                        </c:if>
                         <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
                         <t:beam-operations-table beamList="${beamList}" isHistory="${isHistory}"/>
                         <h3>Notes</h3>
@@ -42,7 +88,7 @@
                 <c:out value="${fn:length(beamAuthorization.comments) == 0 ? 'None' : beamAuthorization.comments}"/>
             </span>
                             <span class="editable-field">
-                <textarea id="comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
+                <textarea id="beam-comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
             </span>
                         </div>
                         <h3>Digital Signature</h3>
@@ -59,16 +105,16 @@
                                     </c:choose>
                                     <div class="editable-field notification-option-panel">
                                         <p>
-                                            <label for="generate-elog-checkbox">Generate elog and email:</label>
-                                            <input id="generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                                            <label for="beam-generate-elog-checkbox">Generate elog and email:</label>
+                                            <input id="beam-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
                                         </p>
                                     </div>
                                     <div class="editable-field">Click the Save button to sign:
                                         <span>
-                            <button id="save-button" class="ajax-button inline-button" type="button">Save</button>
+                            <button id="beam-save-button" class="ajax-button inline-button" type="button">Save</button>
                             <span class="cancel-text">
                                 or
-                                <a id="cancel-button" href="#">Cancel</a>
+                                <a id="beam-cancel-button" href="#">Cancel</a>
                             </span>
                         </span>
                                     </div>
@@ -85,7 +131,8 @@
                         None
                     </c:otherwise>
                 </c:choose>
+                </form>
             </div>
         </div>
     </div>
-</form>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/facility-authorization.jsp b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
index 1e8208c..63eca8d 100644
--- a/src/main/webapp/WEB-INF/views/facility-authorization.jsp
+++ b/src/main/webapp/WEB-INF/views/facility-authorization.jsp
@@ -6,13 +6,14 @@
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
 <t:facility-authorizations-page title="${facility.name}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/authorizations.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">  
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/permissions.js"></script>
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/authorizations.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
+            <h2><c:out value="${facility.name}"/></h2>
             <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${pageContext.request.isUserInRole('jam-admin')}" isHistory="${false}"/>
         </section>
         <div id="success-dialog" class="dialog" title="Authorization Saved Successfully">
diff --git a/src/main/webapp/WEB-INF/views/history/beam-history.jsp b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
index ff9c42e..5ba4d78 100644
--- a/src/main/webapp/WEB-INF/views/history/beam-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
@@ -5,7 +5,7 @@
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Authorization History"> 
+<t:facility-authorizations-page title="Authorization History">
     <jsp:attribute name="stylesheets">
     </jsp:attribute>
     <jsp:attribute name="scripts">
@@ -20,7 +20,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Current Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
                 </li>
                 <li>
                     <span>Beam History</span>
@@ -69,4 +69,4 @@
             </div>
         </section>          
     </jsp:body>         
-</t:page>
+</t:facility-authorizations-page>
diff --git a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
index f876447..96042fd 100644
--- a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
@@ -5,7 +5,7 @@
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Destination Authorization History"> 
+<t:facility-authorizations-page title="Destination Authorization History">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
     </jsp:attribute>
@@ -15,7 +15,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}">Current Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
                 </li>
                 <li>
                     <a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history">Beam History</a>
@@ -36,4 +36,4 @@
             </c:choose>
         </section>          
     </jsp:body>         
-</t:page>
+</t:facility-authorizations-page>
diff --git a/src/main/webapp/resources/css/permissions.css b/src/main/webapp/resources/css/authorizations.css
similarity index 100%
rename from src/main/webapp/resources/css/permissions.css
rename to src/main/webapp/resources/css/authorizations.css
diff --git a/src/main/webapp/resources/js/permissions.js b/src/main/webapp/resources/js/authorizations.js
similarity index 87%
rename from src/main/webapp/resources/js/permissions.js
rename to src/main/webapp/resources/js/authorizations.js
index 31b42ca..2cbe49e 100644
--- a/src/main/webapp/resources/js/permissions.js
+++ b/src/main/webapp/resources/js/authorizations.js
@@ -1,5 +1,5 @@
 var jlab = jlab || {};
-jlab.save = function () {
+jlab.beamSave = function () {
     if (jlab.isRequest()) {
         window.console && console.log("Ajax already in progress");
         return;
@@ -8,7 +8,7 @@ jlab.save = function () {
     jlab.requestStart();
 
     var leaveSpinning = false,
-            $actionButton = $("#save-button"),
+            $actionButton = $("#beam-save-button"),
             success = false,
             newLogId = null;
 
@@ -16,9 +16,9 @@ jlab.save = function () {
     $actionButton.attr("disabled", "disabled");
 
     var request = jQuery.ajax({
-        url: jlab.contextPath + "/permissions",
+        url: jlab.contextPath + "/ajax/edit-beam-auth",
         type: "POST",
-        data: $("#authorization-form").serialize(),
+        data: $("#beam-authorization-form").serialize(),
         dataType: "json"
     });
 
@@ -81,17 +81,17 @@ $(document).on("change", ".mode-select", function(){
     }
 });
 
-$(document).on("click", "#edit-button", function () {
-    $(".readonly-field").hide();
-    $(".editable-field").show();
+$(document).on("click", "#beam-edit-button", function () {
+    $("#beam-authorization-form .readonly-field").hide();
+    $("#beam-authorization-form .editable-field").show();
 });
-$(document).on("click", "#cancel-button", function () {
-    $(".editable-field").hide();
-    $(".readonly-field").show();
+$(document).on("click", "#beam-cancel-button", function () {
+    $("#beam-authorization-form .editable-field").hide();
+    $("#beam-authorization-form .readonly-field").show();
     return false;
 });
-$(document).on("click", "#save-button", function () {
-    jlab.save();
+$(document).on("click", "#beam-save-button", function () {
+    jlab.beamSave();
 });
 $("#success-dialog").on("dialogclose", function () {
     document.location.reload(true);

From e5bb015fa1044794cb3d6a26245d015f8faa717d Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 12:54:35 -0500
Subject: [PATCH 14/44] Separate Facilities

---
 src/main/webapp/WEB-INF/views/history/destinations-history.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
index 96042fd..2799b5e 100644
--- a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
@@ -7,7 +7,7 @@
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
 <t:facility-authorizations-page title="Destination Authorization History">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/permissions.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/authorizations.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
     </jsp:attribute>        

From c84ab34766859dcdc455bede993bd9df017ff3b2 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 13:08:09 -0500
Subject: [PATCH 15/44] Separate Facilities

---
 .../session/RFAuthorizationFacade.java        |  8 +-
 .../controller/FacilityAuthorization.java     |  4 +-
 .../RFAuthorizationHistoryController.java     | 72 +++++++++++++++
 .../WEB-INF/tags/authorizations-panel.tag     | 92 +------------------
 ...ns-table.tag => beam-operations-panel.tag} | 46 +++++++++-
 ...ions-table.tag => rf-operations-panel.tag} | 48 +++++++++-
 .../WEB-INF/views/history/beam-history.jsp    |  4 +-
 .../views/history/destinations-history.jsp    |  2 +-
 .../WEB-INF/views/history/rf-history.jsp      | 72 +++++++++++++++
 9 files changed, 247 insertions(+), 101 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
 rename src/main/webapp/WEB-INF/tags/{beam-operations-table.tag => beam-operations-panel.tag} (79%)
 rename src/main/webapp/WEB-INF/tags/{rf-operations-table.tag => rf-operations-panel.tag} (73%)
 create mode 100644 src/main/webapp/WEB-INF/views/history/rf-history.jsp

diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
index 14aee2f..2c843ef 100644
--- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
@@ -97,18 +97,18 @@ public RFAuthorization findCurrent() {
 
   @SuppressWarnings("unchecked")
   @PermitAll
-  public List<BeamAuthorization> findHistory(int offset, int maxPerPage) {
+  public List<RFSegment> findHistory(int offset, int maxPerPage) {
     Query q =
         em.createNativeQuery(
-            "select * from authorization order by authorization_date desc",
-            BeamAuthorization.class);
+            "select * from rf_authorization order by authorization_date desc",
+            RFAuthorization.class);
 
     return q.setFirstResult(offset).setMaxResults(maxPerPage).getResultList();
   }
 
   @PermitAll
   public Long countHistory() {
-    TypedQuery<Long> q = em.createQuery("select count(a) from BeamAuthorization a", Long.class);
+    TypedQuery<Long> q = em.createQuery("select count(a) from RFAuthorization a", Long.class);
 
     return q.getSingleResult();
   }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 0ca35d7..97ade01 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -101,7 +101,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
               .getNamedDispatcher("BeamAuthorizationHistoryController")
               .forward(request, response);
         } else if ("rf-history".equals(secondName)) {
-          throw new ServletException("rf-history not implemented yet!");
+          getServletContext()
+              .getNamedDispatcher("RFAuthorizationHistoryController")
+              .forward(request, response);
         } else {
           // TODO: This should probably be 404
           throw new ServletException("Unknown authorizations path: " + pathInfo);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
new file mode 100644
index 0000000..57c033a
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
@@ -0,0 +1,72 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import java.text.DecimalFormat;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.RFAuthorizationFacade;
+import org.jlab.jam.persistence.entity.RFSegment;
+import org.jlab.smoothness.presentation.util.Paginator;
+import org.jlab.smoothness.presentation.util.ParamUtil;
+
+/**
+ * @author ryans
+ */
+@WebServlet(name = "RFAuthorizationHistoryController")
+public class RFAuthorizationHistoryController extends HttpServlet {
+
+  @EJB RFAuthorizationFacade historyFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
+    int maxPerPage = 10;
+
+    List<RFSegment> historyList = historyFacade.findHistory(offset, maxPerPage);
+    Long totalRecords = historyFacade.countHistory();
+
+    Paginator paginator = new Paginator(totalRecords.intValue(), offset, maxPerPage);
+
+    DecimalFormat formatter = new DecimalFormat("###,###");
+
+    String selectionMessage = "All Authorizations";
+
+    if (paginator.getTotalRecords() < maxPerPage && offset == 0) {
+      selectionMessage =
+          selectionMessage + " {" + formatter.format(paginator.getTotalRecords()) + "}";
+    } else {
+      selectionMessage =
+          selectionMessage
+              + " {"
+              + formatter.format(paginator.getStartNumber())
+              + " - "
+              + formatter.format(paginator.getEndNumber())
+              + " of "
+              + formatter.format(paginator.getTotalRecords())
+              + "}";
+    }
+
+    request.setAttribute("selectionMessage", selectionMessage);
+    request.setAttribute("historyList", historyList);
+    request.setAttribute("paginator", paginator);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/history/rf-history.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
index 0dc9a57..1f68cae 100644
--- a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
@@ -19,51 +19,7 @@
                         <c:if test="${isEditable}">
                             <span class="readonly-field"><button id="rf-edit-button" type="button">Edit RF Operations</button></span>
                         </c:if>
-                        <t:rf-operations-table rfList="${rfList}" isHistory="${isHistory}"/>
-                        <h3>Notes</h3>
-                        <div class="notes-field">
-            <span class="readonly-field">
-                <c:out value="${fn:length(rfAuthorization.comments) == 0 ? 'None' : rfAuthorization.comments}"/>
-            </span>
-                            <span class="editable-field">
-                <textarea id="rf-comments" name="comments"><c:out value="${rfAuthorization.comments}"/></textarea>
-            </span>
-                        </div>
-                        <h3>Digital Signature</h3>
-                        <div class="footer">
-                            <div class="footer-row">
-                                <div class="signature-field">
-                                    <c:choose>
-                                        <c:when test="${rfAuthorization ne null}">
-                                            <div class="readonly-field">Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on <fmt:formatDate value="${rfAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <div class="readonly-field">None</div>
-                                        </c:otherwise>
-                                    </c:choose>
-                                    <div class="editable-field notification-option-panel">
-                                        <p>
-                                            <label for="rf-generate-elog-checkbox">Generate elog and email:</label>
-                                            <input id="rf-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
-                                        </p>
-                                    </div>
-                                    <div class="editable-field">Click the Save button to sign:
-                                        <span>
-                            <button id="rf-save-button" class="ajax-button inline-button" type="button">Save</button>
-                            <span class="cancel-text">
-                                or
-                                <a id="rf-cancel-button" href="#">Cancel</a>
-                            </span>
-                        </span>
-                                    </div>
-                                </div>
-                                <div class="history-panel">
-                                    <c:if test="${not isHistory}">
-                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history" title="Click for authorization history">History</a>
-                                    </c:if>
-                                </div>
-                            </div>
-                        </div>
+                        <t:rf-operations-panel rfList="${rfList}" isHistory="${isHistory}"/>
                     </c:when>
                     <c:otherwise>
                         None
@@ -81,51 +37,7 @@
                             <span class="readonly-field"><button id="beam-edit-button" type="button">Edit Beam Operations</button></span>
                         </c:if>
                         <div class="editable-field power-limited-note">Note: Blank/Empty Current Limit results in "Dump Power Limited"</div>
-                        <t:beam-operations-table beamList="${beamList}" isHistory="${isHistory}"/>
-                        <h3>Notes</h3>
-                        <div class="notes-field">
-            <span class="readonly-field">
-                <c:out value="${fn:length(beamAuthorization.comments) == 0 ? 'None' : beamAuthorization.comments}"/>
-            </span>
-                            <span class="editable-field">
-                <textarea id="beam-comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
-            </span>
-                        </div>
-                        <h3>Digital Signature</h3>
-                        <div class="footer">
-                            <div class="footer-row">
-                                <div class="signature-field">
-                                    <c:choose>
-                                        <c:when test="${beamAuthorization ne null}">
-                                            <div class="readonly-field">Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on <fmt:formatDate value="${beamAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
-                                        </c:when>
-                                        <c:otherwise>
-                                            <div class="readonly-field">None</div>
-                                        </c:otherwise>
-                                    </c:choose>
-                                    <div class="editable-field notification-option-panel">
-                                        <p>
-                                            <label for="beam-generate-elog-checkbox">Generate elog and email:</label>
-                                            <input id="beam-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
-                                        </p>
-                                    </div>
-                                    <div class="editable-field">Click the Save button to sign:
-                                        <span>
-                            <button id="beam-save-button" class="ajax-button inline-button" type="button">Save</button>
-                            <span class="cancel-text">
-                                or
-                                <a id="beam-cancel-button" href="#">Cancel</a>
-                            </span>
-                        </span>
-                                    </div>
-                                </div>
-                                <div class="history-panel">
-                                    <c:if test="${not isHistory}">
-                                        <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history" title="Click for authorization history">History</a>
-                                    </c:if>
-                                </div>
-                            </div>
-                        </div>
+                        <t:beam-operations-panel beamList="${beamList}" isHistory="${isHistory}"/>
                     </c:when>
                     <c:otherwise>
                         None
diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-table.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
similarity index 79%
rename from src/main/webapp/WEB-INF/tags/beam-operations-table.tag
rename to src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
index d7acaaf..7e975bf 100644
--- a/src/main/webapp/WEB-INF/tags/beam-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
@@ -120,4 +120,48 @@
             </tr>
         </c:forEach> 
     </tbody>
-</table>
\ No newline at end of file
+</table>
+<h3>Notes</h3>
+<div class="notes-field">
+            <span class="readonly-field">
+                <c:out value="${fn:length(beamAuthorization.comments) == 0 ? 'None' : beamAuthorization.comments}"/>
+            </span>
+    <span class="editable-field">
+                <textarea id="beam-comments" name="comments"><c:out value="${beamAuthorization.comments}"/></textarea>
+            </span>
+</div>
+<h3>Digital Signature</h3>
+<div class="footer">
+    <div class="footer-row">
+        <div class="signature-field">
+            <c:choose>
+                <c:when test="${beamAuthorization ne null}">
+                    <div class="readonly-field">Authorized by ${s:formatUsername(beamAuthorization.authorizedBy)} on <fmt:formatDate value="${beamAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
+                </c:when>
+                <c:otherwise>
+                    <div class="readonly-field">None</div>
+                </c:otherwise>
+            </c:choose>
+            <div class="editable-field notification-option-panel">
+                <p>
+                    <label for="beam-generate-elog-checkbox">Generate elog and email:</label>
+                    <input id="beam-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                </p>
+            </div>
+            <div class="editable-field">Click the Save button to sign:
+                <span>
+                            <button id="beam-save-button" class="ajax-button inline-button" type="button">Save</button>
+                            <span class="cancel-text">
+                                or
+                                <a id="beam-cancel-button" href="#">Cancel</a>
+                            </span>
+                        </span>
+            </div>
+        </div>
+        <div class="history-panel">
+            <c:if test="${not isHistory}">
+                <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history" title="Click for authorization history">History</a>
+            </c:if>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
similarity index 73%
rename from src/main/webapp/WEB-INF/tags/rf-operations-table.tag
rename to src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
index c40c95d..d073a90 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-table.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
@@ -10,7 +10,7 @@
 <table class="destinations-table data-table stripped-table">
     <thead>
         <tr>
-            <th rowspan="2" class="destination-header">Segment</th>
+            <th rowspan="2" class="destination-header">RF Segment</th>
                 <c:if test="${not isHistory}">
                 <th rowspan="2" class="approval-header">Auth</th>
                 </c:if>
@@ -92,4 +92,48 @@
             </tr>
         </c:forEach> 
     </tbody>
-</table>
\ No newline at end of file
+</table>
+<h3>Notes</h3>
+<div class="notes-field">
+            <span class="readonly-field">
+                <c:out value="${fn:length(rfAuthorization.comments) == 0 ? 'None' : rfAuthorization.comments}"/>
+            </span>
+    <span class="editable-field">
+                <textarea id="rf-comments" name="comments"><c:out value="${rfAuthorization.comments}"/></textarea>
+            </span>
+</div>
+<h3>Digital Signature</h3>
+<div class="footer">
+    <div class="footer-row">
+        <div class="signature-field">
+            <c:choose>
+                <c:when test="${rfAuthorization ne null}">
+                    <div class="readonly-field">Authorized by ${s:formatUsername(rfAuthorization.authorizedBy)} on <fmt:formatDate value="${rfAuthorization.authorizationDate}" pattern="${s:getFriendlyDateTimePattern()}"/></div>
+                </c:when>
+                <c:otherwise>
+                    <div class="readonly-field">None</div>
+                </c:otherwise>
+            </c:choose>
+            <div class="editable-field notification-option-panel">
+                <p>
+                    <label for="rf-generate-elog-checkbox">Generate elog and email:</label>
+                    <input id="rf-generate-elog-checkbox" type="checkbox" name="notification" value="Y" checked="checked"/>
+                </p>
+            </div>
+            <div class="editable-field">Click the Save button to sign:
+                <span>
+                            <button id="rf-save-button" class="ajax-button inline-button" type="button">Save</button>
+                            <span class="cancel-text">
+                                or
+                                <a id="rf-cancel-button" href="#">Cancel</a>
+                            </span>
+                        </span>
+            </div>
+        </div>
+        <div class="history-panel">
+            <c:if test="${not isHistory}">
+                <a data-dialog-title="Authorization History" href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history" title="Click for authorization history">History</a>
+            </c:if>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/history/beam-history.jsp b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
index 5ba4d78..6d1c1b1 100644
--- a/src/main/webapp/WEB-INF/views/history/beam-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
@@ -5,7 +5,7 @@
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:facility-authorizations-page title="Authorization History">
+<t:facility-authorizations-page title="Beam Authorization History">
     <jsp:attribute name="stylesheets">
     </jsp:attribute>
     <jsp:attribute name="scripts">
@@ -59,7 +59,7 @@
                                 </c:forEach>
                             </tbody>
                         </table>
-                        <form id="filter-form" action="beamAuthorization-history" method="get">
+                        <form id="filter-form" action="" method="get">
                             <input type="hidden" id="offset-input" name="offset" value="0"/>
                         </form>
                         <button id="previous-button" type="button" data-offset="${paginator.previousOffset}" value="Previous"${paginator.previous ? '' : ' disabled="disabled"'}>Previous</button>                        
diff --git a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
index 2799b5e..a499958 100644
--- a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
@@ -28,7 +28,7 @@
         <section>
             <c:choose>
                 <c:when test="${beamAuthorization ne null}">
-                    <t:authorizations-panel rfList="${rfList}" beamList="${beamList}" isEditable="${false}" isHistory="${true}"/>
+                    <t:beam-operations-panel beamList="${beamList}" isHistory="${true}"/>
                 </c:when>
                 <c:otherwise>
                     <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.beamAuthorizationId)}</div>
diff --git a/src/main/webapp/WEB-INF/views/history/rf-history.jsp b/src/main/webapp/WEB-INF/views/history/rf-history.jsp
new file mode 100644
index 0000000..5c621b4
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/history/rf-history.jsp
@@ -0,0 +1,72 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<t:facility-authorizations-page title="RF Authorization History">
+    <jsp:attribute name="stylesheets">
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript">
+            $(document).on("click", "#next-button, #previous-button", function () {
+                $("#offset-input").val($(this).attr("data-offset"));
+                $("#filter-form").submit();
+            });
+        </script>
+    </jsp:attribute>        
+    <jsp:body>
+        <div class="banner-breadbox">
+            <ul>
+                <li>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                </li>
+                <li>
+                    <span>RF History</span>
+                </li>
+            </ul>
+        </div>        
+        <section>
+            <div class="dialog-content">
+                <c:choose>
+                    <c:when test="${fn:length(historyList) < 1}">
+                        <div class="message-box">None</div>
+                    </c:when>
+                    <c:otherwise>
+                        <div class="message-box"><c:out value="${selectionMessage}"/></div>
+                        <table id="rfAuthorization-table" class="data-table stripped-table">
+                            <thead>
+                                <tr>
+                                    <th>Modified Date</th>
+                                    <th>Modified By</th>
+                                    <th>Authorization Date</th>
+                                    <th>Authorized By</th>
+                                    <th>Notes</th>
+                                    <th>Segment Authorizations</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="${historyList}" var="history">
+                                    <tr>
+                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.modifiedDate}"/></td>
+                                        <td><c:out value="${s:formatUsername(history.modifiedBy)}"/></td>
+                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.authorizationDate}"/></td>
+                                        <td><c:out value="${s:formatUsername(history.authorizedBy)}"/></td>
+                                        <td><c:out value="${history.comments}"/></td>
+                                        <td><a href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history/segments?rfAuthorizationId=${history.rfAuthorizationId}">Segment Details</a></td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                        <form id="filter-form" action="" method="get">
+                            <input type="hidden" id="offset-input" name="offset" value="0"/>
+                        </form>
+                        <button id="previous-button" type="button" data-offset="${paginator.previousOffset}" value="Previous"${paginator.previous ? '' : ' disabled="disabled"'}>Previous</button>                        
+                        <button id="next-button" type="button" data-offset="${paginator.nextOffset}" value="Next"${paginator.next ? '' : ' disabled="disabled"'}>Next</button> 
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </section>          
+    </jsp:body>         
+</t:facility-authorizations-page>

From 623ca62f9e73e8ab1fa142077a8244083d3e1177 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 14:01:15 -0500
Subject: [PATCH 16/44] Separate Facilities

---
 .../session/BeamAuthorizationFacade.java      |  12 +-
 .../controller/FacilityAuthorization.java     | 180 ------------------
 .../ajax/EditBeamAuthorization.java           | 177 ++++++++++++++---
 .../WEB-INF/tags/authorizations-panel.tag     |   1 +
 .../webapp/resources/js/authorizations.js     |  47 +++--
 5 files changed, 180 insertions(+), 237 deletions(-)

diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
index 7520462..a466b59 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
@@ -30,6 +30,7 @@
 import org.jlab.jam.persistence.entity.BeamAuthorization;
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
+import org.jlab.jam.persistence.entity.Facility;
 import org.jlab.jlog.Body;
 import org.jlab.jlog.Library;
 import org.jlab.jlog.LogEntry;
@@ -238,7 +239,8 @@ public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
   }
 
   @RolesAllowed("jam-admin")
-  public long sendELog(String proxyServer, String logbookServer) throws UserFriendlyException {
+  public long sendELog(Facility facility, String proxyServer, String logbookServer)
+      throws UserFriendlyException {
     String username = checkAuthenticated();
 
     BeamAuthorization beamAuthorization = findCurrent();
@@ -279,7 +281,7 @@ public long sendELog(String proxyServer, String logbookServer) throws UserFriend
     File tmpFile = null;
 
     try {
-      tmpFile = grabPermissionsScreenshot();
+      tmpFile = grabPermissionsScreenshot(facility);
       entry.addAttachment(tmpFile.getAbsolutePath());
       logId = entry.submitNow();
 
@@ -302,7 +304,7 @@ public long sendELog(String proxyServer, String logbookServer) throws UserFriend
     return logId;
   }
 
-  private File grabPermissionsScreenshot() throws IOException {
+  private File grabPermissionsScreenshot(Facility facility) throws IOException {
 
     String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL");
     String internalServer = System.getenv("BACKEND_SERVER_URL");
@@ -322,7 +324,9 @@ private File grabPermissionsScreenshot() throws IOException {
             puppetServer
                 + "/puppet-show/screenshot?url="
                 + internalServer
-                + "%2Fjam%2Fpermissions%3Fprint%3DY&fullPage=true&filename=jam.png&ignoreHTTPSErrors=true");
+                + "%2Fjam%2Fauthorizations%2F"
+                + facility.getPath().substring(1) // trim leading slash
+                + "%3Fprint%3DY&fullPage=true&filename=jam.png&ignoreHTTPSErrors=true");
 
     LOGGER.log(Level.FINEST, "Fetching URL: {0}", url.toString());
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 97ade01..9b5d48d 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -1,23 +1,13 @@
 package org.jlab.jam.presentation.controller;
 
 import java.io.IOException;
-import java.io.PrintWriter;
-import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.nio.file.Path;
 import java.nio.file.Paths;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
-import javax.json.Json;
-import javax.json.JsonObject;
-import javax.json.JsonObjectBuilder;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
@@ -25,9 +15,6 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.*;
 import org.jlab.jam.persistence.entity.*;
-import org.jlab.smoothness.business.exception.UserFriendlyException;
-import org.jlab.smoothness.business.util.TimeUtil;
-import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
  * @author ryans
@@ -155,171 +142,4 @@ private void handleFacility(
         .getRequestDispatcher("/WEB-INF/views/facility-authorization.jsp")
         .forward(request, response);
   }
-
-  /**
-   * Handles the HTTP <code>POST</code> method.
-   *
-   * @param request servlet request
-   * @param response servlet response
-   * @throws ServletException if a servlet-specific error occurs
-   * @throws IOException if an I/O error occurs
-   */
-  @Override
-  @SuppressWarnings("unchecked")
-  protected void doPost(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-    String errorReason = null;
-    Long logId = null;
-
-    String comments = request.getParameter("comments");
-
-    Boolean sendNotifications = false;
-
-    try {
-      sendNotifications = ParamConverter.convertYNBoolean(request, "notification");
-
-      if (sendNotifications == null) {
-        sendNotifications = false;
-      }
-    } catch (Exception e) {
-      LOGGER.log(Level.WARNING, "Unable to parse notifications parameter");
-    }
-
-    try {
-      List<BeamDestinationAuthorization> beamDestinationAuthorizationList =
-          convertDestinationAuthorizationList(request);
-
-      beamAuthorizationFacade.saveAuthorization(comments, beamDestinationAuthorizationList);
-    } catch (UserFriendlyException e) {
-      errorReason = e.getUserMessage();
-      LOGGER.log(Level.INFO, "Unable to save authorization: " + errorReason);
-    } catch (Exception e) {
-      errorReason = "Unable to save authorization";
-      LOGGER.log(Level.SEVERE, errorReason, e);
-    }
-
-    if (errorReason == null && sendNotifications) {
-      String proxyServer = System.getenv("FRONTEND_SERVER_URL");
-
-      try {
-        beamAuthorizationFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
-      } catch (UserFriendlyException e) {
-        errorReason = "Authorization was saved, but we were unable to send to ops an email.  ";
-        LOGGER.log(Level.SEVERE, errorReason, e);
-      }
-
-      try {
-        String logbookServer = System.getenv("LOGBOOK_SERVER_URL");
-
-        logId = beamAuthorizationFacade.sendELog(proxyServer, logbookServer);
-      } catch (Exception e) {
-        errorReason = "Authorization was saved, but we were unable to send to eLog";
-        LOGGER.log(Level.SEVERE, errorReason, e);
-      }
-    }
-
-    response.setContentType("application/json");
-
-    PrintWriter pw = response.getWriter();
-
-    JsonObjectBuilder builder = Json.createObjectBuilder();
-
-    if (errorReason == null) {
-      if (logId != null) {
-        builder.add("logId", logId);
-      }
-    } else {
-      builder.add("error", errorReason);
-    }
-
-    JsonObject obj = builder.build();
-
-    String json = obj.toString();
-
-    pw.print(json);
-
-    pw.flush();
-
-    boolean error = pw.checkError();
-
-    if (error) {
-      LOGGER.log(Level.SEVERE, "PrintWriter Error");
-    }
-  }
-
-  private List<BeamDestinationAuthorization> convertDestinationAuthorizationList(
-      HttpServletRequest request) throws UserFriendlyException {
-    List<BeamDestinationAuthorization> beamDestinationAuthorizationList = new ArrayList<>();
-    String[] modeArray = request.getParameterValues("mode[]");
-    String[] limitStrArray = request.getParameterValues("limit[]");
-    String[] commentsArray = request.getParameterValues("comment[]");
-    String[] expirationArray = request.getParameterValues("expiration[]");
-    String[] beamDestinationIdStrArray = request.getParameterValues("beamDestinationId[]");
-    if (modeArray != null) {
-      if (limitStrArray == null || limitStrArray.length != modeArray.length) {
-        throw new IllegalArgumentException("mode array and limit array are of different length");
-      }
-
-      if (beamDestinationIdStrArray == null
-          || beamDestinationIdStrArray.length != modeArray.length) {
-        throw new IllegalArgumentException(
-            "mode array and beam destination ID array are of different length");
-      }
-
-      SimpleDateFormat dateFormatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
-
-      for (int i = 0; i < modeArray.length; i++) {
-        String mode = modeArray[i];
-
-        BeamDestinationAuthorization da = new BeamDestinationAuthorization();
-
-        da.setBeamMode(mode);
-
-        String limitStr = limitStrArray[i];
-
-        if ("None".equals(mode)) {
-          da.setCwLimit(null);
-        } else if (limitStr != null && !limitStr.equals("") && !limitStr.equals("N/A")) {
-          limitStr = limitStr.replaceAll(",", ""); // Remove commas
-
-          try {
-            BigDecimal limit = new BigDecimal(limitStr);
-            da.setCwLimit(limit);
-          } catch (NumberFormatException e) {
-            throw new UserFriendlyException("limit must be a number", e);
-          }
-        }
-
-        String comments = commentsArray[i];
-        da.setComments(comments);
-
-        String expiration = expirationArray[i];
-        if (expiration != null && !expiration.trim().isEmpty()) {
-          try {
-            Date expirationDate = dateFormatter.parse(expiration);
-            da.setExpirationDate(expirationDate);
-          } catch (ParseException e) {
-            LOGGER.log(Level.WARNING, "Unable to parse expiration date", e);
-          }
-        }
-
-        String beamDestinationIdStr = beamDestinationIdStrArray[i];
-
-        if (beamDestinationIdStr == null) {
-          throw new IllegalArgumentException("Beam Destination ID must not be null");
-        }
-
-        BigInteger beamDestinationId = new BigInteger(beamDestinationIdStr);
-
-        DestinationAuthorizationPK pk = new DestinationAuthorizationPK();
-        pk.setBeamDestinationId(beamDestinationId);
-        da.setDestinationAuthorizationPK(pk);
-
-        beamDestinationAuthorizationList.add(da);
-      }
-    }
-
-    return beamDestinationAuthorizationList;
-  }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
index 0d6a643..8bcef37 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
@@ -2,12 +2,16 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.math.BigDecimal;
 import java.math.BigInteger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.ejb.EJB;
-import javax.ejb.EJBAccessException;
-import javax.ejb.EJBException;
 import javax.json.Json;
 import javax.json.stream.JsonGenerator;
 import javax.servlet.ServletException;
@@ -15,10 +19,13 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.validation.ConstraintViolationException;
-import org.jlab.jam.business.session.ComponentFacade;
+import org.jlab.jam.business.session.BeamAuthorizationFacade;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
+import org.jlab.jam.persistence.entity.DestinationAuthorizationPK;
+import org.jlab.jam.persistence.entity.Facility;
 import org.jlab.smoothness.business.exception.UserFriendlyException;
-import org.jlab.smoothness.business.util.ExceptionUtil;
+import org.jlab.smoothness.business.util.TimeUtil;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -31,7 +38,8 @@ public class EditBeamAuthorization extends HttpServlet {
 
   private static final Logger LOGGER = Logger.getLogger(EditBeamAuthorization.class.getName());
 
-  @EJB ComponentFacade componentFacade;
+  @EJB BeamAuthorizationFacade beamAuthorizationFacade;
+  @EJB FacilityFacade facilityFacade;
 
   /**
    * Handles the HTTP <code>POST</code> method.
@@ -45,36 +53,66 @@ public class EditBeamAuthorization extends HttpServlet {
   protected void doPost(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     String errorReason = null;
+    Long logId = null;
+    Facility facility = null;
+    String comments = null;
+    Boolean sendNotifications = false;
 
     try {
-      BigInteger verificationId = ParamConverter.convertBigInteger(request, "verificationId");
-      BigInteger componentId = ParamConverter.convertBigInteger(request, "componentId");
+      BigInteger facilityId = ParamConverter.convertBigInteger(request, "facilityId");
 
-      componentFacade.addComponent(verificationId, componentId);
+      if (facilityId == null) {
+        throw new UserFriendlyException("Facility ID is required");
+      }
+
+      facility = facilityFacade.find(facilityId);
+
+      if (facility == null) {
+        throw new UserFriendlyException("Facility not found with ID: " + facilityId);
+      }
+
+      comments = request.getParameter("comments");
+
+      try {
+        sendNotifications = ParamConverter.convertYNBoolean(request, "notification");
+
+        if (sendNotifications == null) {
+          sendNotifications = false;
+        }
+      } catch (Exception e) {
+        throw new UserFriendlyException("Unable to parse notifications parameter");
+      }
+
+      List<BeamDestinationAuthorization> beamDestinationAuthorizationList =
+          convertDestinationAuthorizationList(facility, request);
+
+      beamAuthorizationFacade.saveAuthorization(comments, beamDestinationAuthorizationList);
     } catch (UserFriendlyException e) {
       errorReason = e.getUserMessage();
-    } catch (EJBException e) {
-      Throwable root = ExceptionUtil.getRootCause(e);
-      if (e instanceof EJBAccessException || root instanceof EJBAccessException) {
-        LOGGER.log(Level.WARNING, "Not authorized", e);
-        errorReason = "Not authorized";
-      } else if (root instanceof ConstraintViolationException) {
-        LOGGER.log(Level.WARNING, "Invalid input data", e);
-        errorReason = root.getMessage();
-      } else {
-        LOGGER.log(Level.WARNING, "Transaction rolled back", e);
-        errorReason =
-            "Unknown Exception of type: " + e.getCausedByException().getClass().getSimpleName();
-      }
+      LOGGER.log(Level.INFO, "Unable to save authorization: " + errorReason);
     } catch (Exception e) {
-      LOGGER.log(Level.SEVERE, "Unable to add component", e);
-      errorReason = e.getClass().getSimpleName();
+      errorReason = "Unable to save authorization";
+      LOGGER.log(Level.SEVERE, errorReason, e);
     }
 
-    String stat = "ok";
+    if (errorReason == null && sendNotifications) {
+      String proxyServer = System.getenv("FRONTEND_SERVER_URL");
+
+      try {
+        beamAuthorizationFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
+      } catch (UserFriendlyException e) {
+        errorReason = "Authorization was saved, but we were unable to send to ops an email.  ";
+        LOGGER.log(Level.SEVERE, errorReason, e);
+      }
+
+      try {
+        String logbookServer = System.getenv("LOGBOOK_SERVER_URL");
 
-    if (errorReason != null) {
-      stat = "fail";
+        logId = beamAuthorizationFacade.sendELog(facility, proxyServer, logbookServer);
+      } catch (Exception e) {
+        errorReason = "Authorization was saved, but we were unable to send to eLog";
+        LOGGER.log(Level.SEVERE, errorReason, e);
+      }
     }
 
     response.setContentType("application/json");
@@ -82,12 +120,93 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     OutputStream out = response.getOutputStream();
 
     try (JsonGenerator gen = Json.createGenerator(out)) {
-      gen.writeStartObject().write("stat", stat); // This is unnecessary - if 200 OK then it worked
-      if (errorReason != null) {
+      gen.writeStartObject();
+      if (errorReason == null) {
+        if (logId != null) {
+          gen.write("logId", logId);
+        }
+      } else {
         response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
         gen.write("error", errorReason);
       }
       gen.writeEnd();
     }
   }
+
+  private List<BeamDestinationAuthorization> convertDestinationAuthorizationList(
+      Facility facility, HttpServletRequest request) throws UserFriendlyException {
+    List<BeamDestinationAuthorization> beamDestinationAuthorizationList = new ArrayList<>();
+    String[] modeArray = request.getParameterValues("mode[]");
+    String[] limitStrArray = request.getParameterValues("limit[]");
+    String[] commentsArray = request.getParameterValues("comment[]");
+    String[] expirationArray = request.getParameterValues("expiration[]");
+    String[] beamDestinationIdStrArray = request.getParameterValues("beamDestinationId[]");
+    if (modeArray != null) {
+      if (limitStrArray == null || limitStrArray.length != modeArray.length) {
+        throw new IllegalArgumentException("mode array and limit array are of different length");
+      }
+
+      if (beamDestinationIdStrArray == null
+          || beamDestinationIdStrArray.length != modeArray.length) {
+        throw new IllegalArgumentException(
+            "mode array and beam destination ID array are of different length");
+      }
+
+      SimpleDateFormat dateFormatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
+
+      for (int i = 0; i < modeArray.length; i++) {
+        String mode = modeArray[i];
+
+        BeamDestinationAuthorization da = new BeamDestinationAuthorization();
+
+        da.setBeamMode(mode);
+
+        String limitStr = limitStrArray[i];
+
+        if ("None".equals(mode)) {
+          da.setCwLimit(null);
+        } else if (limitStr != null && !limitStr.equals("") && !limitStr.equals("N/A")) {
+          limitStr = limitStr.replaceAll(",", ""); // Remove commas
+
+          try {
+            BigDecimal limit = new BigDecimal(limitStr);
+            da.setCwLimit(limit);
+          } catch (NumberFormatException e) {
+            throw new UserFriendlyException("limit must be a number", e);
+          }
+        }
+
+        String comments = commentsArray[i];
+        da.setComments(comments);
+
+        String expiration = expirationArray[i];
+        if (expiration != null && !expiration.trim().isEmpty()) {
+          try {
+            Date expirationDate = dateFormatter.parse(expiration);
+            da.setExpirationDate(expirationDate);
+          } catch (ParseException e) {
+            LOGGER.log(Level.WARNING, "Unable to parse expiration date", e);
+          }
+        }
+
+        String beamDestinationIdStr = beamDestinationIdStrArray[i];
+
+        if (beamDestinationIdStr == null) {
+          throw new IllegalArgumentException("Beam Destination ID must not be null");
+        }
+
+        BigInteger beamDestinationId = new BigInteger(beamDestinationIdStr);
+
+        // TODO: Check if Beam Destination exists with given ID and verify it matches Facility
+
+        DestinationAuthorizationPK pk = new DestinationAuthorizationPK();
+        pk.setBeamDestinationId(beamDestinationId);
+        da.setDestinationAuthorizationPK(pk);
+
+        beamDestinationAuthorizationList.add(da);
+      }
+    }
+
+    return beamDestinationAuthorizationList;
+  }
 }
diff --git a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
index 1f68cae..df5f29c 100644
--- a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
@@ -31,6 +31,7 @@
             <h3>Beam Operations</h3>
             <div class="content">
                 <form id="beam-authorization-form" method="post" action="${pageContext.request.contextPath}/ajax/edit-beam-auth">
+                    <input type="hidden" name="facilityId" value="${facility.facilityId}">
                 <c:choose>
                     <c:when test="${not empty beamList}">
                         <c:if test="${isEditable}">
diff --git a/src/main/webapp/resources/js/authorizations.js b/src/main/webapp/resources/js/authorizations.js
index 2cbe49e..1f8bd89 100644
--- a/src/main/webapp/resources/js/authorizations.js
+++ b/src/main/webapp/resources/js/authorizations.js
@@ -1,27 +1,34 @@
 var jlab = jlab || {};
 jlab.beamSave = function () {
-    if (jlab.isRequest()) {
-        window.console && console.log("Ajax already in progress");
-        return;
-    }
-
-    jlab.requestStart();
 
-    var leaveSpinning = false,
-            $actionButton = $("#beam-save-button"),
-            success = false,
-            newLogId = null;
+    var $actionButton = $("#beam-save-button"),
+        success = false,
+        newLogId = null,
+        url = jlab.contextPath + "/ajax/edit-beam-auth",
+        data = $("#beam-authorization-form").serialize();
 
-    $actionButton.html("<span class=\"button-indicator\"></span>");
-    $actionButton.attr("disabled", "disabled");
+    $actionButton
+        .attr("disabled", "disabled")
+        .height($actionButton.height())
+        .width($actionButton.width())
+        .empty().append('<div class="button-indicator"></div>');
 
     var request = jQuery.ajax({
-        url: jlab.contextPath + "/ajax/edit-beam-auth",
+        url: url,
         type: "POST",
-        data: $("#beam-authorization-form").serialize(),
+        data: data,
         dataType: "json"
     });
 
+    request.fail(function (jqXHR, textStatus, errorThrown) {
+        console.log("fail jqXR:", jqXHR);
+        console.log("fail textStatus:", textStatus);
+        console.log("fail errorThrown:", errorThrown);
+        console.log('fail Response JSON:', jqXHR.responseJSON);
+
+        alert("Unable to save: " + jqXHR.responseJSON.error);
+    })
+
     request.done(function (data) {
         if (data.error) {
             alert('Unable to save: ' + data.error);
@@ -33,17 +40,9 @@ jlab.beamSave = function () {
 
     });
 
-    request.fail(function (xhr, textStatus) {
-        window.console && console.log('Unable to save: Text Status: ' + textStatus + ', Ready State: ' + xhr.readyState + ', HTTP Status Code: ' + xhr.status);
-        alert('Unable to verify; server did not handle request');
-    });
-
     request.always(function () {
-        jlab.requestEnd();
-        if (!leaveSpinning) {
-            $actionButton.html("Save");
-            $actionButton.removeAttr("disabled");
-        }
+        $actionButton.html("Save");
+        $actionButton.removeAttr("disabled");
 
         if (success) {
             if (newLogId !== null && typeof(newLogId) !== 'undefined') {

From 49b17928a8dcd411222a0924e01d3ea2bb4de56d Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 15:36:30 -0500
Subject: [PATCH 17/44] Separate Facilities

---
 container/oracle/initdb.d/02_ddl.sql          | 19 ++++++++----
 container/oracle/initdb.d/03_default_data.sql | 12 ++++----
 .../session/BeamAuthorizationFacade.java      |  5 +++-
 .../persistence/entity/BeamAuthorization.java | 29 +++++++++----------
 .../entity/BeamDestinationAuthorization.java  | 13 +++++++++
 .../ajax/EditBeamAuthorization.java           |  9 ++++--
 6 files changed, 57 insertions(+), 30 deletions(-)

diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index f220ce5..2dbe4ec 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -94,8 +94,8 @@ CREATE TABLE JAM_OWNER.FACILITY
 CREATE TABLE JAM_OWNER.RF_SEGMENT
 (
     RF_SEGMENT_ID INTEGER NOT NULL,
-    NAME          VARCHAR2(64 CHAR) NOT NULL,
     FACILITY_ID   INTEGER NOT NULL,
+    NAME          VARCHAR2(64 CHAR) NOT NULL,
     ACTIVE_YN     CHAR(1 BYTE) DEFAULT 'Y' NOT NULL,
     WEIGHT        INTEGER NOT NULL,
     CONSTRAINT RF_SEGMENT_PK PRIMARY KEY (RF_SEGMENT_ID),
@@ -105,49 +105,56 @@ CREATE TABLE JAM_OWNER.RF_SEGMENT
 CREATE TABLE JAM_OWNER.BEAM_DESTINATION
 (
     BEAM_DESTINATION_ID  INTEGER NOT NULL,
-    NAME                 VARCHAR2(64 CHAR) NOT NULL,
     FACILITY_ID          INTEGER NOT NULL,
+    NAME                 VARCHAR2(64 CHAR) NOT NULL,
     CURRENT_LIMIT_UNITS  VARCHAR2(3 CHAR) DEFAULT  'uA'  NOT NULL,
     ACTIVE_YN            CHAR(1 BYTE) DEFAULT  'Y'  NOT NULL,
     WEIGHT               INTEGER NOT NULL,
     CONSTRAINT BEAM_DESTINATION_PK PRIMARY KEY (BEAM_DESTINATION_ID),
     CONSTRAINT BEAM_DESTINATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
+    CONSTRAINT BEAM_DESTINATION_AK1 UNIQUE (BEAM_DESTINATION_ID, FACILITY_ID),
     CONSTRAINT BEAM_DESTINATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
 );
 
 CREATE TABLE JAM_OWNER.RF_AUTHORIZATION
 (
     RF_AUTHORIZATION_ID INTEGER NOT NULL,
+    FACILITY_ID         INTEGER NOT NULL,
     MODIFIED_DATE       DATE NOT NULL,
     MODIFIED_BY         VARCHAR2(64 CHAR) NOT NULL,
     AUTHORIZATION_DATE  DATE NOT NULL,
     AUTHORIZED_BY       VARCHAR(64 CHAR) NOT NULL,
     COMMENTS            VARCHAR2(2048 CHAR) NULL,
-    CONSTRAINT RF_AUTHORIZATION_PK PRIMARY KEY (RF_AUTHORIZATION_ID)
+    CONSTRAINT RF_AUTHORIZATION_PK PRIMARY KEY (RF_AUTHORIZATION_ID),
+    CONSTRAINT RF_AUTHORIZATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID)
 );
 
 CREATE TABLE JAM_OWNER.BEAM_AUTHORIZATION
 (
     BEAM_AUTHORIZATION_ID INTEGER NOT NULL,
+    FACILITY_ID           INTEGER NOT NULL,
     MODIFIED_DATE         DATE NOT NULL,
     MODIFIED_BY           VARCHAR2(64 CHAR) NOT NULL,
     AUTHORIZATION_DATE    DATE NOT NULL,
     AUTHORIZED_BY         VARCHAR(64 CHAR) NOT NULL,
     COMMENTS              VARCHAR2(2048 CHAR) NULL,
-    CONSTRAINT BEAM_AUTHORIZATION_PK PRIMARY KEY (BEAM_AUTHORIZATION_ID)
+    CONSTRAINT BEAM_AUTHORIZATION_PK PRIMARY KEY (BEAM_AUTHORIZATION_ID),
+    CONSTRAINT BEAM_AUTHORIZATION_AK1 UNIQUE (BEAM_AUTHORIZATION_ID, FACILITY_ID),
+    CONSTRAINT BEAM_AUTHORIZATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID)
 );
 
 CREATE TABLE JAM_OWNER.BEAM_DESTINATION_AUTHORIZATION
 (
     BEAM_DESTINATION_ID   INTEGER NOT NULL,
     BEAM_AUTHORIZATION_ID INTEGER NOT NULL,
+    FACILITY_ID           INTEGER NOT NULL,
     BEAM_MODE             VARCHAR2(16) NOT NULL,
     CW_LIMIT              NUMBER(24,12) NULL,
     COMMENTS              VARCHAR2(256) NULL,
     EXPIRATION_DATE       DATE NULL,
     CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_PK PRIMARY KEY (BEAM_DESTINATION_ID,BEAM_AUTHORIZATION_ID),
-    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK1 FOREIGN KEY (BEAM_DESTINATION_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID),
-    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (BEAM_AUTHORIZATION_ID) REFERENCES JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID),
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK1 FOREIGN KEY (BEAM_DESTINATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.BEAM_DESTINATION (BEAM_DESTINATION_ID, FACILITY_ID),
+    CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_FK2 FOREIGN KEY (BEAM_AUTHORIZATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID, FACILITY_ID),
     CONSTRAINT BEAM_DESTINATION_AUTHORIZATION_CK1 CHECK (BEAM_MODE IN ('None', 'Tune', 'CW', 'Ceramic Viewer', 'Viewer Limited', 'High Duty Cycle', 'BLM Checkout', 'RF Only'))
 );
 
diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index 75c44b6..eb26114 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -1,6 +1,6 @@
 alter session set container = XEPDB1;
 
--- Populate Verification
+-- Populate Verification Status
 insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (1, 'Verified');
 insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (50, 'Provisionally Verified');
 insert into JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID, NAME) values (100, 'Not Verified');
@@ -80,13 +80,13 @@ insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, C
 -- Populate Initial Verification History (Control 1, Destination 1)
 insert into JAM_OWNER.beam_control_verification_history (BEAM_CONTROL_VERIFICATION_HISTORY_ID, BEAM_CONTROL_VERIFICATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_history_id.nextval, 1, 100, sysdate, 'tbrown', null, null, 'tbrown', sysdate);
 
--- Populate Initial Authorization
-insert into JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID, MODIFIED_BY, MODIFIED_DATE, AUTHORIZATION_DATE, AUTHORIZED_BY, COMMENTS) values(JAM_OWNER.beam_authorization_id.nextval, 'tbrown', sysdate, sysdate, 'tbrown', 'testing');
+-- Populate Initial Beam Authorization
+insert into JAM_OWNER.BEAM_AUTHORIZATION (BEAM_AUTHORIZATION_ID, FACILITY_ID, MODIFIED_BY, MODIFIED_DATE, AUTHORIZATION_DATE, AUTHORIZED_BY, COMMENTS) values(JAM_OWNER.beam_authorization_id.nextval, 1, 'tbrown', sysdate, sysdate, 'tbrown', 'testing');
 
 -- Populate Initial Destination Authorization
-insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(1, 1, 'None', null, 'test 1', null);
-insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(2, 1, 'Tune', null, 'test 2', null);
-insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(3, 1, 'CW', 10, 'test 3', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, FACILITY_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(1, 1, 1, 'None', null, 'test 1', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, FACILITY_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(2, 1, 1, 'Tune', null, 'test 2', null);
+insert into JAM_OWNER.beam_destination_authorization (BEAM_DESTINATION_ID, BEAM_AUTHORIZATION_ID, FACILITY_ID, BEAM_MODE, CW_LIMIT, COMMENTS, EXPIRATION_DATE) values(3, 1, 1, 'CW', 10, 'test 3', null);
 
 -- Populate Component
 insert into JAM_OWNER.COMPONENT (COMPONENT_ID, NAME, STATUS_ID) values (2763, '0L03', 1);
diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
index a466b59..703741f 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
@@ -144,11 +144,14 @@ public Map<BigInteger, BeamDestinationAuthorization> createDestinationAuthorizat
 
   @RolesAllowed("jam-admin")
   public void saveAuthorization(
-      String comments, List<BeamDestinationAuthorization> beamDestinationAuthorizationList)
+      Facility facility,
+      String comments,
+      List<BeamDestinationAuthorization> beamDestinationAuthorizationList)
       throws UserFriendlyException {
     String username = checkAuthenticated();
 
     BeamAuthorization beamAuthorization = new BeamAuthorization();
+    beamAuthorization.setFacility(facility);
     beamAuthorization.setComments(comments);
     beamAuthorization.setAuthorizationDate(new Date());
     beamAuthorization.setAuthorizedBy(username);
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
index 20d6762..c028db1 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamAuthorization.java
@@ -4,21 +4,7 @@
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -44,6 +30,11 @@ public class BeamAuthorization implements Serializable {
   @Column(name = "BEAM_AUTHORIZATION_ID", nullable = false, precision = 22, scale = 0)
   private BigInteger beamAuthorizationId;
 
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
   @Basic(optional = false)
   @NotNull
   @Column(name = "AUTHORIZATION_DATE", nullable = false)
@@ -81,6 +72,14 @@ public void setBeamAuthorizationId(BigInteger beamAuthorizationId) {
     this.beamAuthorizationId = beamAuthorizationId;
   }
 
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
   public Date getAuthorizationDate() {
     return authorizationDate;
   }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
index 01fb78c..bf793fb 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/BeamDestinationAuthorization.java
@@ -34,6 +34,11 @@ public class BeamDestinationAuthorization implements Serializable {
   private static final long serialVersionUID = 1L;
   @EmbeddedId protected DestinationAuthorizationPK destinationAuthorizationPK;
 
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
   @Basic(optional = false)
   @NotNull
   @Size(min = 1, max = 16)
@@ -95,6 +100,14 @@ public void setDestinationAuthorizationPK(DestinationAuthorizationPK destination
     this.destinationAuthorizationPK = destinationAuthorizationPK;
   }
 
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
   public BeamDestination getDestination() {
     return destination;
   }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
index 8bcef37..2bcaa8d 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
@@ -86,7 +86,8 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       List<BeamDestinationAuthorization> beamDestinationAuthorizationList =
           convertDestinationAuthorizationList(facility, request);
 
-      beamAuthorizationFacade.saveAuthorization(comments, beamDestinationAuthorizationList);
+      beamAuthorizationFacade.saveAuthorization(
+          facility, comments, beamDestinationAuthorizationList);
     } catch (UserFriendlyException e) {
       errorReason = e.getUserMessage();
       LOGGER.log(Level.INFO, "Unable to save authorization: " + errorReason);
@@ -197,7 +198,11 @@ private List<BeamDestinationAuthorization> convertDestinationAuthorizationList(
 
         BigInteger beamDestinationId = new BigInteger(beamDestinationIdStr);
 
-        // TODO: Check if Beam Destination exists with given ID and verify it matches Facility
+        // We don't Check if Beam Destination exists with given ID and verify matches
+        // DestinationAuthorization Facility
+        // At the moment we have database constraints that will check this for us, but error may be
+        // hard to parse
+        da.setFacility(facility);
 
         DestinationAuthorizationPK pk = new DestinationAuthorizationPK();
         pk.setBeamDestinationId(beamDestinationId);

From 19653260feeb8d75bf84e04433ae38b0b4f97306 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 16:19:36 -0500
Subject: [PATCH 18/44] Separate Facilities

---
 container/oracle/initdb.d/02_ddl.sql          |  10 +-
 .../session/BeamAuthorizationFacade.java      | 172 ----------------
 .../jam/business/session/LogbookFacade.java   | 194 ++++++++++++++++++
 .../session/RFAuthorizationFacade.java        |   3 +-
 .../persistence/entity/RFAuthorization.java   |  29 ++-
 .../entity/RFSegmentAuthorization.java        |  13 ++
 .../ajax/EditBeamAuthorization.java           |   6 +-
 .../controller/ajax/EditRFAuthorization.java  | 194 ++++++++++++++++++
 .../WEB-INF/tags/authorizations-panel.tag     |  25 ++-
 .../WEB-INF/tags/rf-operations-panel.tag      |   7 +-
 .../webapp/resources/js/authorizations.js     |  82 +++++++-
 11 files changed, 528 insertions(+), 207 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/business/session/LogbookFacade.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java

diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index 2dbe4ec..89ee88f 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -99,6 +99,8 @@ CREATE TABLE JAM_OWNER.RF_SEGMENT
     ACTIVE_YN     CHAR(1 BYTE) DEFAULT 'Y' NOT NULL,
     WEIGHT        INTEGER NOT NULL,
     CONSTRAINT RF_SEGMENT_PK PRIMARY KEY (RF_SEGMENT_ID),
+    CONSTRAINT RF_SEGMENT_AK1 UNIQUE (RF_SEGMENT_ID, FACILITY_ID),
+    CONSTRAINT RF_SEGMENT_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
     CONSTRAINT RF_SEGMENT_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
 );
 
@@ -111,8 +113,8 @@ CREATE TABLE JAM_OWNER.BEAM_DESTINATION
     ACTIVE_YN            CHAR(1 BYTE) DEFAULT  'Y'  NOT NULL,
     WEIGHT               INTEGER NOT NULL,
     CONSTRAINT BEAM_DESTINATION_PK PRIMARY KEY (BEAM_DESTINATION_ID),
-    CONSTRAINT BEAM_DESTINATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
     CONSTRAINT BEAM_DESTINATION_AK1 UNIQUE (BEAM_DESTINATION_ID, FACILITY_ID),
+    CONSTRAINT BEAM_DESTINATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID),
     CONSTRAINT BEAM_DESTINATION_CK1 CHECK (ACTIVE_YN IN ('Y', 'N'))
 );
 
@@ -126,6 +128,7 @@ CREATE TABLE JAM_OWNER.RF_AUTHORIZATION
     AUTHORIZED_BY       VARCHAR(64 CHAR) NOT NULL,
     COMMENTS            VARCHAR2(2048 CHAR) NULL,
     CONSTRAINT RF_AUTHORIZATION_PK PRIMARY KEY (RF_AUTHORIZATION_ID),
+    CONSTRAINT RF_AUTHORIZATION_AK1 UNIQUE (RF_AUTHORIZATION_ID, FACILITY_ID),
     CONSTRAINT RF_AUTHORIZATION_FK1 FOREIGN KEY (FACILITY_ID) REFERENCES JAM_OWNER.FACILITY (FACILITY_ID)
 );
 
@@ -162,12 +165,13 @@ CREATE TABLE JAM_OWNER.RF_SEGMENT_AUTHORIZATION
 (
     RF_SEGMENT_ID       INTEGER NOT NULL,
     RF_AUTHORIZATION_ID INTEGER NOT NULL,
+    FACILITY_ID         INTEGER NOT NULL,
     RF_MODE             VARCHAR2(16) NOT NULL,
     COMMENTS            VARCHAR2(256) NULL,
     EXPIRATION_DATE     DATE NULL,
     CONSTRAINT RF_SEGMENT_AUTHORIZATION_PK PRIMARY KEY (RF_SEGMENT_ID,RF_AUTHORIZATION_ID),
-    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK1 FOREIGN KEY (RF_SEGMENT_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID),
-    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK2 FOREIGN KEY (RF_AUTHORIZATION_ID) REFERENCES JAM_OWNER.RF_AUTHORIZATION (RF_AUTHORIZATION_ID),
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK1 FOREIGN KEY (RF_SEGMENT_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID, FACILITY_ID),
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK2 FOREIGN KEY (RF_AUTHORIZATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_AUTHORIZATION (RF_AUTHORIZATION_ID, FACILITY_ID),
     CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (RF_MODE IN ('None', 'RF ON'))
 );
 
diff --git a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
index 703741f..8418c5b 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamAuthorizationFacade.java
@@ -1,21 +1,11 @@
 package org.jlab.jam.business.session;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
 import java.math.BigInteger;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.security.DeclareRoles;
@@ -31,17 +21,7 @@
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
 import org.jlab.jam.persistence.entity.Facility;
-import org.jlab.jlog.Body;
-import org.jlab.jlog.Library;
-import org.jlab.jlog.LogEntry;
-import org.jlab.jlog.LogEntryAdminExtension;
-import org.jlab.jlog.exception.AttachmentSizeException;
-import org.jlab.jlog.exception.LogCertificateException;
-import org.jlab.jlog.exception.LogIOException;
-import org.jlab.jlog.exception.LogRuntimeException;
 import org.jlab.smoothness.business.exception.UserFriendlyException;
-import org.jlab.smoothness.business.service.EmailService;
-import org.jlab.smoothness.business.util.IOUtil;
 
 /**
  * @author ryans
@@ -210,156 +190,4 @@ public void saveAuthorization(
 
     LOGGER.log(Level.FINE, "Director's Authorization saved successfully");
   }
-
-  @RolesAllowed("jam-admin")
-  public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
-      throws UserFriendlyException {
-
-    String toCsv = System.getenv("JAM_PERMISSIONS_EMAIL_CSV");
-
-    if (toCsv == null || toCsv.isEmpty()) {
-      LOGGER.log(
-          Level.WARNING, "Environment variable 'JAM_PERMISSIONS_EMAIL_CSV' not found, aborting");
-      return;
-    }
-
-    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
-
-    String body = "<a href=\"" + linkHostName + "/jam\">" + linkHostName + "/jam</a>";
-
-    body = body + "\n\n<p>Notes: " + comments + "</p>";
-
-    String sender = System.getenv("JAM_EMAIL_SENDER");
-
-    if (sender == null || sender.isEmpty()) {
-      LOGGER.log(Level.WARNING, "Environment variable 'JAM_EMAIL_SENDER' not found, aborting");
-      return;
-    }
-
-    EmailService emailService = new EmailService();
-
-    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
-  }
-
-  @RolesAllowed("jam-admin")
-  public long sendELog(Facility facility, String proxyServer, String logbookServer)
-      throws UserFriendlyException {
-    String username = checkAuthenticated();
-
-    BeamAuthorization beamAuthorization = findCurrent();
-
-    if (beamAuthorization == null) {
-      throw new UserFriendlyException("No authorizations found");
-    }
-
-    // String body = getELogHTMLBody(authorization);
-    String body = getAlternateELogHTMLBody(proxyServer);
-
-    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
-
-    String logbooks = System.getenv("JAM_BOOKS_CSV");
-
-    if (logbooks == null || logbooks.isEmpty()) {
-      logbooks = "TLOG";
-      LOGGER.log(
-          Level.WARNING, "Environment variable 'JAM_BOOKS_CSV' not found, using default TLOG");
-    }
-
-    Properties config = Library.getConfiguration();
-
-    config.setProperty("SUBMIT_URL", logbookServer + "/incoming");
-    config.setProperty("FETCH_URL", logbookServer + "/entry");
-
-    LogEntry entry = new LogEntry(subject, logbooks);
-
-    entry.setBody(body, Body.ContentType.HTML);
-    entry.setTags("Readme");
-
-    LogEntryAdminExtension extension = new LogEntryAdminExtension(entry);
-    extension.setAuthor(username);
-
-    long logId;
-
-    // System.out.println(entry.getXML());
-    File tmpFile = null;
-
-    try {
-      tmpFile = grabPermissionsScreenshot(facility);
-      entry.addAttachment(tmpFile.getAbsolutePath());
-      logId = entry.submitNow();
-
-    } catch (IOException
-        | AttachmentSizeException
-        | LogIOException
-        | LogRuntimeException
-        | LogCertificateException e) {
-      throw new UserFriendlyException("Unable to send elog", e);
-    } finally {
-      if (tmpFile != null) {
-        boolean deleted = tmpFile.delete();
-        if (!deleted) {
-          LOGGER.log(
-              Level.WARNING, "Temporary image file was not deleted {0}", tmpFile.getAbsolutePath());
-        }
-      }
-    }
-
-    return logId;
-  }
-
-  private File grabPermissionsScreenshot(Facility facility) throws IOException {
-
-    String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL");
-    String internalServer = System.getenv("BACKEND_SERVER_URL");
-
-    if (puppetServer == null) {
-      puppetServer = "http://localhost";
-    }
-
-    if (internalServer == null) {
-      internalServer = "http://localhost";
-    }
-
-    internalServer = URLEncoder.encode(internalServer, StandardCharsets.UTF_8);
-
-    URL url =
-        new URL(
-            puppetServer
-                + "/puppet-show/screenshot?url="
-                + internalServer
-                + "%2Fjam%2Fauthorizations%2F"
-                + facility.getPath().substring(1) // trim leading slash
-                + "%3Fprint%3DY&fullPage=true&filename=jam.png&ignoreHTTPSErrors=true");
-
-    LOGGER.log(Level.FINEST, "Fetching URL: {0}", url.toString());
-
-    File tmpFile = null;
-    InputStream in = null;
-    OutputStream out = null;
-
-    try {
-      URLConnection con = url.openConnection();
-      in = con.getInputStream();
-
-      tmpFile = File.createTempFile("jam", ".png");
-      out = new FileOutputStream(tmpFile);
-      IOUtil.copy(in, out);
-
-    } finally {
-      IOUtil.close(in, out);
-    }
-    return tmpFile;
-  }
-
-  private String getAlternateELogHTMLBody(String server) {
-    StringBuilder builder = new StringBuilder();
-
-    builder.append(
-        "[figure:1]<div>\n\n<b><span style=\"color: red;\">Always check the Beam Authorization web application for the latest credited controls status:</span></b> ");
-    builder.append("<a href=\"");
-    builder.append(server);
-    builder.append("/jam/\">JLab Authorization Manager</a></div>\n");
-
-    return builder.toString();
-  }
 }
diff --git a/src/main/java/org/jlab/jam/business/session/LogbookFacade.java b/src/main/java/org/jlab/jam/business/session/LogbookFacade.java
new file mode 100644
index 0000000..6a43c6e
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/LogbookFacade.java
@@ -0,0 +1,194 @@
+package org.jlab.jam.business.session;
+
+import java.io.*;
+import java.net.URL;
+import java.net.URLConnection;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.jam.persistence.entity.Workgroup;
+import org.jlab.jlog.Body;
+import org.jlab.jlog.Library;
+import org.jlab.jlog.LogEntry;
+import org.jlab.jlog.LogEntryAdminExtension;
+import org.jlab.jlog.exception.AttachmentSizeException;
+import org.jlab.jlog.exception.LogCertificateException;
+import org.jlab.jlog.exception.LogIOException;
+import org.jlab.jlog.exception.LogRuntimeException;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
+import org.jlab.smoothness.business.service.EmailService;
+import org.jlab.smoothness.business.util.IOUtil;
+
+/**
+ * @author ryans
+ */
+@Stateless
+public class LogbookFacade extends AbstractFacade<Workgroup> {
+
+  private static final Logger LOGGER = Logger.getLogger(LogbookFacade.class.getName());
+
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public LogbookFacade() {
+    super(Workgroup.class);
+  }
+
+  @RolesAllowed("jam-admin")
+  public void sendOpsNewAuthorizationEmail(String linkHostName, String comments)
+      throws UserFriendlyException {
+
+    String toCsv = System.getenv("JAM_PERMISSIONS_EMAIL_CSV");
+
+    if (toCsv == null || toCsv.isEmpty()) {
+      LOGGER.log(
+          Level.WARNING, "Environment variable 'JAM_PERMISSIONS_EMAIL_CSV' not found, aborting");
+      return;
+    }
+
+    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
+
+    String body = "<a href=\"" + linkHostName + "/jam\">" + linkHostName + "/jam</a>";
+
+    body = body + "\n\n<p>Notes: " + comments + "</p>";
+
+    String sender = System.getenv("JAM_EMAIL_SENDER");
+
+    if (sender == null || sender.isEmpty()) {
+      LOGGER.log(Level.WARNING, "Environment variable 'JAM_EMAIL_SENDER' not found, aborting");
+      return;
+    }
+
+    EmailService emailService = new EmailService();
+
+    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+  }
+
+  @RolesAllowed("jam-admin")
+  public long sendELog(Facility facility, String proxyServer, String logbookServer)
+      throws UserFriendlyException {
+    String username = checkAuthenticated();
+
+    // String body = getELogHTMLBody(authorization);
+    String body = getAlternateELogHTMLBody(proxyServer);
+
+    String subject = System.getenv("JAM_PERMISSIONS_SUBJECT");
+
+    String logbooks = System.getenv("JAM_BOOKS_CSV");
+
+    if (logbooks == null || logbooks.isEmpty()) {
+      logbooks = "TLOG";
+      LOGGER.log(
+          Level.WARNING, "Environment variable 'JAM_BOOKS_CSV' not found, using default TLOG");
+    }
+
+    Properties config = Library.getConfiguration();
+
+    config.setProperty("SUBMIT_URL", logbookServer + "/incoming");
+    config.setProperty("FETCH_URL", logbookServer + "/entry");
+
+    LogEntry entry = new LogEntry(subject, logbooks);
+
+    entry.setBody(body, Body.ContentType.HTML);
+    entry.setTags("Readme");
+
+    LogEntryAdminExtension extension = new LogEntryAdminExtension(entry);
+    extension.setAuthor(username);
+
+    long logId;
+
+    // System.out.println(entry.getXML());
+    File tmpFile = null;
+
+    try {
+      tmpFile = grabPermissionsScreenshot(facility);
+      entry.addAttachment(tmpFile.getAbsolutePath());
+      logId = entry.submitNow();
+
+    } catch (IOException
+        | AttachmentSizeException
+        | LogIOException
+        | LogRuntimeException
+        | LogCertificateException e) {
+      throw new UserFriendlyException("Unable to send elog", e);
+    } finally {
+      if (tmpFile != null) {
+        boolean deleted = tmpFile.delete();
+        if (!deleted) {
+          LOGGER.log(
+              Level.WARNING, "Temporary image file was not deleted {0}", tmpFile.getAbsolutePath());
+        }
+      }
+    }
+
+    return logId;
+  }
+
+  private File grabPermissionsScreenshot(Facility facility) throws IOException {
+
+    String puppetServer = System.getenv("PUPPET_SHOW_SERVER_URL");
+    String internalServer = System.getenv("BACKEND_SERVER_URL");
+
+    if (puppetServer == null) {
+      puppetServer = "http://localhost";
+    }
+
+    if (internalServer == null) {
+      internalServer = "http://localhost";
+    }
+
+    internalServer = URLEncoder.encode(internalServer, StandardCharsets.UTF_8);
+
+    URL url =
+        new URL(
+            puppetServer
+                + "/puppet-show/screenshot?url="
+                + internalServer
+                + "%2Fjam%2Fauthorizations%2F"
+                + facility.getPath().substring(1) // trim leading slash
+                + "%3Fprint%3DY&fullPage=true&filename=jam.png&ignoreHTTPSErrors=true");
+
+    LOGGER.log(Level.FINEST, "Fetching URL: {0}", url.toString());
+
+    File tmpFile = null;
+    InputStream in = null;
+    OutputStream out = null;
+
+    try {
+      URLConnection con = url.openConnection();
+      in = con.getInputStream();
+
+      tmpFile = File.createTempFile("jam", ".png");
+      out = new FileOutputStream(tmpFile);
+      IOUtil.copy(in, out);
+
+    } finally {
+      IOUtil.close(in, out);
+    }
+    return tmpFile;
+  }
+
+  private String getAlternateELogHTMLBody(String server) {
+    StringBuilder builder = new StringBuilder();
+
+    builder.append(
+        "[figure:1]<div>\n\n<b><span style=\"color: red;\">Always check the Beam Authorization web application for the latest credited controls status:</span></b> ");
+    builder.append("<a href=\"");
+    builder.append(server);
+    builder.append("/jam/\">JLab Authorization Manager</a></div>\n");
+
+    return builder.toString();
+  }
+}
diff --git a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
index 2c843ef..df72706 100644
--- a/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFAuthorizationFacade.java
@@ -132,11 +132,12 @@ public Map<BigInteger, RFSegmentAuthorization> createSegmentAuthorizationMap(
 
   @RolesAllowed("jam-admin")
   public void saveAuthorization(
-      String comments, List<RFSegmentAuthorization> segmentAuthorizationList)
+      Facility facility, String comments, List<RFSegmentAuthorization> segmentAuthorizationList)
       throws UserFriendlyException {
     String username = checkAuthenticated();
 
     RFAuthorization authorization = new RFAuthorization();
+    authorization.setFacility(facility);
     authorization.setComments(comments);
     authorization.setAuthorizationDate(new Date());
     authorization.setAuthorizedBy(username);
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
index f6b4ccc..b569820 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFAuthorization.java
@@ -4,21 +4,7 @@
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.CascadeType;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -44,6 +30,11 @@ public class RFAuthorization implements Serializable {
   @Column(name = "RF_AUTHORIZATION_ID", nullable = false, precision = 22, scale = 0)
   private BigInteger rfAuthorizationId;
 
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
   @Basic(optional = false)
   @NotNull
   @Column(name = "AUTHORIZATION_DATE", nullable = false)
@@ -81,6 +72,14 @@ public void setRfAuthorizationId(BigInteger rfAuthorizationId) {
     this.rfAuthorizationId = rfAuthorizationId;
   }
 
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
   public Date getAuthorizationDate() {
     return authorizationDate;
   }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
index 695d501..ecd2094 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegmentAuthorization.java
@@ -33,6 +33,11 @@ public class RFSegmentAuthorization implements Serializable {
   private static final long serialVersionUID = 1L;
   @EmbeddedId protected SegmentAuthorizationPK segmentAuthorizationPK;
 
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
   @Basic(optional = false)
   @NotNull
   @Size(min = 1, max = 16)
@@ -88,6 +93,14 @@ public RFSegment getSegment() {
     return segment;
   }
 
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
   public String getRFMode() {
     return rfMode;
   }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
index 2bcaa8d..9a26100 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditBeamAuthorization.java
@@ -21,6 +21,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.BeamAuthorizationFacade;
 import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.business.session.LogbookFacade;
 import org.jlab.jam.persistence.entity.BeamDestinationAuthorization;
 import org.jlab.jam.persistence.entity.DestinationAuthorizationPK;
 import org.jlab.jam.persistence.entity.Facility;
@@ -40,6 +41,7 @@ public class EditBeamAuthorization extends HttpServlet {
 
   @EJB BeamAuthorizationFacade beamAuthorizationFacade;
   @EJB FacilityFacade facilityFacade;
+  @EJB LogbookFacade logbookFacade;
 
   /**
    * Handles the HTTP <code>POST</code> method.
@@ -100,7 +102,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       String proxyServer = System.getenv("FRONTEND_SERVER_URL");
 
       try {
-        beamAuthorizationFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
+        logbookFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
       } catch (UserFriendlyException e) {
         errorReason = "Authorization was saved, but we were unable to send to ops an email.  ";
         LOGGER.log(Level.SEVERE, errorReason, e);
@@ -109,7 +111,7 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
       try {
         String logbookServer = System.getenv("LOGBOOK_SERVER_URL");
 
-        logId = beamAuthorizationFacade.sendELog(facility, proxyServer, logbookServer);
+        logId = logbookFacade.sendELog(facility, proxyServer, logbookServer);
       } catch (Exception e) {
         errorReason = "Authorization was saved, but we were unable to send to eLog";
         LOGGER.log(Level.SEVERE, errorReason, e);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java
new file mode 100644
index 0000000..a5b3cfd
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/EditRFAuthorization.java
@@ -0,0 +1,194 @@
+package org.jlab.jam.presentation.controller.ajax;
+
+import java.io.IOException;
+import java.io.OutputStream;
+import java.math.BigInteger;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.ejb.EJB;
+import javax.json.Json;
+import javax.json.stream.JsonGenerator;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.business.session.LogbookFacade;
+import org.jlab.jam.business.session.RFAuthorizationFacade;
+import org.jlab.jam.persistence.entity.*;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
+import org.jlab.smoothness.business.util.TimeUtil;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "EditRFAuthorization",
+    urlPatterns = {"/ajax/edit-rf-auth"})
+public class EditRFAuthorization extends HttpServlet {
+
+  private static final Logger LOGGER = Logger.getLogger(EditRFAuthorization.class.getName());
+
+  @EJB RFAuthorizationFacade rfAuthorizationFacade;
+  @EJB FacilityFacade facilityFacade;
+  @EJB LogbookFacade logbookFacade;
+
+  /**
+   * Handles the HTTP <code>POST</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    String errorReason = null;
+    Long logId = null;
+    Facility facility = null;
+    String comments = null;
+    Boolean sendNotifications = false;
+
+    try {
+      BigInteger facilityId = ParamConverter.convertBigInteger(request, "facilityId");
+
+      if (facilityId == null) {
+        throw new UserFriendlyException("Facility ID is required");
+      }
+
+      facility = facilityFacade.find(facilityId);
+
+      if (facility == null) {
+        throw new UserFriendlyException("Facility not found with ID: " + facilityId);
+      }
+
+      comments = request.getParameter("comments");
+
+      try {
+        sendNotifications = ParamConverter.convertYNBoolean(request, "notification");
+
+        if (sendNotifications == null) {
+          sendNotifications = false;
+        }
+      } catch (Exception e) {
+        throw new UserFriendlyException("Unable to parse notifications parameter");
+      }
+
+      List<RFSegmentAuthorization> rfSegmentAuthorizationList =
+          convertSegmentAuthorizationList(facility, request);
+
+      rfAuthorizationFacade.saveAuthorization(facility, comments, rfSegmentAuthorizationList);
+    } catch (UserFriendlyException e) {
+      errorReason = e.getUserMessage();
+      LOGGER.log(Level.INFO, "Unable to save authorization: " + errorReason);
+    } catch (Exception e) {
+      errorReason = "Unable to save authorization";
+      LOGGER.log(Level.SEVERE, errorReason, e);
+    }
+
+    if (errorReason == null && sendNotifications) {
+      String proxyServer = System.getenv("FRONTEND_SERVER_URL");
+
+      try {
+        logbookFacade.sendOpsNewAuthorizationEmail(proxyServer, comments);
+      } catch (UserFriendlyException e) {
+        errorReason = "Authorization was saved, but we were unable to send to ops an email.  ";
+        LOGGER.log(Level.SEVERE, errorReason, e);
+      }
+
+      try {
+        String logbookServer = System.getenv("LOGBOOK_SERVER_URL");
+
+        logId = logbookFacade.sendELog(facility, proxyServer, logbookServer);
+      } catch (Exception e) {
+        errorReason = "Authorization was saved, but we were unable to send to eLog";
+        LOGGER.log(Level.SEVERE, errorReason, e);
+      }
+    }
+
+    response.setContentType("application/json");
+
+    OutputStream out = response.getOutputStream();
+
+    try (JsonGenerator gen = Json.createGenerator(out)) {
+      gen.writeStartObject();
+      if (errorReason == null) {
+        if (logId != null) {
+          gen.write("logId", logId);
+        }
+      } else {
+        response.setStatus(HttpServletResponse.SC_BAD_REQUEST);
+        gen.write("error", errorReason);
+      }
+      gen.writeEnd();
+    }
+  }
+
+  private List<RFSegmentAuthorization> convertSegmentAuthorizationList(
+      Facility facility, HttpServletRequest request) throws UserFriendlyException {
+    List<RFSegmentAuthorization> rfSegmentAuthorizationList = new ArrayList<>();
+    String[] modeArray = request.getParameterValues("mode[]");
+    String[] commentsArray = request.getParameterValues("comment[]");
+    String[] expirationArray = request.getParameterValues("expiration[]");
+    String[] rfSegmentIdStrArray = request.getParameterValues("rfSegmentId[]");
+    if (modeArray != null) {
+      if (rfSegmentIdStrArray == null || rfSegmentIdStrArray.length != modeArray.length) {
+        throw new IllegalArgumentException(
+            "mode array and RF Segment ID array are of different length");
+      }
+
+      SimpleDateFormat dateFormatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
+
+      for (int i = 0; i < modeArray.length; i++) {
+        String mode = modeArray[i];
+
+        RFSegmentAuthorization da = new RFSegmentAuthorization();
+
+        da.setRFMode(mode);
+
+        String comments = commentsArray[i];
+        da.setComments(comments);
+
+        String expiration = expirationArray[i];
+        if (expiration != null && !expiration.trim().isEmpty()) {
+          try {
+            Date expirationDate = dateFormatter.parse(expiration);
+            da.setExpirationDate(expirationDate);
+          } catch (ParseException e) {
+            LOGGER.log(Level.WARNING, "Unable to parse expiration date", e);
+          }
+        }
+
+        String rfSegmentIdStr = rfSegmentIdStrArray[i];
+
+        if (rfSegmentIdStr == null) {
+          throw new IllegalArgumentException("RF Segment ID must not be null");
+        }
+
+        BigInteger rfSegmentId = new BigInteger(rfSegmentIdStr);
+
+        // We don't Check if RF Segment exists with given ID and verify matches
+        // SegmentAuthorization Facility
+        // At the moment we have database constraints that will check this for us, but error may be
+        // hard to parse
+        da.setFacility(facility);
+
+        SegmentAuthorizationPK pk = new SegmentAuthorizationPK();
+        pk.setRFSegmentId(rfSegmentId);
+        da.setSegmentAuthorizationPK(pk);
+
+        rfSegmentAuthorizationList.add(da);
+      }
+    }
+
+    return rfSegmentAuthorizationList;
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
index df5f29c..d72c737 100644
--- a/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/authorizations-panel.tag
@@ -14,17 +14,20 @@
         <div class="accordion">
             <h3>RF Operations</h3>
             <div class="content">
-                <c:choose>
-                    <c:when test="${not empty rfList}">
-                        <c:if test="${isEditable}">
-                            <span class="readonly-field"><button id="rf-edit-button" type="button">Edit RF Operations</button></span>
-                        </c:if>
-                        <t:rf-operations-panel rfList="${rfList}" isHistory="${isHistory}"/>
-                    </c:when>
-                    <c:otherwise>
-                        None
-                    </c:otherwise>
-                </c:choose>
+                <form id="rf-authorization-form" method="post" action="${pageContext.request.contextPath}/ajax/edit-rf-auth">
+                    <input type="hidden" name="facilityId" value="${facility.facilityId}">
+                    <c:choose>
+                        <c:when test="${not empty rfList}">
+                            <c:if test="${isEditable}">
+                                <span class="readonly-field"><button id="rf-edit-button" type="button">Edit RF Operations</button></span>
+                            </c:if>
+                            <t:rf-operations-panel rfList="${rfList}" isHistory="${isHistory}"/>
+                        </c:when>
+                        <c:otherwise>
+                            None
+                        </c:otherwise>
+                    </c:choose>
+                </form>
             </div>
         </div>
         <div class="accordion">
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
index d073a90..986a6fb 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
@@ -29,7 +29,10 @@
         <c:forEach items="${rfList}" var="segment">
             <c:set var="rfSegmentAuthorization" value="${rfAuthorizationMap[segment.getRFSegmentId()]}"/>
             <tr>
-                <td><c:out value="${segment.name}"/></td>
+                <td>
+                    <c:out value="${segment.name}"/>
+                    <input type="hidden" name="rfSegmentId[]" value="${segment.getRFSegmentId()}"/>
+                </td>
                     <c:if test="${not isHistory}">
                     <td class="icon-cell">
                         <c:choose>
@@ -67,7 +70,7 @@
                     <fmt:formatDate var="selectedExpiration" value="${rfSegmentAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedExpiration}"/>
-                        <span class="expiring-soon" style="<c:out value="${beamDestinationAuthorization.expirationDate ne null and beamDestinationAuthorization.expirationDate.time > beamauth:now().time and beamDestinationAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                        <span class="expiring-soon" style="<c:out value="${rfSegmentAuthorization.expirationDate ne null and rfSegmentAuthorization.expirationDate.time > beamauth:now().time and rfSegmentAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
                     </span>
                     <span class="editable-field">
                         <input name="expiration[]" type="text" class="expiration-input date-time-field" autocomplete="off" placeholder="${s:getFriendlyDateTimePlaceholder()}" value="${selectedBeamMode eq 'None' ? '' : selectedExpiration}"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}/>
diff --git a/src/main/webapp/resources/js/authorizations.js b/src/main/webapp/resources/js/authorizations.js
index 1f8bd89..10e6cd2 100644
--- a/src/main/webapp/resources/js/authorizations.js
+++ b/src/main/webapp/resources/js/authorizations.js
@@ -1,4 +1,66 @@
 var jlab = jlab || {};
+jlab.rfSave = function () {
+
+    var $actionButton = $("#rf-save-button"),
+        success = false,
+        newLogId = null,
+        url = jlab.contextPath + "/ajax/edit-rf-auth",
+        data = $("#rf-authorization-form").serialize();
+
+    $actionButton
+        .attr("disabled", "disabled")
+        .height($actionButton.height())
+        .width($actionButton.width())
+        .empty().append('<div class="button-indicator"></div>');
+
+    var request = jQuery.ajax({
+        url: url,
+        type: "POST",
+        data: data,
+        dataType: "json"
+    });
+
+    request.fail(function (jqXHR, textStatus, errorThrown) {
+        console.log("fail jqXR:", jqXHR);
+        console.log("fail textStatus:", textStatus);
+        console.log("fail errorThrown:", errorThrown);
+        console.log('fail Response JSON:', jqXHR.responseJSON);
+
+        var error = textStatus;
+
+        if(jqXHR.responseJSON) {
+            error = jqXHR.responseJSON.error
+        }
+
+        alert("Unable to save: " + error);
+    })
+
+    request.done(function (data) {
+        if (data.error) {
+            alert('Unable to save: ' + data.error);
+        } else {
+            /* Success */
+            success = true;
+            newLogId = data.logId;
+        }
+
+    });
+
+    request.always(function () {
+        $actionButton.html("Save");
+        $actionButton.removeAttr("disabled");
+
+        if (success) {
+            if (newLogId !== null && typeof(newLogId) !== 'undefined') {
+                $("#new-entry-url").attr("href", jlab.logbookServerUrl + "/entry/" + newLogId);
+                $("#new-entry-url").text(newLogId);
+                $("#success-dialog").dialog("open");
+            } else {
+                document.location.reload();
+            }
+        }
+    });
+};
 jlab.beamSave = function () {
 
     var $actionButton = $("#beam-save-button"),
@@ -26,7 +88,13 @@ jlab.beamSave = function () {
         console.log("fail errorThrown:", errorThrown);
         console.log('fail Response JSON:', jqXHR.responseJSON);
 
-        alert("Unable to save: " + jqXHR.responseJSON.error);
+        var error = textStatus;
+
+        if(jqXHR.responseJSON) {
+            error = jqXHR.responseJSON.error
+        }
+
+        alert("Unable to save: " + error);
     })
 
     request.done(function (data) {
@@ -92,6 +160,18 @@ $(document).on("click", "#beam-cancel-button", function () {
 $(document).on("click", "#beam-save-button", function () {
     jlab.beamSave();
 });
+$(document).on("click", "#rf-edit-button", function () {
+    $("#rf-authorization-form .readonly-field").hide();
+    $("#rf-authorization-form .editable-field").show();
+});
+$(document).on("click", "#rf-cancel-button", function () {
+    $("#rf-authorization-form .editable-field").hide();
+    $("#rf-authorization-form .readonly-field").show();
+    return false;
+});
+$(document).on("click", "#rf-save-button", function () {
+    jlab.rfSave();
+});
 $("#success-dialog").on("dialogclose", function () {
     document.location.reload(true);
 });

From bc6a48555591d8f8a2c0ec28e19d3554df7ad72a Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 16:50:39 -0500
Subject: [PATCH 19/44] Separate Facilities

---
 ...nationsAuthorizationHistoryController.java |  2 -
 .../controller/FacilityAuthorization.java     |  8 ++-
 ...egmentsAuthorizationHistoryController.java | 66 +++++++++++++++++++
 .../views/history/segments-history.jsp        | 39 +++++++++++
 4 files changed, 111 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
 create mode 100644 src/main/webapp/WEB-INF/views/history/segments-history.jsp

diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index 92f7566..93f781a 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -51,7 +51,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     // authorization,
     // it would be better to grab list of destinations and segments that existed at time of
     // authorization.
-    List<RFSegment> rfList = null;
     List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
 
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
@@ -59,7 +58,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
     request.setAttribute("beamAuthorization", beamAuthorization);
-    request.setAttribute("rfList", rfList);
     request.setAttribute("beamList", beamList);
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 9b5d48d..890a5e3 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -104,7 +104,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
               .getNamedDispatcher("DestinationsAuthorizationHistoryController")
               .forward(request, response);
         } else if ("segments".equals(thirdName)) {
-          throw new ServletException("segment-history not implemented yet!");
+          getServletContext()
+              .getNamedDispatcher("SegmentsAuthorizationHistoryController")
+              .forward(request, response);
         } else {
           // TODO: This should probably be 404
           throw new ServletException("Unknown authorizations path: " + pathInfo);
@@ -133,9 +135,11 @@ private void handleFacility(
         rfAuthorizationFacade.createSegmentAuthorizationMap(rfAuthorization);
 
     request.setAttribute("unitsMap", beamAuthorizationFacade.getUnitsMap());
-    request.setAttribute("authorization", beamAuthorization);
+    request.setAttribute("rfAuthorization", rfAuthorization);
+    request.setAttribute("beamAuthorization", beamAuthorization);
     request.setAttribute("rfList", rfList);
     request.setAttribute("beamList", beamList);
+    request.setAttribute("segmentAuthorizationMap", segmentAuthorizationMap);
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
     request
diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
new file mode 100644
index 0000000..876c491
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
@@ -0,0 +1,66 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.List;
+import java.util.Map;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.RFAuthorizationFacade;
+import org.jlab.jam.business.session.RFSegmentFacade;
+import org.jlab.jam.persistence.entity.*;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+
+/**
+ * @author ryans
+ */
+@WebServlet(name = "SegmentsAuthorizationHistoryController")
+public class SegmentsAuthorizationHistoryController extends HttpServlet {
+
+  @EJB RFAuthorizationFacade rfAuthorizationFacade;
+  @EJB RFSegmentFacade rfSegmentFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    BigInteger rfAuthorizationId = ParamConverter.convertBigInteger(request, "rfAuthorizationId");
+
+    RFAuthorization rfAuthorization = null;
+
+    if (rfAuthorizationId != null) {
+      rfAuthorization = rfAuthorizationFacade.find(rfAuthorizationId);
+    }
+
+    Facility facility = (Facility) request.getAttribute("facility");
+
+    // TODO: Instead of querying for current list of destinations / segments then mapping to
+    // authorization,
+    // it would be better to grab list of destinations and segments that existed at time of
+    // authorization.
+    List<RFSegment> rfList = rfSegmentFacade.findByFacility(facility);
+
+    Map<BigInteger, RFSegmentAuthorization> segmentAuthorizationMap =
+        rfAuthorizationFacade.createSegmentAuthorizationMap(rfAuthorization);
+
+    request.setAttribute("rfAuthorization", rfAuthorization);
+    request.setAttribute("rfList", rfList);
+    request.setAttribute("segmentAuthorizationMap", segmentAuthorizationMap);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/history/segments-history.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/views/history/segments-history.jsp b/src/main/webapp/WEB-INF/views/history/segments-history.jsp
new file mode 100644
index 0000000..a292b7e
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/history/segments-history.jsp
@@ -0,0 +1,39 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<t:facility-authorizations-page title="Segment Authorization History">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/authorizations.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+    </jsp:attribute>        
+    <jsp:body>
+        <div class="banner-breadbox">
+            <ul>
+                <li>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                </li>
+                <li>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history">RF History</a>
+                </li>
+                <li>
+                    <span><fmt:formatDate value="${rfAuthorization.modifiedDate}" pattern="${s:getFriendlyDateTimePattern()}"/></span>
+                </li>
+            </ul>
+        </div>        
+        <section>
+            <c:choose>
+                <c:when test="${rfAuthorization ne null}">
+                    <t:rf-operations-panel rfList="${rfList}" isHistory="${true}"/>
+                </c:when>
+                <c:otherwise>
+                    <div class="message-box">No Authorization found with ID: ${fn:escapeXml(param.rfAuthorizationId)}</div>
+                </c:otherwise>
+            </c:choose>
+        </section>          
+    </jsp:body>         
+</t:facility-authorizations-page>

From e2f95721adffdd099754df00b871ddf8d1e2983e Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Tue, 28 Jan 2025 17:21:52 -0500
Subject: [PATCH 20/44] Separate Facilities

---
 .../session/CreditedControlFacade.java        |   2 +-
 .../persistence/entity/CreditedControl.java   |  25 ++++
 .../controller/ControlParticipation.java      |  35 ++++-
 .../WEB-INF/views/control-participation.jsp   | 123 +++++++++++++-----
 4 files changed, 147 insertions(+), 38 deletions(-)

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 3b0a746..96dfacf 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -64,7 +64,7 @@ public List<CreditedControl> findAllWithVerificationList() {
     if (ccList != null) {
       for (CreditedControl cc : ccList) {
         JPAUtil.initialize(cc.getBeamControlVerificationList());
-        // Collections.sort(cc.getControlVerificationList());
+        JPAUtil.initialize(cc.getRFControlVerificationList());
       }
     }
 
diff --git a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
index 623d3f7..7cb22de 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
@@ -63,6 +63,9 @@ public class CreditedControl implements Serializable, Comparable<CreditedControl
   @OneToMany(mappedBy = "creditedControl", fetch = FetchType.LAZY)
   private List<BeamControlVerification> beamControlVerificationList;
 
+  @OneToMany(mappedBy = "creditedControl", fetch = FetchType.LAZY)
+  private List<RFControlVerification> rfControlVerificationList;
+
   public CreditedControl() {}
 
   public CreditedControl(BigInteger creditedControlId) {
@@ -125,6 +128,14 @@ public void setVerificationFrequency(String verificationFrequency) {
     this.verificationFrequency = verificationFrequency;
   }
 
+  public List<RFControlVerification> getRFControlVerificationList() {
+    return rfControlVerificationList;
+  }
+
+  public void setRFControlVerificationList(List<RFControlVerification> rfControlVerificationList) {
+    this.rfControlVerificationList = rfControlVerificationList;
+  }
+
   public List<BeamControlVerification> getBeamControlVerificationList() {
     return beamControlVerificationList;
   }
@@ -134,6 +145,20 @@ public void setBeamControlVerificationList(
     this.beamControlVerificationList = beamControlVerificationList;
   }
 
+  public boolean hasRFSegment(RFSegment segment) {
+    boolean hasSegment = false;
+    if (beamControlVerificationList != null) {
+      for (RFControlVerification verification : rfControlVerificationList) {
+        if (verification.getRFSegment().equals(segment)) {
+          hasSegment = true;
+          break;
+        }
+      }
+    }
+
+    return hasSegment;
+  }
+
   public boolean hasBeamDestination(BeamDestination destination) {
     boolean hasDestination = false;
     if (beamControlVerificationList != null) {
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
index 4c7ab2b..d85004f 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
@@ -1,6 +1,7 @@
 package org.jlab.jam.presentation.controller;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.servlet.ServletException;
@@ -10,8 +11,13 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.BeamDestinationFacade;
 import org.jlab.jam.business.session.CreditedControlFacade;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.business.session.RFSegmentFacade;
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.jam.persistence.entity.RFSegment;
+import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
  * @author ryans
@@ -21,7 +27,9 @@
     urlPatterns = {"/control-participation"})
 public class ControlParticipation extends HttpServlet {
 
+  @EJB FacilityFacade facilityFacade;
   @EJB CreditedControlFacade ccFacade;
+  @EJB RFSegmentFacade segmentFacade;
   @EJB BeamDestinationFacade destinationFacade;
 
   /**
@@ -36,11 +44,30 @@ public class ControlParticipation extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
-    List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
-    List<CreditedControl> ccList = ccFacade.findAllWithVerificationList();
+    String error = null;
 
-    request.setAttribute("destinationList", destinationList);
-    request.setAttribute("ccList", ccList);
+    BigInteger facilityId = ParamConverter.convertBigInteger(request, "facilityId");
+
+    if (facilityId == null) {
+      error = "Select a Facility to continue";
+    } else {
+      Facility facility = facilityFacade.find(facilityId);
+
+      if (facility == null) {
+        throw new ServletException("Facility not found");
+      }
+
+      List<RFSegment> segmentList = segmentFacade.findByFacility(facility);
+      List<BeamDestination> destinationList = destinationFacade.findByFacility(facility);
+      List<CreditedControl> ccList = ccFacade.findAllWithVerificationList();
+
+      request.setAttribute("facility", facility);
+      request.setAttribute("segmentList", segmentList);
+      request.setAttribute("destinationList", destinationList);
+      request.setAttribute("ccList", ccList);
+    }
+
+    request.setAttribute("error", error);
 
     request
         .getRequestDispatcher("WEB-INF/views/control-participation.jsp")
diff --git a/src/main/webapp/WEB-INF/views/control-participation.jsp b/src/main/webapp/WEB-INF/views/control-participation.jsp
index 376d52d..068b799 100644
--- a/src/main/webapp/WEB-INF/views/control-participation.jsp
+++ b/src/main/webapp/WEB-INF/views/control-participation.jsp
@@ -18,39 +18,96 @@
     <jsp:body>
         <section>
             <h2><c:out value="${title}"/></h2>
-            <div class="participation-scroll-pane">
-                <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
-                    <thead>
-                    <tr>
-                        <th rowspan="2" class="component-header">Credited Control</th>
-                        <th colspan="${fn:length(destinationList)}">Beam Destination</th>
-                    </tr>
-                    <tr>
-                        <c:forEach items="${destinationList}" var="destination">
-                            <th class="destination-header">
-                                <c:out value="${destination.name}"/>
-                            </th>
-                        </c:forEach>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <c:forEach items="${ccList}" var="cc">
-                        <tr data-cc-id="${cc.creditedControlId}">
-                            <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information" class="dialog-ready"
-                                   href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
-                                    value="${cc.name}"/></a></th>
-                            <c:forEach items="${destinationList}" var="destination">
-                                <td data-destination-id="${destination.beamDestinationId}">
-                                    <c:if test="${cc.hasBeamDestination(destination)}">
-                                        ✔
-                                    </c:if>
-                                </td>
-                            </c:forEach>
-                        </tr>
-                    </c:forEach>
-                    </tbody>
-                </table>
-            </div>
+            <c:choose>
+                <c:when test="${not empty error}">
+                    <c:out value="${error}"/>
+                </c:when>
+                <c:otherwise>
+                    <c:out value="${facility.name}"/>
+                    <h3>RF Operations</h3>
+                    <c:choose>
+                        <c:when test="${not empty segmentList}">
+                            <div class="participation-scroll-pane">
+                                <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
+                                    <thead>
+                                    <tr>
+                                        <th rowspan="2" class="component-header">Credited Control</th>
+                                        <th colspan="${fn:length(segmentList)}">RF Segment</th>
+                                    </tr>
+                                    <tr>
+                                        <c:forEach items="${segmentList}" var="segment">
+                                            <th class="destination-header">
+                                                <c:out value="${segment.name}"/>
+                                            </th>
+                                        </c:forEach>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <c:forEach items="${ccList}" var="cc">
+                                        <tr data-cc-id="${cc.creditedControlId}">
+                                            <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information" class="dialog-ready"
+                                                   href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                    value="${cc.name}"/></a></th>
+                                            <c:forEach items="${segmentList}" var="segment">
+                                                <td data-segment-id="${segment.getRFSegmentId()}">
+                                                    <c:if test="${cc.hasRFSegment(segment)}">
+                                                        ✔
+                                                    </c:if>
+                                                </td>
+                                            </c:forEach>
+                                        </tr>
+                                    </c:forEach>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </c:when>
+                        <c:otherwise>
+                            None
+                        </c:otherwise>
+                    </c:choose>
+                    <h3>Beam Operations</h3>
+                    <c:choose>
+                        <c:when test="${not empty destinationList}">
+                            <div class="participation-scroll-pane">
+                                <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
+                                    <thead>
+                                    <tr>
+                                        <th rowspan="2" class="component-header">Credited Control</th>
+                                        <th colspan="${fn:length(destinationList)}">Beam Destination</th>
+                                    </tr>
+                                    <tr>
+                                        <c:forEach items="${destinationList}" var="destination">
+                                            <th class="destination-header">
+                                                <c:out value="${destination.name}"/>
+                                            </th>
+                                        </c:forEach>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    <c:forEach items="${ccList}" var="cc">
+                                        <tr data-cc-id="${cc.creditedControlId}">
+                                            <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information" class="dialog-ready"
+                                                   href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                    value="${cc.name}"/></a></th>
+                                            <c:forEach items="${destinationList}" var="destination">
+                                                <td data-destination-id="${destination.beamDestinationId}">
+                                                    <c:if test="${cc.hasBeamDestination(destination)}">
+                                                        ✔
+                                                    </c:if>
+                                                </td>
+                                            </c:forEach>
+                                        </tr>
+                                    </c:forEach>
+                                    </tbody>
+                                </table>
+                            </div>
+                        </c:when>
+                        <c:otherwise>
+                            None
+                        </c:otherwise>
+                    </c:choose>
+                </c:otherwise>
+            </c:choose>
         </section>
     </jsp:body>
 </t:page>

From 50ebd495c2e59bb4e08cf9180b3f6a3e09bd5e45 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 07:59:15 -0500
Subject: [PATCH 21/44] Separate Facilities

---
 .../controller/ControlParticipation.java       |  9 +++++----
 .../WEB-INF/views/control-participation.jsp    | 18 ++++++++++++++++--
 .../WEB-INF/views/history/beam-history.jsp     |  2 +-
 .../views/history/destinations-history.jsp     |  2 +-
 .../WEB-INF/views/history/rf-history.jsp       |  2 +-
 .../WEB-INF/views/history/segments-history.jsp |  2 +-
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
index d85004f..4b52df2 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
@@ -9,10 +9,7 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.business.session.CreditedControlFacade;
-import org.jlab.jam.business.session.FacilityFacade;
-import org.jlab.jam.business.session.RFSegmentFacade;
+import org.jlab.jam.business.session.*;
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.CreditedControl;
 import org.jlab.jam.persistence.entity.Facility;
@@ -67,6 +64,10 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       request.setAttribute("ccList", ccList);
     }
 
+    List<Facility> facilityList =
+        facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("facilityList", facilityList);
     request.setAttribute("error", error);
 
     request
diff --git a/src/main/webapp/WEB-INF/views/control-participation.jsp b/src/main/webapp/WEB-INF/views/control-participation.jsp
index 068b799..6c2f5bc 100644
--- a/src/main/webapp/WEB-INF/views/control-participation.jsp
+++ b/src/main/webapp/WEB-INF/views/control-participation.jsp
@@ -16,14 +16,28 @@
                 src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/control-participation.js"></script>
     </jsp:attribute>
     <jsp:body>
+        <div class="banner-breadbox">
+            <ul>
+                <li>
+                    <form method="get" action="control-participation">
+                        <label for="facility-select">Facility: </label>
+                        <select id="facility-select" name="facilityId" class="change-submit">
+                            <option value=""></option>
+                            <c:forEach items="${facilityList}" var="facility">
+                                <option value="${facility.facilityId}"${param.facilityId eq facility.facilityId ? ' selected="selected"' : ''}><c:out value="${facility.name}"/></option>
+                            </c:forEach>
+                        </select>
+                    </form>
+                </li>
+            </ul>
+        </div>
         <section>
-            <h2><c:out value="${title}"/></h2>
+            <h2><c:out value="${title}${empty facility ? '' : ': '.concat(facility.name)}"/></h2>
             <c:choose>
                 <c:when test="${not empty error}">
                     <c:out value="${error}"/>
                 </c:when>
                 <c:otherwise>
-                    <c:out value="${facility.name}"/>
                     <h3>RF Operations</h3>
                     <c:choose>
                         <c:when test="${not empty segmentList}">
diff --git a/src/main/webapp/WEB-INF/views/history/beam-history.jsp b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
index 6d1c1b1..eabb053 100644
--- a/src/main/webapp/WEB-INF/views/history/beam-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/beam-history.jsp
@@ -20,7 +20,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/></a>
                 </li>
                 <li>
                     <span>Beam History</span>
diff --git a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
index a499958..6b5d846 100644
--- a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/destinations-history.jsp
@@ -15,7 +15,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/></a>
                 </li>
                 <li>
                     <a href="${pageContext.request.contextPath}/authorizations${facility.path}/beam-history">Beam History</a>
diff --git a/src/main/webapp/WEB-INF/views/history/rf-history.jsp b/src/main/webapp/WEB-INF/views/history/rf-history.jsp
index 5c621b4..da6fb13 100644
--- a/src/main/webapp/WEB-INF/views/history/rf-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/rf-history.jsp
@@ -20,7 +20,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/></a>
                 </li>
                 <li>
                     <span>RF History</span>
diff --git a/src/main/webapp/WEB-INF/views/history/segments-history.jsp b/src/main/webapp/WEB-INF/views/history/segments-history.jsp
index a292b7e..d97ccf4 100644
--- a/src/main/webapp/WEB-INF/views/history/segments-history.jsp
+++ b/src/main/webapp/WEB-INF/views/history/segments-history.jsp
@@ -15,7 +15,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/> Authorization</a>
+                    <a href="${pageContext.request.contextPath}/authorizations${facility.path}"><c:out value="${facility.name}"/></a>
                 </li>
                 <li>
                     <a href="${pageContext.request.contextPath}/authorizations${facility.path}/rf-history">RF History</a>

From 05a05d5bfe9fa2107a3f13260ba829abab394b7b Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 08:21:49 -0500
Subject: [PATCH 22/44] Separate Facilities

---
 .../WEB-INF/views/control-participation.jsp   | 173 ++++++++++--------
 .../resources/css/control-participation.css   |   6 +
 .../resources/js/control-participation.js     |   7 +
 3 files changed, 105 insertions(+), 81 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/control-participation.jsp b/src/main/webapp/WEB-INF/views/control-participation.jsp
index 6c2f5bc..10e9e12 100644
--- a/src/main/webapp/WEB-INF/views/control-participation.jsp
+++ b/src/main/webapp/WEB-INF/views/control-participation.jsp
@@ -24,7 +24,8 @@
                         <select id="facility-select" name="facilityId" class="change-submit">
                             <option value=""></option>
                             <c:forEach items="${facilityList}" var="facility">
-                                <option value="${facility.facilityId}"${param.facilityId eq facility.facilityId ? ' selected="selected"' : ''}><c:out value="${facility.name}"/></option>
+                                <option value="${facility.facilityId}"${param.facilityId eq facility.facilityId ? ' selected="selected"' : ''}>
+                                    <c:out value="${facility.name}"/></option>
                             </c:forEach>
                         </select>
                     </form>
@@ -38,88 +39,98 @@
                     <c:out value="${error}"/>
                 </c:when>
                 <c:otherwise>
-                    <h3>RF Operations</h3>
-                    <c:choose>
-                        <c:when test="${not empty segmentList}">
-                            <div class="participation-scroll-pane">
-                                <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
-                                    <thead>
-                                    <tr>
-                                        <th rowspan="2" class="component-header">Credited Control</th>
-                                        <th colspan="${fn:length(segmentList)}">RF Segment</th>
-                                    </tr>
-                                    <tr>
-                                        <c:forEach items="${segmentList}" var="segment">
-                                            <th class="destination-header">
-                                                <c:out value="${segment.name}"/>
-                                            </th>
-                                        </c:forEach>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <c:forEach items="${ccList}" var="cc">
-                                        <tr data-cc-id="${cc.creditedControlId}">
-                                            <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information" class="dialog-ready"
-                                                   href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
-                                                    value="${cc.name}"/></a></th>
-                                            <c:forEach items="${segmentList}" var="segment">
-                                                <td data-segment-id="${segment.getRFSegmentId()}">
-                                                    <c:if test="${cc.hasRFSegment(segment)}">
-                                                        ✔
-                                                    </c:if>
-                                                </td>
+                    <div class="accordion">
+                        <h3>RF Operations</h3>
+                        <div class="content">
+                            <c:choose>
+                                <c:when test="${not empty segmentList}">
+                                    <div class="participation-scroll-pane">
+                                        <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
+                                            <thead>
+                                            <tr>
+                                                <th rowspan="2" class="component-header">Credited Control</th>
+                                                <th colspan="${fn:length(segmentList)}">RF Segment</th>
+                                            </tr>
+                                            <tr>
+                                                <c:forEach items="${segmentList}" var="segment">
+                                                    <th class="destination-header">
+                                                        <c:out value="${segment.name}"/>
+                                                    </th>
+                                                </c:forEach>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <c:forEach items="${ccList}" var="cc">
+                                                <tr data-cc-id="${cc.creditedControlId}">
+                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information"
+                                                           class="dialog-ready"
+                                                           href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                            value="${cc.name}"/></a></th>
+                                                    <c:forEach items="${segmentList}" var="segment">
+                                                        <td data-segment-id="${segment.getRFSegmentId()}">
+                                                            <c:if test="${cc.hasRFSegment(segment)}">
+                                                                ✔
+                                                            </c:if>
+                                                        </td>
+                                                    </c:forEach>
+                                                </tr>
                                             </c:forEach>
-                                        </tr>
-                                    </c:forEach>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </c:when>
-                        <c:otherwise>
-                            None
-                        </c:otherwise>
-                    </c:choose>
-                    <h3>Beam Operations</h3>
-                    <c:choose>
-                        <c:when test="${not empty destinationList}">
-                            <div class="participation-scroll-pane">
-                                <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
-                                    <thead>
-                                    <tr>
-                                        <th rowspan="2" class="component-header">Credited Control</th>
-                                        <th colspan="${fn:length(destinationList)}">Beam Destination</th>
-                                    </tr>
-                                    <tr>
-                                        <c:forEach items="${destinationList}" var="destination">
-                                            <th class="destination-header">
-                                                <c:out value="${destination.name}"/>
-                                            </th>
-                                        </c:forEach>
-                                    </tr>
-                                    </thead>
-                                    <tbody>
-                                    <c:forEach items="${ccList}" var="cc">
-                                        <tr data-cc-id="${cc.creditedControlId}">
-                                            <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information" class="dialog-ready"
-                                                   href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
-                                                    value="${cc.name}"/></a></th>
-                                            <c:forEach items="${destinationList}" var="destination">
-                                                <td data-destination-id="${destination.beamDestinationId}">
-                                                    <c:if test="${cc.hasBeamDestination(destination)}">
-                                                        ✔
-                                                    </c:if>
-                                                </td>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </c:when>
+                                <c:otherwise>
+                                    None
+                                </c:otherwise>
+                            </c:choose>
+                        </div>
+                    </div>
+                    <div class="accordion">
+                        <h3>Beam Operations</h3>
+                        <div class="content">
+                            <c:choose>
+                                <c:when test="${not empty destinationList}">
+                                    <div class="participation-scroll-pane">
+                                        <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
+                                            <thead>
+                                            <tr>
+                                                <th rowspan="2" class="component-header">Credited Control</th>
+                                                <th colspan="${fn:length(destinationList)}">Beam Destination</th>
+                                            </tr>
+                                            <tr>
+                                                <c:forEach items="${destinationList}" var="destination">
+                                                    <th class="destination-header">
+                                                        <c:out value="${destination.name}"/>
+                                                    </th>
+                                                </c:forEach>
+                                            </tr>
+                                            </thead>
+                                            <tbody>
+                                            <c:forEach items="${ccList}" var="cc">
+                                                <tr data-cc-id="${cc.creditedControlId}">
+                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information"
+                                                           class="dialog-ready"
+                                                           href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                            value="${cc.name}"/></a></th>
+                                                    <c:forEach items="${destinationList}" var="destination">
+                                                        <td data-destination-id="${destination.beamDestinationId}">
+                                                            <c:if test="${cc.hasBeamDestination(destination)}">
+                                                                ✔
+                                                            </c:if>
+                                                        </td>
+                                                    </c:forEach>
+                                                </tr>
                                             </c:forEach>
-                                        </tr>
-                                    </c:forEach>
-                                    </tbody>
-                                </table>
-                            </div>
-                        </c:when>
-                        <c:otherwise>
-                            None
-                        </c:otherwise>
-                    </c:choose>
+                                            </tbody>
+                                        </table>
+                                    </div>
+                                </c:when>
+                                <c:otherwise>
+                                    None
+                                </c:otherwise>
+                            </c:choose>
+                        </div>
+                    </div>
                 </c:otherwise>
             </c:choose>
         </section>
diff --git a/src/main/webapp/resources/css/control-participation.css b/src/main/webapp/resources/css/control-participation.css
index a24578a..a0c1c3f 100644
--- a/src/main/webapp/resources/css/control-participation.css
+++ b/src/main/webapp/resources/css/control-participation.css
@@ -31,4 +31,10 @@
 }
 .participation-scroll-pane {
     overflow: auto;
+}
+.accordion .ui-widget-content a {
+    color: blue;
+}
+.accordion .ui-widget-content a:hover {
+    color: red;
 }
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/control-participation.js b/src/main/webapp/resources/js/control-participation.js
index 58c5b2d..19420cf 100644
--- a/src/main/webapp/resources/js/control-participation.js
+++ b/src/main/webapp/resources/js/control-participation.js
@@ -66,4 +66,11 @@ jlab.toggle = function() {
 };
 $(document).on("click", ".control-participation-table.editable td", function() {
     jlab.toggle.call(this);
+});
+$(function() {
+    $( ".accordion" ).accordion({
+        collapsible: true,
+        heightStyle: "content",
+        active: 0
+    });
 });
\ No newline at end of file

From a5df2b52f50f6600ecd0966e588674ddd5e4a6bc Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 09:22:20 -0500
Subject: [PATCH 23/44] Separate Facilities

---
 container/oracle/initdb.d/03_default_data.sql |  42 +-
 .../BeamControlVerificationFacade.java        |   1 -
 .../session/RFControlVerificationFacade.java  | 876 ++++++++++++++++++
 ...va => ToggleBeamControlParticipation.java} |   9 +-
 .../ajax/ToggleRFControlParticipation.java    |  83 ++
 .../WEB-INF/views/control-participation.jsp   |   8 +-
 .../resources/css/control-participation.css   |   3 -
 .../resources/js/control-participation.js     |  63 +-
 8 files changed, 1054 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java
 rename src/main/java/org/jlab/jam/presentation/controller/ajax/{ToggleControlParticipation.java => ToggleBeamControlParticipation.java} (88%)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java

diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index eb26114..9580cb9 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -28,12 +28,18 @@ insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_W
 insert into JAM_OWNER.FACILITY (FACILITY_ID, NAME, PATH, RF_WORKGROUP_ID, BEAM_WORKGROUP_ID, WEIGHT) values (5, 'VTA', '/vta', 12, 13, 5);
 
 -- Populate Credited Controls
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 1','Control 1 Description',1,1,'1 Year');
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 2','Control 2 Description',1,2,'1 Year');
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 3','Control 3 Description',1,3,'1 Year');
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 4','Control 4 Description',1,4,'1 Year');
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 5','Control 5 Description',1,5,'1 Year');
-insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Control 6','Control 6 Description',1,6,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Earth Berms/Overburden','Non-structural fill, cover, or berms',1,1,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Structural Shielding','Beam enclosure concrete structure',1,2,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Movable Shielding','Includes penetrations',1,3,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Beam Dump Cooling Building Design','Structural integrity of the buildings and their sump pits',1,4,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Nitrogen Gas Supply Orifices','1/8" orifice plates to restrict the amount of nitrogen that could be introduced into the tunnel enclosures',1,5,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'ODH vents, lintels and facility configuration','Passive ceiling vents, door configuration, and lintels for slowing helium migration into stairwells',1,6,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'PSS Access Controls','CEBAF and LERF controls for keeping people out of segments. Includes tunnel door maglock, keyswitches, sweep procedures, klaxons, beacons',1,7,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'CEBAF PSS Beam Containment Controls','CEBAF controls for keeping beam inside segments (protect adjacent segments). Critical devices including beam stops, beam segment steering elecromagnets, and interlocks such as magnet power supply/RF waveguide pressure interfaces',1,8,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'ODH System Controls','Oxygen sensors and alarms',1,9,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'Doors, Gates, Fences, and other Barriers','Non-interlocked administrative controls for personnel safety',1,10,'1 Year');
+insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WORKGROUP_ID,WEIGHT,VERIFICATION_FREQUENCY) values (JAM_OWNER.CREDITED_CONTROL_ID.nextval,'UITF Nitrogen Gas Supply Orifices','1/8" orifice plates to restrict the amount of nitrogen that could be introduced into the UITF enclosure',1,11,'1 Year');
+
 
 -- Populate RF Segments
 insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Injector', 1, 'Y', 1);
@@ -45,15 +51,21 @@ insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, W
 insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 5, 'Y', 1);
 
 -- Populate Beam Destinations
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 1', 1, 'uA', 'Y', 1);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 2', 1, 'uA', 'Y', 2);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 3', 1, 'uA', 'Y', 3);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 4', 2, 'uA', 'Y', 4);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 5', 2, 'uA', 'Y', 5);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 6', 2, 'uA', 'Y', 6);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 7', 3, 'uA', 'Y', 7);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 8', 3, 'uA', 'Y', 8);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Destination 9', 3, 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '1D Spectrometer (IDL1D00)', 1, 'uA', 'Y', 1);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Faraday Cup #2 (IFY0L03', 1, 'uA', 'Y', 2);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Inline Dump (SDL0R08', 1, 'uA', 'Y', 3);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'BSY', 1, 'uA', 'Y', 4);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall A', 1, 'uA', 'Y', 5);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall B', 1, 'uA', 'Y', 6);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall C', 1, 'uA', 'Y', 7);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall D Tagger Dump (IBDAD00)', 1, 'uA', 'Y', 8);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '0G Tune/Moeller Dump', 2, 'uA', 'Y', 9);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '2G 100MeV SA Dump (IDC2G00)', 2, 'uA', 'Y', 10);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '1G Dump (IDC1G03)', 2, 'uA', 'Y', 11);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '1X Dump', 2, 'uA', 'Y', 12);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'KeV Dumps', 3, 'uA', 'Y', 13);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'MeV Dumps', 3, 'uA', 'Y', 14);
+
 
 -- Populate Initial Beam Control Verification
 insert into JAM_OWNER.beam_control_verification (BEAM_CONTROL_VERIFICATION_ID, CREDITED_CONTROL_ID, BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, VERIFICATION_DATE, VERIFIED_BY, EXPIRATION_DATE, COMMENTS, MODIFIED_BY, MODIFIED_DATE) values(JAM_OWNER.beam_control_verification_id.nextval, 1, 1, 100, sysdate, 'admin', null, null, 'admin', sysdate);
diff --git a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
index 91c8719..ab1c704 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationFacade.java
@@ -45,7 +45,6 @@ public class BeamControlVerificationFacade extends AbstractFacade<BeamControlVer
   @EJB CreditedControlFacade controlFacade;
   @EJB BeamDestinationFacade destinationFacade;
   @EJB BeamAuthorizationFacade beamAuthorizationFacade;
-  @EJB BeamDestinationFacade beamDestinationFacade;
 
   @Override
   protected EntityManager getEntityManager() {
diff --git a/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java b/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java
new file mode 100644
index 0000000..63928b2
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/RFControlVerificationFacade.java
@@ -0,0 +1,876 @@
+package org.jlab.jam.business.session;
+
+import java.math.BigInteger;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.annotation.security.DeclareRoles;
+import javax.annotation.security.PermitAll;
+import javax.annotation.security.RolesAllowed;
+import javax.ejb.EJB;
+import javax.ejb.Stateless;
+import javax.mail.MessagingException;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.Query;
+import javax.persistence.TypedQuery;
+import org.jlab.jam.persistence.entity.*;
+import org.jlab.jlog.Body;
+import org.jlab.jlog.Library;
+import org.jlab.jlog.LogEntry;
+import org.jlab.jlog.LogEntryAdminExtension;
+import org.jlab.smoothness.business.exception.UserFriendlyException;
+import org.jlab.smoothness.business.service.EmailService;
+import org.jlab.smoothness.business.service.UserAuthorizationService;
+import org.jlab.smoothness.business.util.IOUtil;
+import org.jlab.smoothness.business.util.TimeUtil;
+import org.jlab.smoothness.persistence.view.User;
+import org.jlab.smoothness.presentation.util.Functions;
+
+/**
+ * @author ryans
+ */
+@Stateless
+@DeclareRoles({"jam-admin"})
+public class RFControlVerificationFacade extends AbstractFacade<RFControlVerification> {
+
+  private static final Logger LOGGER =
+      Logger.getLogger(RFControlVerificationFacade.class.getName());
+
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @EJB CreditedControlFacade controlFacade;
+  @EJB RFSegmentFacade segmentFacade;
+  @EJB RFAuthorizationFacade rfAuthorizationFacade;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public RFControlVerificationFacade() {
+    super(RFControlVerification.class);
+  }
+
+  @PermitAll
+  public List<RFControlVerification> findByRFSegment(BigInteger rfSegmentId) {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a join fetch a.creditedControl where a.rfSegment.rfSegmentId = :rfSegmentId order by a.creditedControl.weight asc",
+            RFControlVerification.class);
+
+    q.setParameter("rfSegmentId", rfSegmentId);
+
+    return q.getResultList();
+  }
+
+  @RolesAllowed("jam-admin")
+  public void toggle(BigInteger controlId, BigInteger segmentId) {
+    RFControlVerification verification = find(controlId, segmentId);
+
+    String username = checkAuthenticated();
+
+    if (verification == null) {
+      verification = new RFControlVerification();
+      verification.setModifiedBy(username);
+      verification.setModifiedDate(new Date());
+      CreditedControl control = controlFacade.find(controlId);
+      verification.setCreditedControl(control);
+      RFSegment segment = segmentFacade.find(segmentId);
+      verification.setRFSegment(segment);
+      verification.setVerificationStatusId(100);
+      create(verification);
+    } else {
+      remove(verification);
+    }
+  }
+
+  @PermitAll
+  public RFControlVerification find(BigInteger controlId, BigInteger segmentId) {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a where a.creditedControl.creditedControlId = :creditedControlId and a.rfSegment.rfSegmentId = :rfSegmentId",
+            RFControlVerification.class);
+
+    q.setParameter("creditedControlId", controlId);
+    q.setParameter("rfSegmentId", segmentId);
+
+    List<RFControlVerification> verificationList = q.getResultList();
+
+    RFControlVerification verification = null;
+
+    if (verificationList != null && !verificationList.isEmpty()) {
+      verification = verificationList.get(0);
+    }
+
+    return verification;
+  }
+
+  @PermitAll
+  public List<RFControlVerification> edit(
+      BigInteger[] controlVerificationIdArray,
+      Integer verificationId,
+      Date verificationDate,
+      String verifiedUsername,
+      Date expirationDate,
+      String comments)
+      throws UserFriendlyException {
+    String username = checkAuthenticated();
+
+    if (username == null) {
+      throw new UserFriendlyException("username must not be empty");
+    }
+
+    if (verifiedUsername == null) {
+      throw new UserFriendlyException("verified by must not be empty");
+    }
+
+    if (verificationId == null) {
+      throw new UserFriendlyException("verification status must not be empty");
+    }
+
+    if (verificationDate == null) {
+      throw new UserFriendlyException("verification date must not be empty");
+    }
+
+    if (controlVerificationIdArray == null) {
+      throw new UserFriendlyException("control verification ID array must not be empty");
+    }
+
+    Date now = new Date();
+
+    if (expirationDate != null && expirationDate.before(now)) {
+      throw new UserFriendlyException("expiration date cannot be in the past");
+    }
+
+    List<RFControlVerification> downgradeList = new ArrayList<>();
+
+    UserAuthorizationService auth = UserAuthorizationService.getInstance();
+
+    for (BigInteger controlVerificationId : controlVerificationIdArray) {
+      if (controlVerificationId == null) {
+        throw new UserFriendlyException("control verification ID must not be null");
+      }
+
+      RFControlVerification verification = find(controlVerificationId);
+
+      if (verification == null) {
+        throw new UserFriendlyException(
+            "control verification with ID " + controlVerificationId + " not found");
+      }
+
+      boolean downgrade =
+          verification.getVerificationStatusId() != verificationId
+              && verification.getVerificationStatusId() < verificationId;
+
+      // If verificationId is changing and it is a downgrade
+
+      Date modifiedDate = new Date();
+
+      String role = verification.getCreditedControl().getGroup().getLeaderRoleName();
+
+      List<User> leaders = auth.getUsersInRole(role);
+
+      checkAdminOrGroupLeader(username, leaders);
+
+      verification.setModifiedBy(username);
+      verification.setModifiedDate(modifiedDate);
+      verification.setVerificationStatusId(verificationId);
+      verification.setVerificationDate(verificationDate);
+      verification.setVerifiedBy(verifiedUsername);
+      verification.setExpirationDate(expirationDate);
+      verification.setComments(comments);
+
+      if (downgrade) {
+        downgradeList.add(verification);
+      }
+
+      RFControlVerificationHistory history = new RFControlVerificationHistory();
+      history.setVerificationStatusId(verificationId);
+      history.setModifiedBy(username);
+      history.setModifiedDate(modifiedDate);
+      history.setVerificationDate(verificationDate);
+      history.setVerifiedBy(verifiedUsername);
+      history.setExpirationDate(expirationDate);
+      history.setComments(comments);
+      history.setRFControlVerification(verification);
+      em.persist(history);
+    }
+
+    if (!downgradeList.isEmpty()) {
+      clearDirectorPermissionForDowngrade(downgradeList);
+    }
+
+    return downgradeList;
+  }
+
+  @PermitAll
+  public String getExpiredMessageBody(
+      String proxyServer,
+      List<RFSegmentAuthorization> expiredAuthorizationList,
+      List<RFControlVerification> expiredVerificationList,
+      List<RFSegmentAuthorization> upcomingAuthorizationExpirationList,
+      List<RFControlVerification> upcomingVerificationExpirationList) {
+    StringBuilder builder = new StringBuilder();
+
+    SimpleDateFormat formatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
+
+    if (expiredAuthorizationList != null && !expiredAuthorizationList.isEmpty()) {
+      builder.append("<h1>--- Expired Director's Authorizations ---</h1>\n");
+      for (RFSegmentAuthorization authorization : expiredAuthorizationList) {
+        builder.append("</div>\n<div><b>RF Segment:</b> ");
+        builder.append(authorization.getSegment().getName());
+        builder.append("</div>\n<div><b>Expired On:</b> ");
+        builder.append(formatter.format(authorization.getExpirationDate()));
+        builder.append("</div>\n<div><b>Comments:</b> ");
+        builder.append(
+            IOUtil.escapeXml(
+                authorization.getComments() == null ? "" : authorization.getComments()));
+        builder.append("<br/><br/>\n");
+      }
+    }
+
+    if (expiredVerificationList != null && !expiredVerificationList.isEmpty()) {
+      builder.append("<h1>--- Expired Credited Control Verifications ---</h1>\n");
+
+      for (RFControlVerification v : expiredVerificationList) {
+
+        builder.append("<div><b>Credited Control:</b> ");
+        builder.append(v.getCreditedControl().getName());
+        builder.append("</div>\n<div><b>RF Segment:</b> ");
+        builder.append(v.getRFSegment().getName());
+        builder.append("</div>\n<div><b>Verified On:</b> ");
+        builder.append(formatter.format(v.getVerificationDate()));
+        builder.append("</div>\n<div><b>Verified By:</b> ");
+        builder.append(Functions.formatUsername(v.getVerifiedBy()));
+        builder.append("</div>\n<div><b>Expired On:</b> ");
+        builder.append(formatter.format(v.getExpirationDate()));
+        builder.append("</div>\n<div><b>Comments:</b> ");
+        builder.append(IOUtil.escapeXml(v.getComments() == null ? "" : v.getComments()));
+        builder.append("<br/><br/>\n");
+      }
+
+      builder.append("<br/><br/>\n");
+    }
+
+    if (upcomingAuthorizationExpirationList != null
+        && !upcomingAuthorizationExpirationList.isEmpty()) {
+      builder.append("<h1>--- Director's Authorizations Expiring Soon ---</h1>\n");
+
+      for (RFSegmentAuthorization authorization : upcomingAuthorizationExpirationList) {
+
+        builder.append("<div><b>RF Segment:</b> ");
+        builder.append(authorization.getSegment().getName());
+        builder.append("</div>\n<div><b>Expires On:</b> ");
+        builder.append(formatter.format(authorization.getExpirationDate()));
+        builder.append("</div>\n<div><b>Comments:</b> ");
+        builder.append(
+            IOUtil.escapeXml(
+                authorization.getComments() == null ? "" : authorization.getComments()));
+        builder.append("<br/><br/>\n");
+      }
+
+      builder.append("<br/><br/>\n");
+    }
+
+    if (upcomingVerificationExpirationList != null
+        && !upcomingVerificationExpirationList.isEmpty()) {
+      builder.append("<h1>--- Credited Control Verifications Expiring Soon ---</h1>\n");
+
+      for (RFControlVerification v : upcomingVerificationExpirationList) {
+
+        builder.append("<div><b>Credited Control:</b> ");
+        builder.append(v.getCreditedControl().getName());
+        builder.append("</div>\n<div><b>RF Segment:</b> ");
+        builder.append(v.getRFSegment().getName());
+        builder.append("</div>\n<div><b>Verified On:</b> ");
+        builder.append(formatter.format(v.getVerificationDate()));
+        builder.append("</div>\n<div><b>Verified By:</b> ");
+        builder.append(Functions.formatUsername(v.getVerifiedBy()));
+        builder.append("</div>\n<div><b>Expiring On:</b> ");
+        builder.append(formatter.format(v.getExpirationDate()));
+        builder.append("</div>\n<div><b>Comments:</b> ");
+        builder.append(IOUtil.escapeXml(v.getComments() == null ? "" : v.getComments()));
+        builder.append("<br/><br/>\n");
+      }
+    }
+
+    builder.append("<br/><br/>\n");
+    builder
+        .append("</div><div>\n\n<b>See:</b> <a href=\"")
+        .append(proxyServer)
+        .append("/jam/\">JLab Authorization Manager</a></div>\n");
+
+    return builder.toString();
+  }
+
+  @PermitAll
+  public String getVerificationDowngradedMessageBody(
+      String proxyServer, List<BeamControlVerification> downgradeList) {
+    StringBuilder builder = new StringBuilder();
+
+    SimpleDateFormat formatter = new SimpleDateFormat(TimeUtil.getFriendlyDateTimePattern());
+
+    BeamControlVerification verification = downgradeList.get(0);
+
+    builder.append("<div><b>Credited Control:</b> ");
+    builder.append(verification.getCreditedControl().getName());
+    builder.append("</div>\n<div><b>Beam Destinations:</b> ");
+    for (BeamControlVerification v : downgradeList) {
+      builder.append("<div>");
+      builder.append(v.getBeamDestination().getName());
+      builder.append("</div>");
+    }
+    builder.append("</div>\n<div><b>Modified On:</b> ");
+    builder.append(formatter.format(verification.getVerificationDate()));
+    builder.append("</div>\n<div><b>Modified By:</b> ");
+    builder.append(Functions.formatUsername(verification.getVerifiedBy()));
+    builder.append("</div>\n<div><b>Verification:</b> ");
+    builder.append(
+        verification.getVerificationStatusId() == 1
+            ? "Verified"
+            : (verification.getVerificationStatusId() == 50
+                ? "Provisionally Verified"
+                : "Not Verified"));
+    builder.append("</div>\n<div><b>Comments:</b> ");
+    builder.append(IOUtil.escapeXml(verification.getComments()));
+    builder
+        .append("</div><div>\n\n<b>See:</b> <a href=\"")
+        .append(proxyServer)
+        .append("/jam/\">JLab Authorization Manager</a></div>\n");
+
+    return builder.toString();
+  }
+
+  @PermitAll
+  public long sendVerificationDowngradedELog(String body, String logbookServer)
+      throws UserFriendlyException {
+    String username = checkAuthenticated();
+
+    String subject = System.getenv("BAM_DOWNGRADED_SUBJECT");
+
+    String logbooks = System.getenv("BAM_BOOKS_CSV");
+
+    if (logbooks == null || logbooks.isEmpty()) {
+      logbooks = "TLOG";
+      LOGGER.log(
+          Level.WARNING, "Environment variable 'BAM_BOOKS_CSV' not found, using default TLOG");
+    }
+
+    Properties config = Library.getConfiguration();
+
+    config.setProperty("SUBMIT_URL", logbookServer + "/incoming");
+    config.setProperty("FETCH_URL", logbookServer + "/entry");
+
+    LogEntry entry = new LogEntry(subject, logbooks);
+
+    entry.setBody(body, Body.ContentType.HTML);
+    entry.setTags("Readme");
+
+    LogEntryAdminExtension extension = new LogEntryAdminExtension(entry);
+    extension.setAuthor(username);
+
+    long logId;
+
+    try {
+      logId = entry.submitNow();
+    } catch (Exception e) {
+      throw new UserFriendlyException("Unable to send elog", e);
+    }
+
+    return logId;
+  }
+
+  @PermitAll
+  public void sendVerificationDowngradedEmail(String body) throws UserFriendlyException {
+    String toCsv = System.getenv("BAM_DOWNGRADED_EMAIL_CSV");
+
+    String subject = System.getenv("BAM_DOWNGRADED_SUBJECT");
+
+    EmailService emailService = new EmailService();
+
+    String sender = System.getenv("BAM_EMAIL_SENDER");
+
+    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+  }
+
+  @PermitAll
+  public List<RFSegmentAuthorization> checkForAuthorizedButExpired(RFAuthorization mostRecent) {
+    TypedQuery<RFSegmentAuthorization> q =
+        em.createQuery(
+            "select a from RFSegmentAuthorization a where a.rfAuthorization.rfAuthorizationId = :authId and a.expirationDate < sysdate and a.beamMode != 'None' and a.segment.active = true order by a.segmentAuthorizationPK.rfSegmentId asc",
+            RFSegmentAuthorization.class);
+
+    BigInteger authId = mostRecent.getRfAuthorizationId();
+
+    q.setParameter("authId", authId);
+
+    return q.getResultList();
+  }
+
+  @PermitAll
+  public List<RFControlVerification> checkForExpired() {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.rfSegment.active = true order by a.creditedControl.weight asc",
+            RFControlVerification.class);
+
+    return q.getResultList();
+  }
+
+  @PermitAll
+  public List<RFControlVerification> checkForVerifiedButExpired() {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a join fetch a.creditedControl where a.expirationDate < sysdate and a.rfSegment.active = true and a.verificationStatusId in (1, 50) order by a.creditedControl.weight asc",
+            RFControlVerification.class);
+
+    return q.getResultList();
+  }
+
+  @PermitAll
+  public void revokeExpiredAuthorizations(List<RFSegmentAuthorization> authorizationList) {
+    LOGGER.log(Level.FINEST, "I think I've got something authorization-wise to downgrade");
+    this.clearDirectorPermissionBySegmentAuthorization(authorizationList);
+  }
+
+  @PermitAll
+  public void revokeExpiredVerifications(List<RFControlVerification> expiredList) {
+    Query q =
+        em.createQuery(
+            "update RFControlVerification a set a.verificationId = 100, a.comments = 'Expired', a.verifiedBy = null, a.verificationDate = :vDate, a.modifiedDate = :vDate, a.modifiedBy = 'authadm' where a.controlVerificationId in :list");
+
+    List<BigInteger> expiredIdList = new ArrayList<>();
+
+    Date modifiedDate = new Date();
+
+    if (expiredList != null) {
+      for (RFControlVerification v : expiredList) {
+        expiredIdList.add(v.getRFControlVerificationId());
+      }
+    }
+
+    q.setParameter("list", expiredIdList);
+    q.setParameter("vDate", modifiedDate);
+
+    q.executeUpdate();
+
+    insertExpiredHistory(expiredList, modifiedDate);
+
+    em.flush();
+
+    clearDirectorPermissionForExpired(expiredList);
+  }
+
+  @PermitAll
+  public void clearDirectorPermissionForExpired(List<RFControlVerification> verificationList) {
+    clearDirectorPermissionByCreditedControl(verificationList, true);
+  }
+
+  @PermitAll
+  public void clearDirectorPermissionForDowngrade(List<RFControlVerification> verificationList) {
+    clearDirectorPermissionByCreditedControl(verificationList, false);
+  }
+
+  private void clearDirectorPermissionByCreditedControl(
+      List<RFControlVerification> verificationList, Boolean expiration) {
+    String reason = "expiration";
+
+    if (!expiration) {
+      reason = "downgrade";
+    }
+
+    RFAuthorization rfAuthorization = rfAuthorizationFacade.findCurrent();
+
+    RFAuthorization authClone = rfAuthorization.createAdminClone();
+    // authClone.setDestinationAuthorizationList(new ArrayList<>());
+    List<RFSegmentAuthorization> newList = new ArrayList<>();
+
+    boolean atLeastOne = false;
+
+    // The destination authorization list will be null if already cleared previously: remember there
+    // are two ways in which a clear can happen and they can race to see who clears permissions
+    // first:
+    // (1) director's expiration vs (2) credited control expiration
+    if (rfAuthorization.getRFSegmentAuthorizationList() != null) {
+      for (RFSegmentAuthorization auth : rfAuthorization.getRFSegmentAuthorizationList()) {
+        RFSegmentAuthorization destClone = auth.createAdminClone(authClone);
+        // authClone.getDestinationAuthorizationList().add(destClone);
+        newList.add(destClone);
+
+        if ("None".equals(auth.getRFMode())) {
+          continue; // Already None so no need to revoke; move on to next
+        }
+        BigInteger destinationId = auth.getSegmentAuthorizationPK().getRFSegmentId();
+        for (RFControlVerification verification : verificationList) {
+          if (destinationId.equals(verification.getRFSegment().getRFSegmentId())) {
+            destClone.setRFMode("None");
+            destClone.setComments(
+                "Permission automatically revoked due to group credited control verification "
+                    + reason);
+            LOGGER.log(Level.FINEST, "Found something to downgrade");
+            atLeastOne = true;
+            break; // Found a match so revoke and then break out of loop
+          }
+        }
+      }
+    }
+
+    if (atLeastOne) {
+      em.persist(authClone);
+      for (RFSegmentAuthorization da : newList) {
+        SegmentAuthorizationPK pk = new SegmentAuthorizationPK();
+        pk.setRFSegmentId(da.getSegment().getRFSegmentId());
+        pk.setRFAuthorizationId(authClone.getRfAuthorizationId());
+        da.setSegmentAuthorizationPK(pk);
+        em.persist(da);
+      }
+    }
+  }
+
+  private void clearDirectorPermissionBySegmentAuthorization(
+      List<RFSegmentAuthorization> segmentList) {
+    RFAuthorization rfAuthorization = rfAuthorizationFacade.findCurrent();
+
+    RFAuthorization authClone = rfAuthorization.createAdminClone();
+    // authClone.setDestinationAuthorizationList(new ArrayList<>());
+    List<RFSegmentAuthorization> newList = new ArrayList<>();
+
+    boolean atLeastOne = false;
+
+    // The destination authorization list will be null if already cleared previously: remember there
+    // are two ways in which a clear can happen and they can race to see who clears permissions
+    // first:
+    // (1) director's expiration vs (2) credited control expiration
+    if (rfAuthorization.getRFSegmentAuthorizationList() != null) {
+      for (RFSegmentAuthorization auth : rfAuthorization.getRFSegmentAuthorizationList()) {
+        RFSegmentAuthorization destClone = auth.createAdminClone(authClone);
+        // authClone.getDestinationAuthorizationList().add(destClone);
+        newList.add(destClone);
+
+        if ("None".equals(auth.getRFMode())) {
+          continue; // Already None so no need to revoke; move on to next
+        }
+        if (segmentList.contains(auth)) {
+          destClone.setRFMode("None");
+          destClone.setComments(
+              "Permission automatically revoked due to director's authorization expiration");
+          LOGGER.log(Level.FINEST, "Found something to downgrade");
+          atLeastOne = true;
+        }
+      }
+    }
+
+    if (atLeastOne) {
+      em.persist(authClone);
+      for (RFSegmentAuthorization da : newList) {
+        SegmentAuthorizationPK pk = new SegmentAuthorizationPK();
+        pk.setRFSegmentId(da.getSegment().getRFSegmentId());
+        pk.setRFAuthorizationId(authClone.getRfAuthorizationId());
+        da.setSegmentAuthorizationPK(pk);
+        em.persist(da);
+      }
+    }
+  }
+
+  @PermitAll
+  public void insertExpiredHistory(
+      List<RFControlVerification> verificationList, Date modifiedDate) {
+    for (RFControlVerification v : verificationList) {
+      RFControlVerificationHistory history = new RFControlVerificationHistory();
+      history.setModifiedBy("jam-admin");
+      history.setModifiedDate(modifiedDate);
+      history.setVerificationStatusId(100);
+      history.setVerificationDate(modifiedDate);
+      history.setVerifiedBy(null);
+      history.setExpirationDate(v.getExpirationDate());
+      history.setComments("Expired");
+      history.setRFControlVerification(v);
+      em.persist(history);
+    }
+  }
+
+  @PermitAll
+  public List<RFControlVerification> checkForUpcomingVerificationExpirations() {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a join fetch a.creditedControl where a.expirationDate >= sysdate and (a.expirationDate - 7) <= sysdate and a.verificationStatusId in (1, 50) and a.rfSegment.active = true order by a.creditedControl.weight asc",
+            RFControlVerification.class);
+
+    return q.getResultList();
+  }
+
+  private List<RFSegmentAuthorization> checkForUpcomingAuthorizationExpirations(
+      RFAuthorization auth) {
+    List<RFSegmentAuthorization> upcomingExpirations = new ArrayList<>();
+
+    Date now = new Date();
+    Calendar cal = Calendar.getInstance();
+    cal.add(Calendar.DATE, 3);
+    Date threeDaysFromNow = cal.getTime();
+
+    if (auth.getRFSegmentAuthorizationList() != null) {
+      for (RFSegmentAuthorization dest : auth.getRFSegmentAuthorizationList()) {
+        if (!"None".equals(dest.getRFMode())
+            && dest.getExpirationDate().after(now)
+            && dest.getExpirationDate().before(threeDaysFromNow)) {
+          upcomingExpirations.add(dest);
+        }
+      }
+    }
+
+    return upcomingExpirations;
+  }
+
+  @PermitAll
+  public void notifyAdmins(
+      List<RFSegmentAuthorization> expiredAuthorizationList,
+      List<RFControlVerification> expiredVerificationList,
+      List<RFSegmentAuthorization> upcomingAuthorizationExpirationList,
+      List<RFControlVerification> upcomingVerificationExpirationList,
+      String proxyServer)
+      throws MessagingException, UserFriendlyException {
+    String toCsv = System.getenv("BAM_UPCOMING_EXPIRATION_EMAIL_CSV");
+
+    String subject = System.getenv("BAM_UPCOMING_EXPIRATION_SUBJECT");
+
+    String body =
+        getExpiredMessageBody(
+            proxyServer,
+            expiredAuthorizationList,
+            expiredVerificationList,
+            upcomingAuthorizationExpirationList,
+            upcomingVerificationExpirationList);
+
+    EmailService emailService = new EmailService();
+
+    String sender = System.getenv("BAM_EMAIL_SENDER");
+
+    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+  }
+
+  @PermitAll
+  public void notifyOps(
+      List<RFSegmentAuthorization> expiredAuthorizationList,
+      List<RFControlVerification> expiredVerificationList,
+      String proxyServer)
+      throws MessagingException, UserFriendlyException {
+    String toCsv = System.getenv("BAM_EXPIRED_EMAIL_CSV");
+
+    String subject = System.getenv("BAM_EXPIRED_SUBJECT");
+
+    String body =
+        getExpiredMessageBody(
+            proxyServer, expiredAuthorizationList, expiredVerificationList, null, null);
+
+    EmailService emailService = new EmailService();
+
+    String sender = System.getenv("BAM_EMAIL_SENDER");
+
+    emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+    LOGGER.log(Level.FINEST, "notifyOps, toCsv: {0], body: {1}", new Object[] {toCsv, body});
+  }
+
+  @PermitAll
+  public void notifyGroups(
+      List<RFControlVerification> expiredList,
+      List<RFControlVerification> upcomingExpirationsList,
+      String proxyServer)
+      throws MessagingException, UserFriendlyException {
+    Map<Workgroup, List<RFControlVerification>> expiredGroupMap = new HashMap<>();
+    Map<Workgroup, List<RFControlVerification>> upcomingExpirationGroupMap = new HashMap<>();
+
+    String subject = System.getenv("BAM_UPCOMING_EXPIRATION_SUBJECT");
+
+    LOGGER.log(Level.FINEST, "Expirations:");
+    if (expiredList != null) {
+      for (RFControlVerification c : expiredList) {
+        LOGGER.log(Level.FINEST, c.toString());
+        Workgroup workgroup = c.getCreditedControl().getGroup();
+        List<RFControlVerification> groupList = expiredGroupMap.get(workgroup);
+        if (groupList == null) {
+          groupList = new ArrayList<>();
+          expiredGroupMap.put(workgroup, groupList);
+        }
+        groupList.add(c);
+      }
+    } else {
+      LOGGER.log(Level.FINEST, "No expirations");
+    }
+
+    LOGGER.log(Level.FINEST, "Upcoming Expirations:");
+    if (upcomingExpirationsList != null) {
+      for (RFControlVerification c : upcomingExpirationsList) {
+        LOGGER.log(Level.FINEST, c.toString());
+        Workgroup workgroup = c.getCreditedControl().getGroup();
+        List<RFControlVerification> groupList = upcomingExpirationGroupMap.get(workgroup);
+        if (groupList == null) {
+          groupList = new ArrayList<>();
+          upcomingExpirationGroupMap.put(workgroup, groupList);
+        }
+        groupList.add(c);
+      }
+    } else {
+      LOGGER.log(Level.FINEST, "No upcoming expirations");
+    }
+
+    Set<Workgroup> allGroups = new HashSet<>(expiredGroupMap.keySet());
+    allGroups.addAll(upcomingExpirationGroupMap.keySet());
+
+    for (Workgroup w : allGroups) {
+
+      List<String> toAddresses = new ArrayList<>();
+
+      UserAuthorizationService auth = UserAuthorizationService.getInstance();
+
+      String role = w.getLeaderRoleName();
+
+      List<User> leaders = auth.getUsersInRole(role);
+
+      if (leaders != null) {
+        for (User s : leaders) {
+          if (s.getUsername() != null) {
+            toAddresses.add((s.getUsername() + "@jlab.org"));
+          }
+        }
+      }
+
+      List<RFControlVerification> groupExpiredList = expiredGroupMap.get(w);
+      List<RFControlVerification> groupUpcomingExpirationsList = upcomingExpirationGroupMap.get(w);
+
+      String sender = System.getenv("BAM_EMAIL_SENDER");
+
+      String body =
+          getExpiredMessageBody(
+              proxyServer, null, groupExpiredList, null, groupUpcomingExpirationsList);
+
+      if (!toAddresses.isEmpty()) {
+        EmailService emailService = new EmailService();
+
+        String toCsv = toAddresses.get(0);
+
+        for (int i = 1; i < toAddresses.size(); i++) {
+          toCsv = toCsv + "," + toAddresses.get(i);
+        }
+
+        // Ensure in test env database records JAM_OWNER.WORKGROUP.LEADER_ROLE_NAME point to bogus
+        // group else real people will be notified.
+        emailService.sendEmail(sender, sender, toCsv, null, subject, body, true);
+      }
+    }
+  }
+
+  @PermitAll
+  public void notifyUsersOfExpirationsAndUpcomingExpirations(
+      List<RFSegmentAuthorization> expiredAuthorizationList,
+      List<RFControlVerification> expiredVerificationList,
+      List<RFSegmentAuthorization> upcomingAuthorizationExpirationList,
+      List<RFControlVerification> upcomingVerificationExpirationList) {
+
+    boolean expiredAuth = (expiredAuthorizationList != null && !expiredAuthorizationList.isEmpty());
+    boolean expiredVer = (expiredVerificationList != null && !expiredVerificationList.isEmpty());
+    boolean upcomingAuth =
+        (upcomingAuthorizationExpirationList != null
+            && !upcomingAuthorizationExpirationList.isEmpty());
+    boolean upcomingVer =
+        (upcomingVerificationExpirationList != null
+            && !upcomingVerificationExpirationList.isEmpty());
+
+    if (expiredAuth || expiredVer || upcomingAuth || upcomingVer) {
+
+      LOGGER.log(Level.FINEST, "Notifying users");
+      String proxyServer = System.getenv("FRONTEND_SERVER_URL");
+
+      try {
+        // Admins
+        notifyAdmins(
+            expiredAuthorizationList,
+            expiredVerificationList,
+            upcomingAuthorizationExpirationList,
+            upcomingVerificationExpirationList,
+            proxyServer);
+
+        // Ops
+        if (expiredAuth || expiredVer) {
+          notifyOps(expiredAuthorizationList, expiredVerificationList, proxyServer);
+        }
+
+        // Groups
+        if (expiredVer || upcomingVer) {
+          notifyGroups(expiredVerificationList, upcomingVerificationExpirationList, proxyServer);
+        }
+
+      } catch (MessagingException | NullPointerException | UserFriendlyException e) {
+        LOGGER.log(Level.WARNING, "Unable to send email", e);
+      }
+    } else {
+      LOGGER.log(Level.FINEST, "Nothing to notify users about");
+    }
+  }
+
+  @PermitAll
+  public void performExpirationCheck(boolean checkForUpcoming) {
+    LOGGER.log(Level.FINEST, "Expiration Check: Director's authorizations...");
+    RFAuthorization auth = rfAuthorizationFacade.findCurrent();
+    List<RFSegmentAuthorization> expiredAuthorizationList = null;
+
+    if (auth != null) {
+      expiredAuthorizationList = checkForAuthorizedButExpired(auth);
+      if (expiredAuthorizationList != null && !expiredAuthorizationList.isEmpty()) {
+        LOGGER.log(Level.FINEST, "Expiration Check: Revoking expired authorization");
+        revokeExpiredAuthorizations(expiredAuthorizationList);
+      }
+    }
+
+    LOGGER.log(Level.FINEST, "Expiration Check: Checking for expired verifications...");
+    List<RFControlVerification> expiredVerificationList =
+        checkForVerifiedButExpired(); // only items which are "verified" or "provisionally
+    // verified", but need to be "not verified" due to expiration
+    if (expiredVerificationList != null && !expiredVerificationList.isEmpty()) {
+      LOGGER.log(Level.FINEST, "Expiration Check: Revoking expired verifications...");
+      revokeExpiredVerifications(expiredVerificationList);
+    }
+
+    List<RFControlVerification> upcomingVerificationExpirationList = null;
+    List<RFSegmentAuthorization> upcomingAuthorizationExpirationList = null;
+    if (checkForUpcoming) {
+      LOGGER.log(
+          Level.FINEST, "Expiration Check: Checking for upcoming verification expirations...");
+      upcomingVerificationExpirationList = checkForUpcomingVerificationExpirations();
+
+      LOGGER.log(
+          Level.FINEST, "Expiration Check: Checking for upcoming authorization expirations...");
+      if (auth != null) {
+        upcomingAuthorizationExpirationList = checkForUpcomingAuthorizationExpirations(auth);
+      }
+    }
+
+    notifyUsersOfExpirationsAndUpcomingExpirations(
+        expiredAuthorizationList,
+        expiredVerificationList,
+        upcomingAuthorizationExpirationList,
+        upcomingVerificationExpirationList);
+  }
+
+  @PermitAll
+  public RFControlVerification findWithCreditedControl(BigInteger controlVerificationId) {
+    TypedQuery<RFControlVerification> q =
+        em.createQuery(
+            "select a from RFControlVerification a join fetch a.creditedControl where a.rfControlVerificationId = :id",
+            RFControlVerification.class);
+
+    q.setParameter("id", controlVerificationId);
+
+    List<RFControlVerification> resultList = q.getResultList();
+
+    RFControlVerification verification = null;
+
+    if (resultList != null && !resultList.isEmpty()) {
+      verification = resultList.get(0);
+    }
+
+    return verification;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java
similarity index 88%
rename from src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java
rename to src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java
index 5e1a00d..c95cfdd 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleControlParticipation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleBeamControlParticipation.java
@@ -19,11 +19,12 @@
  * @author ryans
  */
 @WebServlet(
-    name = "ToggleControlParticipation",
-    urlPatterns = {"/ajax/toggle-control-participation"})
-public class ToggleControlParticipation extends HttpServlet {
+    name = "ToggleBeamControlParticipation",
+    urlPatterns = {"/ajax/toggle-beam-control-participation"})
+public class ToggleBeamControlParticipation extends HttpServlet {
 
-  private static final Logger logger = Logger.getLogger(ToggleControlParticipation.class.getName());
+  private static final Logger logger =
+      Logger.getLogger(ToggleBeamControlParticipation.class.getName());
 
   @EJB BeamControlVerificationFacade verificationFacade;
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java
new file mode 100644
index 0000000..524e432
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/ajax/ToggleRFControlParticipation.java
@@ -0,0 +1,83 @@
+package org.jlab.jam.presentation.controller.ajax;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.math.BigInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import javax.ejb.EJB;
+import javax.ejb.EJBAccessException;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.RFControlVerificationFacade;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "ToggleRFControlParticipation",
+    urlPatterns = {"/ajax/toggle-rf-control-participation"})
+public class ToggleRFControlParticipation extends HttpServlet {
+
+  private static final Logger logger =
+      Logger.getLogger(ToggleRFControlParticipation.class.getName());
+
+  @EJB RFControlVerificationFacade verificationFacade;
+
+  /**
+   * Handles the HTTP <code>POST</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doPost(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    String errorReason = null;
+
+    try {
+      BigInteger controlId = ParamConverter.convertBigInteger(request, "creditedControlId");
+      BigInteger segmentId = ParamConverter.convertBigInteger(request, "segmentId");
+
+      verificationFacade.toggle(controlId, segmentId);
+    } catch (EJBAccessException e) {
+      logger.log(Level.WARNING, "Not authorized", e);
+      errorReason = "Not authorized";
+    } catch (Exception e) {
+      logger.log(Level.SEVERE, "Unable to toggle", e);
+      errorReason = e.getClass().getSimpleName();
+    }
+
+    response.setContentType("text/xml");
+
+    PrintWriter pw = response.getWriter();
+
+    String xml;
+
+    if (errorReason == null) {
+      xml = "<response><span class=\"status\">Success</span></response>";
+    } else {
+      xml =
+          "<response><span class=\"status\">Error</span><span "
+              + "class=\"reason\">"
+              + errorReason
+              + "</span></response>";
+    }
+
+    pw.write(xml);
+
+    pw.flush();
+
+    boolean error = pw.checkError();
+
+    if (error) {
+      logger.log(Level.SEVERE, "PrintWriter Error");
+    }
+  }
+}
diff --git a/src/main/webapp/WEB-INF/views/control-participation.jsp b/src/main/webapp/WEB-INF/views/control-participation.jsp
index 10e9e12..4b5076e 100644
--- a/src/main/webapp/WEB-INF/views/control-participation.jsp
+++ b/src/main/webapp/WEB-INF/views/control-participation.jsp
@@ -41,14 +41,14 @@
                 <c:otherwise>
                     <div class="accordion">
                         <h3>RF Operations</h3>
-                        <div class="content">
+                        <div class="content rf-content">
                             <c:choose>
                                 <c:when test="${not empty segmentList}">
                                     <div class="participation-scroll-pane">
                                         <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
                                             <thead>
                                             <tr>
-                                                <th rowspan="2" class="component-header">Credited Control</th>
+                                                <th rowspan="2" class="control-header">Credited Control</th>
                                                 <th colspan="${fn:length(segmentList)}">RF Segment</th>
                                             </tr>
                                             <tr>
@@ -87,14 +87,14 @@
                     </div>
                     <div class="accordion">
                         <h3>Beam Operations</h3>
-                        <div class="content">
+                        <div class="content beam-content">
                             <c:choose>
                                 <c:when test="${not empty destinationList}">
                                     <div class="participation-scroll-pane">
                                         <table class="data-table stripped-table fixed-table control-participation-table ${pageContext.request.isUserInRole('jam-admin') ? 'editable' : ''}">
                                             <thead>
                                             <tr>
-                                                <th rowspan="2" class="component-header">Credited Control</th>
+                                                <th rowspan="2" class="control-header">Credited Control</th>
                                                 <th colspan="${fn:length(destinationList)}">Beam Destination</th>
                                             </tr>
                                             <tr>
diff --git a/src/main/webapp/resources/css/control-participation.css b/src/main/webapp/resources/css/control-participation.css
index a0c1c3f..debb202 100644
--- a/src/main/webapp/resources/css/control-participation.css
+++ b/src/main/webapp/resources/css/control-participation.css
@@ -16,9 +16,6 @@
 .control-participation-table {
     font-size: 0.7em;
 }
-.credited-control-header {
-    width: 20%;
-}
 .destination-header {
     width: 8%; /*This will break if the # of beam destinations changes!*/
 }
diff --git a/src/main/webapp/resources/js/control-participation.js b/src/main/webapp/resources/js/control-participation.js
index 19420cf..10d8527 100644
--- a/src/main/webapp/resources/js/control-participation.js
+++ b/src/main/webapp/resources/js/control-participation.js
@@ -12,7 +12,59 @@ jlab.restore = function($td, checked) {
         jlab.uncheck($td);
     }
 };
-jlab.toggle = function() {
+jlab.rfToggle = function() {
+    if (jlab.isRequest()) {
+        window.console && console.log("Ajax already in progress");
+        return;
+    }
+
+    jlab.requestStart();
+
+    var $td = $(this),
+        $tr = $td.closest("tr"),
+        creditedControlId = $tr.attr("data-cc-id"),
+        segmentId = $td.attr("data-segment-id"),
+        checked = $td.html() !== null && ($.trim($td.html()) !== '');
+
+    $td.html("<span class=\"button-indicator\"></span>");
+
+    window.console && console.log("creditedControlId: " + creditedControlId + ", segmentId: " + segmentId);
+
+    var request = jQuery.ajax({
+        url: jlab.contextPath + "/ajax/toggle-rf-control-participation",
+        type: "POST",
+        data: {
+            creditedControlId: creditedControlId,
+            segmentId: segmentId
+        },
+        dataType: "html"
+    });
+
+    request.done(function(data) {
+        if ($(".status", data).html() !== "Success") {
+            jlab.restore($td, checked);
+            alert('Unable to toggle: ' + $(".reason", data).html());
+        } else {
+            if (checked) {
+                jlab.uncheck($td);
+            } else {
+                jlab.check($td);
+            }
+        }
+
+    });
+
+    request.fail(function(xhr, textStatus) {
+        jlab.restore($td, checked);
+        window.console && console.log('Unable to toggle: Text Status: ' + textStatus + ', Ready State: ' + xhr.readyState + ', HTTP Status Code: ' + xhr.status);
+        alert('Unable to toggle');
+    });
+
+    request.always(function() {
+        jlab.requestEnd();
+    });
+};
+jlab.beamToggle = function() {
     if (jlab.isRequest()) {
         window.console && console.log("Ajax already in progress");
         return;
@@ -31,7 +83,7 @@ jlab.toggle = function() {
     window.console && console.log("creditedControlId: " + creditedControlId + ", destinationId: " + destinationId);
 
     var request = jQuery.ajax({
-        url: jlab.contextPath + "/ajax/toggle-control-participation",
+        url: jlab.contextPath + "/ajax/toggle-beam-control-participation",
         type: "POST",
         data: {
             creditedControlId: creditedControlId,
@@ -64,8 +116,11 @@ jlab.toggle = function() {
         jlab.requestEnd();
     });
 };
-$(document).on("click", ".control-participation-table.editable td", function() {
-    jlab.toggle.call(this);
+$(document).on("click", ".rf-content .control-participation-table.editable td", function() {
+    jlab.rfToggle.call(this);
+});
+$(document).on("click", ".beam-content .control-participation-table.editable td", function() {
+    jlab.beamToggle.call(this);
 });
 $(function() {
     $( ".accordion" ).accordion({

From c4607e19fde3f9d2e035f40ffa53085dbb9673c3 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 10:18:11 -0500
Subject: [PATCH 24/44] Separate Facilities

---
 .../session/CreditedControlFacade.java        |  3 ++-
 .../controller/CreditedControls.java          | 26 +++++++++++++++++++
 .../WEB-INF/views/credited-controls.jsp       | 20 +++++++++++++-
 .../resources/css/credited-controls.css       |  6 +++++
 .../webapp/resources/js/credited-controls.js  |  6 +++++
 5 files changed, 59 insertions(+), 2 deletions(-)

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 96dfacf..051d766 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -34,7 +34,7 @@ public CreditedControlFacade() {
   public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
     TypedQuery<CreditedControl> q =
         em.createQuery(
-            "select a from CreditedControl a JOIN FETCH a.beamControlVerificationList as b where b.beamDestination.active = true and a.creditedControlId = :creditedControlId",
+            "select a from CreditedControl a where a.creditedControlId = :creditedControlId",
             CreditedControl.class);
 
     q.setParameter("creditedControlId", creditedControlId);
@@ -48,6 +48,7 @@ public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
 
       // JPAUtil.initialize(cc.getControlVerificationList());
       Collections.sort(cc.getBeamControlVerificationList());
+      Collections.sort(cc.getRFControlVerificationList());
     }
 
     return cc;
diff --git a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java b/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
index bfc4430..abf8d55 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
@@ -2,6 +2,7 @@
 
 import java.io.IOException;
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.servlet.ServletException;
@@ -14,6 +15,7 @@
 import org.jlab.jam.business.session.CreditedControlFacade;
 import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.jam.persistence.entity.RFControlVerification;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -50,6 +52,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       creditedControl = ccFacade.findWithVerificationList(creditedControlId);
 
       if (creditedControl != null) {
+        removeInactiveVerifications(creditedControl);
+
         String username = request.getRemoteUser();
 
         if (username != null) {
@@ -77,4 +81,26 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     request.getRequestDispatcher("WEB-INF/views/credited-controls.jsp").forward(request, response);
   }
+
+  private void removeInactiveVerifications(CreditedControl control) {
+    if (control.getBeamControlVerificationList() != null) {
+      List<BeamControlVerification> beamVerificationList = new ArrayList<>();
+      for (BeamControlVerification bc : control.getBeamControlVerificationList()) {
+        if (bc.getBeamDestination().isActive()) {
+          beamVerificationList.add(bc);
+        }
+      }
+      control.setBeamControlVerificationList(beamVerificationList);
+    }
+
+    if (control.getRFControlVerificationList() != null) {
+      List<RFControlVerification> rfVerificationList = new ArrayList<>();
+      for (RFControlVerification bc : control.getRFControlVerificationList()) {
+        if (bc.getRFSegment().isActive()) {
+          rfVerificationList.add(bc);
+        }
+      }
+      control.setRFControlVerificationList(rfVerificationList);
+    }
+  }
 }
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index 401ca40..6287254 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -79,9 +79,25 @@
                             </div>
                         </c:if>
                         <h3>Verifications</h3>
+                        <div class="accordion">
+                            <h3>RF Operations</h3>
+                            <div class="content beam-content">
+                                <c:choose>
+                                    <c:when test="${fn:length(creditedControl.getRFControlVerificationList()) < 1}">
+                                        None
+                                    </c:when>
+                                    <c:otherwise>
+                                        Stuff exists
+                                    </c:otherwise>
+                                </c:choose>
+                            </div>
+                        </div>
+                        <div class="accordion">
+                            <h3>Beam Operations</h3>
+                            <div class="content beam-content">
                         <c:choose>
                             <c:when test="${fn:length(creditedControl.beamControlVerificationList) < 1}">
-                                <div class="message-box">None</div>
+                                None
                             </c:when>
                             <c:otherwise>
                                 <c:if test="${adminOrLeader && param.notEditable eq null}">
@@ -152,6 +168,8 @@
                                 </c:if>
                             </c:otherwise>
                         </c:choose>
+                            </div>
+                        </div>
                     </div>
                 </c:when>
                 <c:otherwise>
diff --git a/src/main/webapp/resources/css/credited-controls.css b/src/main/webapp/resources/css/credited-controls.css
index f2ff63e..988732b 100644
--- a/src/main/webapp/resources/css/credited-controls.css
+++ b/src/main/webapp/resources/css/credited-controls.css
@@ -68,4 +68,10 @@ body .now-button, body .me-button {
 
 ul.ui-autocomplete {
     z-index: 9000;
+}
+.accordion .ui-widget-content a {
+    color: blue;
+}
+.accordion .ui-widget-content a:hover {
+    color: red;
 }
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/credited-controls.js b/src/main/webapp/resources/js/credited-controls.js
index 58bfc1b..fc30b00 100644
--- a/src/main/webapp/resources/js/credited-controls.js
+++ b/src/main/webapp/resources/js/credited-controls.js
@@ -524,6 +524,12 @@ $(function () {
         }
     });
 
+    $( ".accordion" ).accordion({
+        collapsible: true,
+        heightStyle: "content",
+        active: 0
+    });
+
 });
 /*Now Button Support 1 of 2*/
 $(document).on("click", ".now-button", function () {

From 4b4e859810d24cce5ee582b98f365934b491898e Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 11:28:05 -0500
Subject: [PATCH 25/44] Separate Facilities

---
 .../WEB-INF/tags/verification-panel.tag       | 85 +++++++++++++++++++
 .../WEB-INF/views/credited-controls.jsp       | 73 +---------------
 .../webapp/resources/js/credited-controls.js  |  4 +-
 3 files changed, 91 insertions(+), 71 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/tags/verification-panel.tag

diff --git a/src/main/webapp/WEB-INF/tags/verification-panel.tag b/src/main/webapp/WEB-INF/tags/verification-panel.tag
new file mode 100644
index 0000000..2f88a2f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/verification-panel.tag
@@ -0,0 +1,85 @@
+<%@tag description="Verification Panel Tag" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<%@attribute name="operationsType" required="true" type="java.lang.String"%>
+<%@attribute name="operationsList" required="true" type="java.util.List"%>
+<c:set var="operationsName" value="Beam Destination"/>
+<c:set var="operationsId" value="beamControlVerificationId"/>
+<c:set var="operationsEntity" value="beamDestination"/>
+<c:if test="${'rf' eq operationsType}">
+    <c:set var="operationsName" value="RF Segment"/>
+    <c:set var="operationsId" value="RFControlVerificationId"/>
+    <c:set var="operationsEntity" value="RFSegment"/>
+</c:if>
+<div class="verification-panel">
+    <c:if test="${adminOrLeader && param.notEditable eq null}">
+        <button type="button" class="edit-selected-button verify-button selected-row-action" disabled="disabled">Edit Verification</button>
+    </c:if>
+    <c:if test="${pageContext.request.isUserInRole('jam-admin') && param.notEditable eq null}">
+        <button type="button" class="component-edit-button single-select-row-action" disabled="disabled">Edit Components</button>
+    </c:if>
+    <table class="verification-table data-table stripped-table${(adminOrLeader && param.notEditable eq null) ? ' multicheck-table editable-row-table' : ''}">
+        <thead>
+        <tr>
+            <c:if test="${adminOrLeader && param.notEditable eq null}">
+                <th class="select-header">
+                    Select
+                    <select id="check-select" name="check-select">
+                        <option value="">&nbsp;</option>
+                        <option value="all">All</option>
+                        <option value="none">None</option>
+                    </select>
+                </th>
+            </c:if>
+            <th>Facility / <c:out value="${operationsName}"/></th>
+            <th>Verified</th>
+            <th>Components</th>
+            <th>Comments</th>
+            <th>Expiration Date</th>
+            <th class="audit-header">Audit</th>
+        </tr>
+        </thead>
+        <tbody>
+        <c:forEach items="${operationsList}" var="verification">
+            <tr data-control-verification-id="${verification[operationsId]}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationStatusId}">
+                <c:if test="${adminOrLeader && param.notEditable eq null}">
+                    <td>
+                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification[operationsId]}"/>
+                    </td>
+                </c:if>
+                <td><c:out value="${verification[operationsEntity].facility.name}"/> / <c:out value="${verification[operationsEntity].name}"/></td>
+                <td class="verified-cell">
+                    <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>
+                    <div class="verified-date"><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.verificationDate}"/></div>
+                    <div class="verified-by"><c:out value="${s:formatUsername(verification.verifiedBy)}"/></div>
+                </td>
+                <td>
+                    <c:forEach items="${verification.componentList}" var="component">
+                        <div class="component-status" data-id="${component.componentId}">
+                            <c:choose>
+                                <c:when test="${component.statusId eq 1}">
+                                    <span class="small-icon baseline-small-icon verified-icon"></span>
+                                </c:when>
+                                <c:otherwise>
+                                    <span class="small-icon baseline-small-icon not-verified-icon"></span>
+                                </c:otherwise>
+                            </c:choose>
+                            <a href="${env['JAM_COMPONENT_DETAIL_URL']}${fn:escapeXml(component.name)}"><c:out value="${component.name}"/></a>
+                        </div>
+                    </c:forEach>
+                </td>
+                <td><c:out value="${verification.comments}"/></td>
+                <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
+                <td><a data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification[operationsId]}" title="Click for verification history">History</a></td>
+            </tr>
+        </c:forEach>
+        </tbody>
+    </table>
+    <c:if test="${adminOrLeader && param.notEditable eq null}">
+        <div id="multi-instructions">Hold down the control (Ctrl) or shift key when clicking to select multiple.  Hold down the Command (⌘) key on Mac.</div>
+    </c:if>
+</div>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index 6287254..7b50d74 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -81,91 +81,26 @@
                         <h3>Verifications</h3>
                         <div class="accordion">
                             <h3>RF Operations</h3>
-                            <div class="content beam-content">
+                            <div id="rf-content" class="content">
                                 <c:choose>
                                     <c:when test="${fn:length(creditedControl.getRFControlVerificationList()) < 1}">
                                         None
                                     </c:when>
                                     <c:otherwise>
-                                        Stuff exists
+                                        <t:verification-panel operationsType="rf" operationsList="${creditedControl.getRFControlVerificationList()}"/>
                                     </c:otherwise>
                                 </c:choose>
                             </div>
                         </div>
                         <div class="accordion">
                             <h3>Beam Operations</h3>
-                            <div class="content beam-content">
+                            <div id="beam-content" class="content">
                         <c:choose>
                             <c:when test="${fn:length(creditedControl.beamControlVerificationList) < 1}">
                                 None
                             </c:when>
                             <c:otherwise>
-                                <c:if test="${adminOrLeader && param.notEditable eq null}">
-                                    <button id="edit-selected-button" type="button" class="verify-button selected-row-action" disabled="disabled">Edit Verification</button>
-                                </c:if>
-                                <c:if test="${pageContext.request.isUserInRole('jam-admin') && param.notEditable eq null}">
-                                    <button id="component-edit-button" type="button" class="single-select-row-action" disabled="disabled">Edit Components</button>
-                                </c:if>
-                                <table id="verification-table" class="data-table stripped-table${(adminOrLeader && param.notEditable eq null) ? ' multicheck-table editable-row-table' : ''}">
-                                    <thead>
-                                        <tr>
-                                            <c:if test="${adminOrLeader && param.notEditable eq null}">
-                                                <th class="select-header">
-                                                    Select
-                                                    <select id="check-select" name="check-select">
-                                                        <option value="">&nbsp;</option>
-                                                        <option value="all">All</option>
-                                                        <option value="none">None</option>
-                                                    </select>
-                                                </th>
-                                            </c:if>
-                                            <th>Beam Destination</th>
-                                            <th>Verified</th>
-                                            <th>Components</th>
-                                            <th>Comments</th>
-                                            <th>Expiration Date</th>
-                                            <th class="audit-header">Audit</th>
-                                        </tr>
-                                    </thead>
-                                    <tbody>
-                                        <c:forEach items="${creditedControl.beamControlVerificationList}" var="verification">
-                                            <tr data-control-verification-id="${verification.beamControlVerificationId}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationStatusId}">
-                                                <c:if test="${adminOrLeader && param.notEditable eq null}">
-                                                    <td>
-                                                        <input class="destination-checkbox" type="checkbox" name="destination-checkbox" value="${verification.beamControlVerificationId}"/>
-                                                    </td>
-                                                </c:if>
-                                                <td><c:out value="${verification.beamDestination.name}"/></td>
-                                                <td class="verified-cell">
-                                                  <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>
-                                                  <div class="verified-date"><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.verificationDate}"/></div>
-                                                  <div class="verified-by"><c:out value="${s:formatUsername(verification.verifiedBy)}"/></div>
-                                                </td>
-                                                <td>
-                                                    <c:forEach items="${verification.componentList}" var="component">
-                                                        <div class="component-status" data-id="${component.componentId}">
-                                                            <c:choose>
-                                                                <c:when test="${component.statusId eq 1}">
-                                                                    <span class="small-icon baseline-small-icon verified-icon"></span>
-                                                                </c:when>
-                                                                <c:otherwise>
-                                                                    <span class="small-icon baseline-small-icon not-verified-icon"></span>
-                                                                </c:otherwise>
-                                                            </c:choose>
-                                                            <a href="${env['JAM_COMPONENT_DETAIL_URL']}${fn:escapeXml(component.name)}"><c:out value="${component.name}"/></a>
-                                                        </div>
-                                                    </c:forEach>
-                                                </td>
-                                                <td><c:out value="${verification.comments}"/></td>
-                                                <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                                <td><a data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification.beamControlVerificationId}" title="Click for verification history">History</a></td>
-                                            </tr>
-                                        </c:forEach>
-                                    </tbody>
-                                </table>
-                                <c:if test="${adminOrLeader && param.notEditable eq null}">
-                                    <div id="multi-instructions">Hold down the control (Ctrl) or shift key when clicking to select multiple.  Hold down the Command (⌘) key on Mac.</div> 
-                                </c:if>
+                                <t:verification-panel operationsType="beam" operationsList="${creditedControl.beamControlVerificationList}"/>
                             </c:otherwise>
                         </c:choose>
                             </div>
diff --git a/src/main/webapp/resources/js/credited-controls.js b/src/main/webapp/resources/js/credited-controls.js
index fc30b00..9d68ad9 100644
--- a/src/main/webapp/resources/js/credited-controls.js
+++ b/src/main/webapp/resources/js/credited-controls.js
@@ -310,13 +310,13 @@ $(document).on("change", "#check-select", function () {
         $("#edit-selected-button").prop("disabled", true);
     }
 });*/
-$(document).on("click", "#component-edit-button", function() {
+$(document).on("click", "#beam-content .component-edit-button", function() {
 
     var $componentList = $("#selected-component-list");
 
     $componentList.empty();
 
-    var $rowList = $("#verification-table tbody tr.selected-row");
+    var $rowList = $("#beam-content .verification-table tbody tr.selected-row");
 
     if($rowList.length !== 1) {
         alert("select only one row");

From 0c87261702b4a0015f4df91718fae73c8d27f88c Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 15:41:42 -0500
Subject: [PATCH 26/44] Separate Facilities

---
 .../inventory/ControlsController.java         | 46 ++++++++++++
 .../inventory/DestinationsController.java     | 48 +++++++++++++
 .../inventory/FacilitiesController.java       | 46 ++++++++++++
 .../inventory/SegmentsController.java         | 48 +++++++++++++
 .../webapp/WEB-INF/tags/inventory-page.tag    | 29 ++++++++
 src/main/webapp/WEB-INF/tags/page.tag         |  1 +
 .../WEB-INF/views/inventory/controls.jsp      | 72 +++++++++++++++++++
 .../WEB-INF/views/inventory/destinations.jsp  | 72 +++++++++++++++++++
 .../WEB-INF/views/inventory/facilities.jsp    | 70 ++++++++++++++++++
 .../WEB-INF/views/inventory/segments.jsp      | 72 +++++++++++++++++++
 10 files changed, 504 insertions(+)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java
 create mode 100644 src/main/webapp/WEB-INF/tags/inventory-page.tag
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/controls.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/destinations.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/facilities.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/segments.jsp

diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
new file mode 100644
index 0000000..1f27d15
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
@@ -0,0 +1,46 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade;
+import org.jlab.jam.business.session.CreditedControlFacade;
+import org.jlab.jam.persistence.entity.CreditedControl;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "ControlsController",
+    urlPatterns = {"/inventory/controls"})
+public class ControlsController extends HttpServlet {
+
+  @EJB CreditedControlFacade controlFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<CreditedControl> controlList =
+        controlFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("controlList", controlList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/controls.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java
new file mode 100644
index 0000000..0051746
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/DestinationsController.java
@@ -0,0 +1,48 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import static org.jlab.jam.business.session.AbstractFacade.OrderDirective;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.BeamDestinationFacade;
+import org.jlab.jam.persistence.entity.BeamDestination;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "DestinationsController",
+    urlPatterns = {"/inventory/destinations"})
+public class DestinationsController extends HttpServlet {
+
+  @EJB BeamDestinationFacade destinationFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    OrderDirective[] order =
+        new OrderDirective[] {new OrderDirective("facility"), new OrderDirective("weight")};
+
+    List<BeamDestination> destinationList = destinationFacade.findAll(order);
+
+    request.setAttribute("destinationList", destinationList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/destinations.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java
new file mode 100644
index 0000000..0b25899
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/FacilitiesController.java
@@ -0,0 +1,46 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.persistence.entity.Facility;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "FacilitiesController",
+    urlPatterns = {"/inventory/facilities"})
+public class FacilitiesController extends HttpServlet {
+
+  @EJB FacilityFacade facilityFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<Facility> facilityList =
+        facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("facilityList", facilityList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/facilities.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java
new file mode 100644
index 0000000..6d33767
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/SegmentsController.java
@@ -0,0 +1,48 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import static org.jlab.jam.business.session.AbstractFacade.OrderDirective;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.RFSegmentFacade;
+import org.jlab.jam.persistence.entity.RFSegment;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "SegmentsController",
+    urlPatterns = {"/inventory/segments"})
+public class SegmentsController extends HttpServlet {
+
+  @EJB RFSegmentFacade segmentFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+    OrderDirective[] order =
+        new OrderDirective[] {new OrderDirective("facility"), new OrderDirective("weight")};
+
+    List<RFSegment> segmentList = segmentFacade.findAll(order);
+
+    request.setAttribute("segmentList", segmentList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/segments.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/inventory-page.tag b/src/main/webapp/WEB-INF/tags/inventory-page.tag
new file mode 100644
index 0000000..049b94b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/inventory-page.tag
@@ -0,0 +1,29 @@
+<%@tag description="The Inventory Page Template" pageEncoding="UTF-8"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<%@attribute name="title"%>
+<%@attribute name="stylesheets" fragment="true"%>
+<%@attribute name="scripts" fragment="true"%>
+<t:page title="${title}">
+    <jsp:attribute name="stylesheets">       
+        <jsp:invoke fragment="stylesheets"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <jsp:invoke fragment="scripts"/>
+    </jsp:attribute>
+    <jsp:attribute name="secondaryNavigation">
+        <h2 id="left-column-header">Inventory</h2>
+        <ul>
+            <li${fn:startsWith(currentPath, '/inventory/controls') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/controls">Controls</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/facilities') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/facilities">Facilities</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/segments') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/segments">Segments</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/destinations') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/destinations">Destinations</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/participation') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/participation">Participation</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/authorizers') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/authorizers">Authorizers</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/verifiers') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/verifiers">Verifiers</a></li>
+        </ul>
+    </jsp:attribute>
+    <jsp:body>
+        <jsp:doBody/>
+    </jsp:body>         
+</t:page>
diff --git a/src/main/webapp/WEB-INF/tags/page.tag b/src/main/webapp/WEB-INF/tags/page.tag
index 76d0b95..73308de 100644
--- a/src/main/webapp/WEB-INF/tags/page.tag
+++ b/src/main/webapp/WEB-INF/tags/page.tag
@@ -20,6 +20,7 @@
                     <ul>
                         <li${fn:startsWith(currentPath, '/authorizations') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/authorizations/cebaf">Authorizations</a></li>
                         <li${fn:startsWith(currentPath, '/credited-controls') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/credited-controls">Credited Controls</a></li>
+                        <li${fn:startsWith(currentPath, '/inventory') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/inventory/controls">Inventory</a></li>
                         <li${'/destinations' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/destinations">Beam Destinations</a></li>
                         <li${'/control-participation' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/control-participation">Control Participation</a></li>
                         <li${'/help' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/help">Help</a></li>
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
new file mode 100644
index 0000000..967fc7a
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -0,0 +1,72 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Credited Controls"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Description</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${controlList}" var="control">
+                        <tr data-id="${control.creditedControlId}">
+                            <td><c:out value="${control.name}"/></td>
+                            <td><c:out value="${control.description}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inventory/destinations.jsp b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp
new file mode 100644
index 0000000..b7e8830
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp
@@ -0,0 +1,72 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Beam Destinations"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Facility</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${destinationList}" var="destination">
+                        <tr data-id="${destination.beamDestinationId}">
+                            <td><c:out value="${destination.name}"/></td>
+                            <td><c:out value="${destination.facility.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inventory/facilities.jsp b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp
new file mode 100644
index 0000000..60ec482
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp
@@ -0,0 +1,70 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Facilities"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${facilityList}" var="facility">
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inventory/segments.jsp b/src/main/webapp/WEB-INF/views/inventory/segments.jsp
new file mode 100644
index 0000000..7ec507b
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/segments.jsp
@@ -0,0 +1,72 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="RF Segments"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Facility</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${segmentList}" var="segment">
+                        <tr data-id="${segment.getRFSegmentId()}">
+                            <td><c:out value="${segment.name}"/></td>
+                            <td><c:out value="${segment.facility.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file

From 6d2d20e0a6e95247de68a7696ebd946e35dd1064 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 15:55:53 -0500
Subject: [PATCH 27/44] Separate Facilities

---
 .../ParticipationController.java}                      | 10 +++++-----
 src/main/webapp/WEB-INF/tags/page.tag                  |  1 -
 src/main/webapp/WEB-INF/views/inventory/controls.jsp   |  2 ++
 .../participation.jsp}                                 |  6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{ControlParticipation.java => inventory/ParticipationController.java} (89%)
 rename src/main/webapp/WEB-INF/views/{control-participation.jsp => inventory/participation.jsp} (98%)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
similarity index 89%
rename from src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
rename to src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
index 4b52df2..47e4269 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ControlParticipation.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
@@ -1,4 +1,4 @@
-package org.jlab.jam.presentation.controller;
+package org.jlab.jam.presentation.controller.inventory;
 
 import java.io.IOException;
 import java.math.BigInteger;
@@ -20,9 +20,9 @@
  * @author ryans
  */
 @WebServlet(
-    name = "ControlParticipation",
-    urlPatterns = {"/control-participation"})
-public class ControlParticipation extends HttpServlet {
+    name = "ParticipationController",
+    urlPatterns = {"/inventory/participation"})
+public class ParticipationController extends HttpServlet {
 
   @EJB FacilityFacade facilityFacade;
   @EJB CreditedControlFacade ccFacade;
@@ -71,7 +71,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("error", error);
 
     request
-        .getRequestDispatcher("WEB-INF/views/control-participation.jsp")
+        .getRequestDispatcher("/WEB-INF/views/inventory/participation.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/webapp/WEB-INF/tags/page.tag b/src/main/webapp/WEB-INF/tags/page.tag
index 73308de..c421f81 100644
--- a/src/main/webapp/WEB-INF/tags/page.tag
+++ b/src/main/webapp/WEB-INF/tags/page.tag
@@ -22,7 +22,6 @@
                         <li${fn:startsWith(currentPath, '/credited-controls') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/credited-controls">Credited Controls</a></li>
                         <li${fn:startsWith(currentPath, '/inventory') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/inventory/controls">Inventory</a></li>
                         <li${'/destinations' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/destinations">Beam Destinations</a></li>
-                        <li${'/control-participation' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/control-participation">Control Participation</a></li>
                         <li${'/help' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/help">Help</a></li>
                     </ul>
     </jsp:attribute>
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
index 967fc7a..dab4ad9 100644
--- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -27,6 +27,7 @@
                         <tr>
                             <th>Name</th>
                             <th>Description</th>
+                            <th>Verification Frequency</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -34,6 +35,7 @@
                         <tr data-id="${control.creditedControlId}">
                             <td><c:out value="${control.name}"/></td>
                             <td><c:out value="${control.description}"/></td>
+                            <td><c:out value="${control.verificationFrequency}"/></td>
                         </tr>
                     </c:forEach>
                     </tbody>
diff --git a/src/main/webapp/WEB-INF/views/control-participation.jsp b/src/main/webapp/WEB-INF/views/inventory/participation.jsp
similarity index 98%
rename from src/main/webapp/WEB-INF/views/control-participation.jsp
rename to src/main/webapp/WEB-INF/views/inventory/participation.jsp
index 4b5076e..475db8d 100644
--- a/src/main/webapp/WEB-INF/views/control-participation.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/participation.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions" %>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags" %>
 <c:set var="title" value="Control Participation"/>
-<t:page title="${title}">  
+<t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css"
               href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
@@ -19,7 +19,7 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <form method="get" action="control-participation">
+                    <form method="get" action="participation">
                         <label for="facility-select">Facility: </label>
                         <select id="facility-select" name="facilityId" class="change-submit">
                             <option value=""></option>
@@ -135,4 +135,4 @@
             </c:choose>
         </section>
     </jsp:body>
-</t:page>
+</t:inventory-page>

From ef89fe1fc010373db3776550acfa647ee4868af1 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 16:13:38 -0500
Subject: [PATCH 28/44] Separate Facilities

---
 .../inventory/AuthorizersController.java      | 46 +++++++++++
 .../inventory/VerifiersController.java        | 46 +++++++++++
 .../WEB-INF/views/inventory/authorizers.jsp   | 79 +++++++++++++++++++
 .../WEB-INF/views/inventory/controls.jsp      |  2 +
 .../WEB-INF/views/inventory/verifiers.jsp     | 74 +++++++++++++++++
 5 files changed, 247 insertions(+)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/verifiers.jsp

diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java
new file mode 100644
index 0000000..b61eec3
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/AuthorizersController.java
@@ -0,0 +1,46 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.persistence.entity.Facility;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "AuthorizersController",
+    urlPatterns = {"/inventory/authorizers"})
+public class AuthorizersController extends HttpServlet {
+
+  @EJB FacilityFacade facilityFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<Facility> facilityList =
+        facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("facilityList", facilityList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/authorizers.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java
new file mode 100644
index 0000000..bb75342
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/VerifiersController.java
@@ -0,0 +1,46 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade;
+import org.jlab.jam.business.session.CreditedControlFacade;
+import org.jlab.jam.persistence.entity.CreditedControl;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "VerifiersController",
+    urlPatterns = {"/inventory/verifiers"})
+public class VerifiersController extends HttpServlet {
+
+  @EJB CreditedControlFacade controlFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<CreditedControl> controlList =
+        controlFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("controlList", controlList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/verifiers.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
new file mode 100644
index 0000000..2d527f5
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
@@ -0,0 +1,79 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Authorizers"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Operations Type</th>
+                            <th>Facility</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${facilityList}" var="facility">
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="John Doe (jdoe)"/></td>
+                            <td><c:out value="RF"/></td>
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="John Doe (jdoe)"/></td>
+                            <td><c:out value="BEAM"/></td>
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
index dab4ad9..ee77b0e 100644
--- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -27,6 +27,7 @@
                         <tr>
                             <th>Name</th>
                             <th>Description</th>
+                            <th>Verification Team</th>
                             <th>Verification Frequency</th>
                         </tr>
                     </thead>
@@ -35,6 +36,7 @@
                         <tr data-id="${control.creditedControlId}">
                             <td><c:out value="${control.name}"/></td>
                             <td><c:out value="${control.description}"/></td>
+                            <td><c:out value="${control.group.name}"/></td>
                             <td><c:out value="${control.verificationFrequency}"/></td>
                         </tr>
                     </c:forEach>
diff --git a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
new file mode 100644
index 0000000..cd5aba7
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
@@ -0,0 +1,74 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Verifiers"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Team Name</th>
+                            <th>Members</th>
+                            <th>Credited Control</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${controlList}" var="control">
+                        <tr data-id="${control.creditedControlId}">
+                            <td><c:out value="SSG"/></td>
+                            <td><c:out value="John Doe (jdoe), Jane Doe (janed)"/></td>
+                            <td><c:out value="${control.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file

From 0bb9b365ff62e8357a46a40189659b7336cbac96 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 16:25:01 -0500
Subject: [PATCH 29/44] Separate Facilities

---
 src/main/webapp/WEB-INF/views/inventory/authorizers.jsp | 2 +-
 src/main/webapp/WEB-INF/views/inventory/verifiers.jsp   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
index 2d527f5..649c1f2 100644
--- a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<c:set var="title" value="Authorizers"/>
+<c:set var="title" value="Facility Operations Authorizers"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
diff --git a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
index cd5aba7..fbadf2d 100644
--- a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
@@ -4,7 +4,7 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<c:set var="title" value="Verifiers"/>
+<c:set var="title" value="Credited Control Verifiers"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>

From dd0d5e7b80fd4f7102a122436f036ed9d6f82382 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Wed, 29 Jan 2025 16:59:58 -0500
Subject: [PATCH 30/44] Separate Facilities

---
 .../controller/VerificationsController.java   |  62 ++++++++++
 src/main/webapp/WEB-INF/tags/page.tag         |   3 +-
 .../WEB-INF/views/credited-controls.jsp       |   2 +-
 .../webapp/WEB-INF/views/destinations.jsp     |   2 +-
 .../webapp/WEB-INF/views/verifications.jsp    | 107 ++++++++++++++++++
 5 files changed, 172 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
 create mode 100644 src/main/webapp/WEB-INF/views/verifications.jsp

diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
new file mode 100644
index 0000000..46475d0
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
@@ -0,0 +1,62 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade.OrderDirective;
+import org.jlab.jam.business.session.BeamControlVerificationFacade;
+import org.jlab.jam.business.session.BeamDestinationFacade;
+import org.jlab.jam.business.session.CreditedControlFacade;
+import org.jlab.jam.persistence.entity.BeamControlVerification;
+import org.jlab.jam.persistence.entity.BeamDestination;
+import org.jlab.jam.persistence.entity.CreditedControl;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "VerificationsController",
+    urlPatterns = {"/verifications"})
+public class VerificationsController extends HttpServlet {
+
+  @EJB CreditedControlFacade ccFacade;
+  @EJB BeamControlVerificationFacade verificationFacade;
+  @EJB BeamDestinationFacade destinationFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<BeamControlVerification> expiredList = null;
+    List<BeamControlVerification> expiringList = null;
+    boolean adminOrLeader = false;
+
+    expiredList = verificationFacade.checkForExpired();
+    expiringList = verificationFacade.checkForUpcomingVerificationExpirations();
+
+    List<CreditedControl> ccList = ccFacade.findAll(new OrderDirective("weight"));
+
+    List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
+
+    request.setAttribute("destinationList", destinationList);
+    request.setAttribute("adminOrLeader", adminOrLeader);
+    request.setAttribute("ccList", ccList);
+    request.setAttribute("expiredList", expiredList);
+    request.setAttribute("expiringList", expiringList);
+
+    request.getRequestDispatcher("WEB-INF/views/verifications.jsp").forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/page.tag b/src/main/webapp/WEB-INF/tags/page.tag
index c421f81..76f839c 100644
--- a/src/main/webapp/WEB-INF/tags/page.tag
+++ b/src/main/webapp/WEB-INF/tags/page.tag
@@ -19,9 +19,8 @@
     <jsp:attribute name="primaryNavigation">
                     <ul>
                         <li${fn:startsWith(currentPath, '/authorizations') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/authorizations/cebaf">Authorizations</a></li>
-                        <li${fn:startsWith(currentPath, '/credited-controls') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/credited-controls">Credited Controls</a></li>
+                        <li${fn:startsWith(currentPath, '/verifications') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/verifications">Verifications</a></li>
                         <li${fn:startsWith(currentPath, '/inventory') ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/inventory/controls">Inventory</a></li>
-                        <li${'/destinations' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/destinations">Beam Destinations</a></li>
                         <li${'/help' eq currentPath ? ' class="current-primary"' : ''}><a href="${pageContext.request.contextPath}/help">Help</a></li>
                     </ul>
     </jsp:attribute>
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index 7b50d74..676844b 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -17,7 +17,7 @@
             <div class="banner-breadbox">
                 <ul>
                     <li>
-                        <a href="credited-controls">Credited Controls</a>
+                        <a href="verifications">Verifications</a>
                     </li>
                     <li>
                         <form method="get" action="credited-controls">
diff --git a/src/main/webapp/WEB-INF/views/destinations.jsp b/src/main/webapp/WEB-INF/views/destinations.jsp
index 000bae2..b0b133c 100644
--- a/src/main/webapp/WEB-INF/views/destinations.jsp
+++ b/src/main/webapp/WEB-INF/views/destinations.jsp
@@ -29,7 +29,7 @@
             <div class="banner-breadbox">
                 <ul>
                     <li>
-                        <a href="destinations">Beam Destinations</a>
+                        <a href="verifications">Verifications</a>
                     </li>
                     <li>
                         <form method="get" action="destinations">
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
new file mode 100644
index 0000000..0b37633
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -0,0 +1,107 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<t:page title="Verifications">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">          
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/credited-controls.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+        <div class="expire-links"><a id="expired-link" href="#">Expired</a> | <a id="expiring-link" href="#">Expiring</a></div>
+        <form method="get" action="credited-controls">
+            <ul class="key-value-list">
+                <li>
+                    <div class="li-key">
+                        <label for="control-select">By Credited Control</label>
+                    </div>
+                    <div class="li-value">
+                        <select id="control-select" name="creditedControlId" class="change-submit">
+                            <option value=""></option>
+                            <c:forEach items="${ccList}" var="cc">
+                                <option value="${cc.creditedControlId}"${param.creditedControlId eq cc.creditedControlId ? ' selected="selected"' : ''}><c:out value="${cc.name}"/></option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </li>
+            </ul>
+        </form>
+        <form method="get" action="destinations">
+            <ul class="key-value-list">
+                <li>
+                    <div class="li-key">
+                        <label for="destination-select">By Beam Destination</label>
+                    </div>
+                    <div class="li-value">
+                        <select id="destination-select" name="destinationId" class="change-submit">
+                            <option value=""></option>
+                            <c:forEach items="${destinationList}" var="destination">
+                                <option value="${destination.beamDestinationId}"${param.destinationId eq destination.beamDestinationId ? ' selected="selected"' : ''}><c:out value="${destination.name}"/></option>
+                            </c:forEach>
+                        </select>
+                    </div>
+                </li>
+            </ul>
+        </form>
+        <div id="expired-dialog" class="dialog" title="Expired Controls">
+            <c:choose>
+                <c:when test="${fn:length(expiredList) > 0}">
+                    <table class="data-table stripped-table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Beam Destination</th>
+                                <th>Expiration Date</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <c:forEach items="${expiredList}" var="verification">
+                                <tr>
+                                    <td><c:out value="${verification.creditedControl.name}"/></td>                                    
+                                    <td><c:out value="${verification.beamDestination.name}"/></td>
+                                    <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
+                                </tr>
+                            </c:forEach>
+                        </tbody>
+                    </table>                            
+                </c:when>
+                <c:otherwise>
+                    <div>No expired controls</div>
+                </c:otherwise>
+            </c:choose>
+        </div>  
+        <div id="expiring-dialog" class="dialog" title="Controls Expiring within Seven Days">
+            <c:choose>
+                <c:when test="${fn:length(expiringList) > 0}">
+                    <table class="data-table stripped-table">
+                        <thead>
+                            <tr>
+                                <th>Name</th>
+                                <th>Beam Destination</th>
+                                <th>Expiration Date</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <c:forEach items="${expiringList}" var="verification">
+                                <tr>
+                                    <td><c:out value="${verification.creditedControl.name}"/></td>                                    
+                                    <td><c:out value="${verification.beamDestination.name}"/></td>
+                                    <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
+                                </tr>
+                            </c:forEach>
+                        </tbody>
+                    </table>                            
+                </c:when>
+                <c:otherwise>
+                    <div>No controls expiring within seven days</div>
+                </c:otherwise>
+            </c:choose>            
+        </div>
+    </jsp:body>         
+</t:page>

From 07aceba4c2df9deb91283cba45fddbe4828fce27 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 08:47:52 -0500
Subject: [PATCH 31/44] Separate Facilities

---
 container/oracle/initdb.d/02_ddl.sql          | 24 +++++++++
 container/oracle/initdb.d/03_default_data.sql |  4 +-
 .../jam/persistence/entity/RFSegment.java     |  5 +-
 .../view/FacilityControlVerification.java     | 51 +++++++++++++++++++
 .../view/RFSegmentVerification.java           | 44 ++++++++++++++++
 .../WEB-INF/views/credited-controls.jsp       |  3 ++
 .../webapp/WEB-INF/views/destinations.jsp     | 21 ++++++--
 .../webapp/WEB-INF/views/verifications.jsp    | 17 +++++++
 8 files changed, 162 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
 create mode 100644 src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java

diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index 89ee88f..a7fb97b 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -265,6 +265,30 @@ CREATE TABLE JAM_OWNER.BEAM_CONTROL_VERIFICATION_HISTORY
     CONSTRAINT BEAM_CONTROL_VERIFICATION_HISTORY_FK3 FOREIGN KEY (VERIFICATION_STATUS_ID) REFERENCES JAM_OWNER.VERIFICATION_STATUS (VERIFICATION_STATUS_ID) ON DELETE SET NULL
 );
 
+CREATE OR REPLACE FORCE VIEW JAM_OWNER.FACILITY_CONTROL_VERIFICATION (FACILITY_ID, CREDITED_CONTROL_ID, VERIFICATION_STATUS_ID, EXPIRATION_DATE) AS
+with segment_verification as (
+   select facility_id, credited_control_id, rf_segment_id, verification_status_id, expiration_date from JAM_OWNER.RF_SEGMENT join RF_CONTROL_VERIFICATION using(RF_SEGMENT_ID)
+),
+destination_verification as (
+    select facility_id, credited_control_id, beam_destination_id, verification_status_id, expiration_date from JAM_OWNER.BEAM_DESTINATION join BEAM_CONTROL_VERIFICATION using(BEAM_DESTINATION_ID)
+),
+operations_verification as (
+    select facility_id, credited_control_id, verification_status_id, expiration_date from segment_verification
+    union all
+    select facility_id, credited_control_id, verification_status_id, expiration_date from destination_verification
+)
+    SELECT facility_id,
+           credited_control_id,
+           NVL(MAX(verification_status_id), 1) AS VERIFICATION_STATUS_ID,
+           MIN(expiration_date) AS EXPIRATION_DATE
+FROM JAM_OWNER.FACILITY join operations_verification using (facility_id) group by facility_id, credited_control_id;
+
+CREATE OR REPLACE FORCE VIEW JAM_OWNER.RF_SEGMENT_VERIFICATION (RF_SEGMENT_ID, VERIFICATION_STATUS_ID, EXPIRATION_DATE) AS
+SELECT a.rf_segment_id,
+       NVL((SELECT MAX(VERIFICATION_STATUS_ID) FROM JAM_OWNER.RF_CONTROL_VERIFICATION b WHERE a.rf_segment_id = b.rf_segment_id), 1) AS VERIFICATION_STATUS_ID,
+       (SELECT MIN(EXPIRATION_DATE) FROM JAM_OWNER.RF_CONTROL_VERIFICATION b WHERE a.rf_segment_id = b.rf_segment_id) as EXPIRATION_DATE
+FROM JAM_OWNER.RF_SEGMENT a;
+
 CREATE OR REPLACE FORCE VIEW JAM_OWNER.BEAM_DESTINATION_VERIFICATION (BEAM_DESTINATION_ID, VERIFICATION_STATUS_ID, EXPIRATION_DATE) AS
 SELECT a.beam_destination_id,
        NVL((SELECT MAX(VERIFICATION_STATUS_ID) FROM JAM_OWNER.BEAM_CONTROL_VERIFICATION b WHERE a.beam_destination_id = b.beam_destination_id), 1) AS VERIFICATION_STATUS_ID,
diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index 9580cb9..ecea6d9 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -52,8 +52,8 @@ insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, W
 
 -- Populate Beam Destinations
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '1D Spectrometer (IDL1D00)', 1, 'uA', 'Y', 1);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Faraday Cup #2 (IFY0L03', 1, 'uA', 'Y', 2);
-insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Inline Dump (SDL0R08', 1, 'uA', 'Y', 3);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Faraday Cup #2 (IFY0L03)', 1, 'uA', 'Y', 2);
+insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Inline Dump (SDL0R08)', 1, 'uA', 'Y', 3);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'BSY', 1, 'uA', 'Y', 4);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall A', 1, 'uA', 'Y', 5);
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, 'Hall B', 1, 'uA', 'Y', 6);
diff --git a/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
index 2f563e8..6a0e943 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/RFSegment.java
@@ -6,6 +6,7 @@
 import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import org.jlab.jam.persistence.view.RFSegmentVerification;
 import org.jlab.smoothness.persistence.util.YnStringToBoolean;
 
 @Entity
@@ -28,7 +29,7 @@ public class RFSegment {
 
   @OneToOne(fetch = FetchType.EAGER)
   @JoinColumn(name = "RF_SEGMENT_ID")
-  private RFControlVerification verification;
+  private RFSegmentVerification verification;
 
   @Size(max = 128)
   @Column(length = 128)
@@ -59,7 +60,7 @@ public void setWeight(BigInteger weight) {
     this.weight = weight;
   }
 
-  public RFControlVerification getVerification() {
+  public RFSegmentVerification getVerification() {
     return verification;
   }
 
diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
new file mode 100644
index 0000000..6375215
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
@@ -0,0 +1,51 @@
+package org.jlab.jam.persistence.view;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "FACILITY_CONTROL_VERIFICATION", schema = "JAM_OWNER")
+public class FacilityControlVerification implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "FACILITY_ID", nullable = false)
+  private BigInteger facilityId;
+
+  @Column(name = "CREDITED_CONTROL_ID")
+  private BigInteger creditedControlId;
+
+  @Column(name = "VERIFICATION_STATUS_ID")
+  private Integer verificationStatusId;
+
+  @Column(name = "EXPIRATION_DATE")
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date expirationDate;
+
+  public FacilityControlVerification() {}
+
+  public BigInteger getFacilityId() {
+    return facilityId;
+  }
+
+  public BigInteger getCreditedControlId() {
+    return creditedControlId;
+  }
+
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
+  }
+
+  public Date getExpirationDate() {
+    return expirationDate;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java b/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java
new file mode 100644
index 0000000..f6d4bce
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/view/RFSegmentVerification.java
@@ -0,0 +1,44 @@
+package org.jlab.jam.persistence.view;
+
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.Date;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @author ryans
+ */
+@Entity
+@Table(name = "RF_SEGMENT_VERIFICATION", schema = "JAM_OWNER")
+public class RFSegmentVerification implements Serializable {
+
+  private static final long serialVersionUID = 1L;
+
+  @Id
+  @Basic(optional = false)
+  @NotNull
+  @Column(name = "RF_SEGMENT_ID", nullable = false)
+  private BigInteger rfSegmentId;
+
+  @Column(name = "VERIFICATION_STATUS_ID")
+  private Integer verificationStatusId;
+
+  @Column(name = "EXPIRATION_DATE")
+  @Temporal(TemporalType.TIMESTAMP)
+  private Date expirationDate;
+
+  public RFSegmentVerification() {}
+
+  public BigInteger getRFSegmentId() {
+    return rfSegmentId;
+  }
+
+  public Integer getVerificationStatusId() {
+    return verificationStatusId;
+  }
+
+  public Date getExpirationDate() {
+    return expirationDate;
+  }
+}
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index 676844b..65134c7 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -35,6 +35,9 @@
             <c:choose>
                 <c:when test="${creditedControl ne null}">
                     <div class="dialog-content">
+
+                        TODO: Rollup Status and Expiration go here
+
                         <h3>Group</h3>
                         <c:out value="${creditedControl.group.name}"/>
                         <h3>Description</h3>
diff --git a/src/main/webapp/WEB-INF/views/destinations.jsp b/src/main/webapp/WEB-INF/views/destinations.jsp
index b0b133c..bccf8b8 100644
--- a/src/main/webapp/WEB-INF/views/destinations.jsp
+++ b/src/main/webapp/WEB-INF/views/destinations.jsp
@@ -4,8 +4,9 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Destinations"> 
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<c:set var="title" value="Destination Verification"/>
+<t:page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
         <style type="text/css">
@@ -44,10 +45,24 @@
             </div>
         </c:if>
         <section>
+            <h2><c:out value="${title}${empty destination ? '' : ': '.concat(destination.name)}"/></h2>
             <c:choose>
                 <c:when test="${destination ne null}">
                     <div class="dialog-content">
-                        <h3>Verifications</h3>
+                        <h3>
+                            <c:choose>
+                                <c:when test="${beamDestination.verification.verificationStatusId eq 1}">
+                                    <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
+                                </c:when>
+                                <c:when test="${beamDestination.verification.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="${beamDestination.name}"/> Credited Control Verifications
+                        </h3>
                         <c:choose>
                             <c:when test="${fn:length(destination.beamControlVerificationList) < 1}">
                                 <div class="message-box">None</div>
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index 0b37633..d04b006 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -32,6 +32,20 @@
                 </li>
             </ul>
         </form>
+        <form>
+            <ul class="key-value-list">
+                <li>
+                    <div class="li-key">
+                        <label>By RF Segment</label>
+                    </div>
+                    <div class="li-value">
+                        <select name="segmentId" class="change-submit">
+                            <option value=""></option>
+                        </select>
+                    </div>
+                </li>
+            </ul>
+        </form>
         <form method="get" action="destinations">
             <ul class="key-value-list">
                 <li>
@@ -49,6 +63,9 @@
                 </li>
             </ul>
         </form>
+
+        TODO: Replace selects with three tables of rollup status and expiration with link to details
+
         <div id="expired-dialog" class="dialog" title="Expired Controls">
             <c:choose>
                 <c:when test="${fn:length(expiredList) > 0}">

From 8a1a5a352d941a6b2a3e9573fe38b105ab261a1c Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 09:13:44 -0500
Subject: [PATCH 32/44] Separate Facilities

---
 ...ions.java => DestinationVerification.java} |  8 ++--
 .../WEB-INF/views/credited-controls.jsp       | 42 +++++++------------
 ...tions.jsp => destination-verification.jsp} |  4 +-
 .../WEB-INF/views/inventory/controls.jsp      |  2 +-
 4 files changed, 22 insertions(+), 34 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{Destinations.java => DestinationVerification.java} (87%)
 rename src/main/webapp/WEB-INF/views/{destinations.jsp => destination-verification.jsp} (98%)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/Destinations.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
similarity index 87%
rename from src/main/java/org/jlab/jam/presentation/controller/Destinations.java
rename to src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
index 7c53934..7ad571a 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/Destinations.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
@@ -17,9 +17,9 @@
  * @author ryans
  */
 @WebServlet(
-    name = "Destinations",
-    urlPatterns = {"/destinations"})
-public class Destinations extends HttpServlet {
+    name = "DestinationVerification",
+    urlPatterns = {"/verifications/destination"})
+public class DestinationVerification extends HttpServlet {
 
   @EJB BeamDestinationFacade destinationFacade;
 
@@ -53,6 +53,6 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("adminOrLeader", adminOrLeader);
     request.setAttribute("destination", destination);
 
-    request.getRequestDispatcher("WEB-INF/views/destinations.jsp").forward(request, response);
+    request.getRequestDispatcher("/WEB-INF/views/destination-verification.jsp").forward(request, response);
   }
 }
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/credited-controls.jsp
index 65134c7..6933eaa 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/credited-controls.jsp
@@ -4,8 +4,9 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Credited Controls"> 
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<c:set var="title" value="Control Verification"/>
+<t:page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
     </jsp:attribute>
@@ -17,7 +18,7 @@
             <div class="banner-breadbox">
                 <ul>
                     <li>
-                        <a href="verifications">Verifications</a>
+                        <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
                     </li>
                     <li>
                         <form method="get" action="credited-controls">
@@ -32,32 +33,19 @@
             </div>
         </c:if>
         <section>
+            <h2><c:out value="${title}${empty creditedControl ? '' : ': '.concat(creditedControl.name)}"/></h2>
             <c:choose>
                 <c:when test="${creditedControl ne null}">
                     <div class="dialog-content">
-
-                        TODO: Rollup Status and Expiration go here
-
-                        <h3>Group</h3>
-                        <c:out value="${creditedControl.group.name}"/>
-                        <h3>Description</h3>
-                        <c:choose>
-                            <c:when test="${fn:length(creditedControl.description) > 0}">
-                                <c:out value="${creditedControl.description}"/>
-                            </c:when>
-                            <c:otherwise>
-                                <div class="message-box">None</div>
-                            </c:otherwise>
-                        </c:choose>
-                        <h3>Verification Frequency</h3>
-                        <c:choose>
-                            <c:when test="${fn:length(creditedControl.verificationFrequency) > 0}">
-                                <c:out value="${creditedControl.verificationFrequency}"/>
-                            </c:when>
-                            <c:otherwise>
-                                <div class="message-box">As Needed</div>
-                            </c:otherwise>
-                        </c:choose>
+                        <h3>Facility Verifications</h3>
+                        <table>
+                            <tbody>
+                                <tr>
+                                    <td>
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </table>
                         <c:if test="${pageContext.request.isUserInRole('jam-admin')}">
                             <h3>Operability Notes <span class="readonly-field"><button id="operability-notes-edit-button" type="button">Edit</button></span></h3>    
                             <div class="notes-field">
@@ -81,7 +69,7 @@
                                 </span>
                             </div>
                         </c:if>
-                        <h3>Verifications</h3>
+                        <h3>Operations Verifications</h3>
                         <div class="accordion">
                             <h3>RF Operations</h3>
                             <div id="rf-content" class="content">
diff --git a/src/main/webapp/WEB-INF/views/destinations.jsp b/src/main/webapp/WEB-INF/views/destination-verification.jsp
similarity index 98%
rename from src/main/webapp/WEB-INF/views/destinations.jsp
rename to src/main/webapp/WEB-INF/views/destination-verification.jsp
index bccf8b8..54d0d63 100644
--- a/src/main/webapp/WEB-INF/views/destinations.jsp
+++ b/src/main/webapp/WEB-INF/views/destination-verification.jsp
@@ -30,10 +30,10 @@
             <div class="banner-breadbox">
                 <ul>
                     <li>
-                        <a href="verifications">Verifications</a>
+                        <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
                     </li>
                     <li>
-                        <form method="get" action="destinations">
+                        <form method="get" action="destination">
                             <select name="destinationId" class="change-submit">
                                 <c:forEach items="${destinationList}" var="destination">
                                     <option value="${destination.beamDestinationId}"${param.destinationId eq destination.beamDestinationId ? ' selected="selected"' : ''}><c:out value="${destination.name}"/></option>
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
index ee77b0e..559b906 100644
--- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -37,7 +37,7 @@
                             <td><c:out value="${control.name}"/></td>
                             <td><c:out value="${control.description}"/></td>
                             <td><c:out value="${control.group.name}"/></td>
-                            <td><c:out value="${control.verificationFrequency}"/></td>
+                            <td><c:out value="${empty control.verificationFrequency ? 'As Needed' : control.verificationFrequency}"/></td>
                         </tr>
                     </c:forEach>
                     </tbody>

From f4e7da83924e9399b3aa11f59ee6541fb8ae8a71 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 10:27:21 -0500
Subject: [PATCH 33/44] Separate Facilities

---
 ...Controls.java => ControlVerification.java} |  10 +-
 .../controller/DestinationVerification.java   |   4 +-
 .../controller/VerificationsController.java   |  31 +++-
 ...-controls.jsp => control-verification.jsp} |   6 +-
 .../views/destination-verification.jsp        |   4 +-
 .../webapp/WEB-INF/views/verifications.jsp    | 149 +++++++++++-------
 ...-controls.css => control-verification.css} |   3 -
 .../webapp/resources/css/verifications.css    |   3 +
 ...ed-controls.js => control-verification.js} |   8 -
 src/main/webapp/resources/js/verifications.js |  13 ++
 10 files changed, 152 insertions(+), 79 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{CreditedControls.java => ControlVerification.java} (93%)
 rename src/main/webapp/WEB-INF/views/{credited-controls.jsp => control-verification.jsp} (98%)
 rename src/main/webapp/resources/css/{credited-controls.css => control-verification.css} (97%)
 create mode 100644 src/main/webapp/resources/css/verifications.css
 rename src/main/webapp/resources/js/{credited-controls.js => control-verification.js} (98%)
 create mode 100644 src/main/webapp/resources/js/verifications.js

diff --git a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
similarity index 93%
rename from src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
rename to src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
index abf8d55..6137304 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/CreditedControls.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
@@ -22,9 +22,9 @@
  * @author ryans
  */
 @WebServlet(
-    name = "CreditedControls",
-    urlPatterns = {"/credited-controls"})
-public class CreditedControls extends HttpServlet {
+    name = "ControlVerification",
+    urlPatterns = {"/verifications/control"})
+public class ControlVerification extends HttpServlet {
 
   @EJB CreditedControlFacade ccFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
@@ -79,7 +79,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("expiredList", expiredList);
     request.setAttribute("expiringList", expiringList);
 
-    request.getRequestDispatcher("WEB-INF/views/credited-controls.jsp").forward(request, response);
+    request
+        .getRequestDispatcher("/WEB-INF/views/control-verification.jsp")
+        .forward(request, response);
   }
 
   private void removeInactiveVerifications(CreditedControl control) {
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
index 7ad571a..84dee28 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
@@ -53,6 +53,8 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("adminOrLeader", adminOrLeader);
     request.setAttribute("destination", destination);
 
-    request.getRequestDispatcher("/WEB-INF/views/destination-verification.jsp").forward(request, response);
+    request
+        .getRequestDispatcher("/WEB-INF/views/destination-verification.jsp")
+        .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
index 46475d0..29afc58 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
@@ -1,6 +1,7 @@
 package org.jlab.jam.presentation.controller;
 
 import java.io.IOException;
+import java.math.BigInteger;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.servlet.ServletException;
@@ -8,13 +9,13 @@
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.*;
 import org.jlab.jam.business.session.AbstractFacade.OrderDirective;
-import org.jlab.jam.business.session.BeamControlVerificationFacade;
-import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.business.session.CreditedControlFacade;
 import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.BeamDestination;
 import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
  * @author ryans
@@ -27,6 +28,7 @@ public class VerificationsController extends HttpServlet {
   @EJB CreditedControlFacade ccFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
   @EJB BeamDestinationFacade destinationFacade;
+  @EJB FacilityFacade facilityFacade;
 
   /**
    * Handles the HTTP <code>GET</code> method.
@@ -40,6 +42,18 @@ public class VerificationsController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
+    BigInteger facilityId = ParamConverter.convertBigInteger(request, "facilityId");
+
+    Facility facility = null;
+
+    if (facilityId != null) {
+      facility = facilityFacade.find(facilityId);
+
+      if (facility == null) {
+        throw new ServletException("Facility not found with ID: " + facilityId);
+      }
+    }
+
     List<BeamControlVerification> expiredList = null;
     List<BeamControlVerification> expiringList = null;
     boolean adminOrLeader = false;
@@ -51,6 +65,17 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
 
+    List<Facility> facilityList = facilityFacade.findAll(new OrderDirective("weight"));
+
+    String selectionMessage = "All Verifications";
+
+    if (facility != null) {
+      selectionMessage = "Facility \"" + facility.getName() + "\"";
+    }
+
+    request.setAttribute("facility", facility);
+    request.setAttribute("selectionMessage", selectionMessage);
+    request.setAttribute("facilityList", facilityList);
     request.setAttribute("destinationList", destinationList);
     request.setAttribute("adminOrLeader", adminOrLeader);
     request.setAttribute("ccList", ccList);
diff --git a/src/main/webapp/WEB-INF/views/credited-controls.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp
similarity index 98%
rename from src/main/webapp/WEB-INF/views/credited-controls.jsp
rename to src/main/webapp/WEB-INF/views/control-verification.jsp
index 6933eaa..f9d4707 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls.jsp
+++ b/src/main/webapp/WEB-INF/views/control-verification.jsp
@@ -8,10 +8,10 @@
 <c:set var="title" value="Control Verification"/>
 <t:page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/control-verification.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">          
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/credited-controls.js"></script>
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/control-verification.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <c:if test="${creditedControl ne null}">
@@ -21,7 +21,7 @@
                         <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
                     </li>
                     <li>
-                        <form method="get" action="credited-controls">
+                        <form method="get" action="control">
                             <select name="creditedControlId" class="change-submit">
                                 <c:forEach items="${ccList}" var="cc">
                                     <option value="${cc.creditedControlId}"${param.creditedControlId eq cc.creditedControlId ? ' selected="selected"' : ''}><c:out value="${cc.name}"/></option>
diff --git a/src/main/webapp/WEB-INF/views/destination-verification.jsp b/src/main/webapp/WEB-INF/views/destination-verification.jsp
index 54d0d63..976af49 100644
--- a/src/main/webapp/WEB-INF/views/destination-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/destination-verification.jsp
@@ -8,7 +8,7 @@
 <c:set var="title" value="Destination Verification"/>
 <t:page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/control-verification.css"/>
         <style type="text/css">
             .dialog-content {
                 padding-bottom: 1em;
@@ -23,7 +23,7 @@
             jlab = jlab || {};
             jlab.verificationType = 'Control-Group';
         </script>
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/credited-controls.js"></script>
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/control-verification.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <c:if test="${destination ne null}">
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index d04b006..b778f4e 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -4,68 +4,107 @@
 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Verifications">
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<c:set var="title" value="Verifications"/>
+<t:page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/verifications.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">          
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/credited-controls.js"></script>
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/verifications.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
         <div class="expire-links"><a id="expired-link" href="#">Expired</a> | <a id="expiring-link" href="#">Expiring</a></div>
-        <form method="get" action="credited-controls">
-            <ul class="key-value-list">
-                <li>
-                    <div class="li-key">
-                        <label for="control-select">By Credited Control</label>
-                    </div>
-                    <div class="li-value">
-                        <select id="control-select" name="creditedControlId" class="change-submit">
-                            <option value=""></option>
-                            <c:forEach items="${ccList}" var="cc">
-                                <option value="${cc.creditedControlId}"${param.creditedControlId eq cc.creditedControlId ? ' selected="selected"' : ''}><c:out value="${cc.name}"/></option>
-                            </c:forEach>
-                        </select>
-                    </div>
-                </li>
-            </ul>
-        </form>
-        <form>
-            <ul class="key-value-list">
-                <li>
-                    <div class="li-key">
-                        <label>By RF Segment</label>
-                    </div>
-                    <div class="li-value">
-                        <select name="segmentId" class="change-submit">
-                            <option value=""></option>
-                        </select>
-                    </div>
-                </li>
-            </ul>
-        </form>
-        <form method="get" action="destinations">
-            <ul class="key-value-list">
-                <li>
-                    <div class="li-key">
-                        <label for="destination-select">By Beam Destination</label>
-                    </div>
-                    <div class="li-value">
-                        <select id="destination-select" name="destinationId" class="change-submit">
-                            <option value=""></option>
-                            <c:forEach items="${destinationList}" var="destination">
-                                <option value="${destination.beamDestinationId}"${param.destinationId eq destination.beamDestinationId ? ' selected="selected"' : ''}><c:out value="${destination.name}"/></option>
-                            </c:forEach>
-                        </select>
-                    </div>
-                </li>
-            </ul>
-        </form>
-
-        TODO: Replace selects with three tables of rollup status and expiration with link to details
-
+        <s:filter-flyout-widget ribbon="true" clearButton="true">
+            <form id="filter-form" method="get" action="verifications">
+                <div id="filter-form-panel">
+                    <fieldset>
+                        <legend>Filter</legend>
+                        <ul class="key-value-list">
+                            <li>
+                                <div class="li-key">
+                                    <label for="facility-select">Facility</label>
+                                </div>
+                                <div class="li-value">
+                                    <select id="facility-select" name="facilityId">
+                                        <option value="">&nbsp;</option>
+                                        <c:forEach items="${facilityList}" var="facility">
+                                            <option value="${facility.facilityId}"${param.facilityId eq facility.facilityId ? ' selected="selected"' : ''}>
+                                                <c:out value="${facility.name}"/></option>
+                                        </c:forEach>
+                                    </select>
+                                </div>
+                            </li>
+                        </ul>
+                    </fieldset>
+                </div>
+                <input id="filter-form-submit-button" type="submit" value="Apply"/>
+            </form>
+        </s:filter-flyout-widget>
+        <h2 id="page-header-title"><c:out value="${title}"/></h2>
+        <div class="message-box"><c:out value="${selectionMessage}"/></div>
+        <h3>Credited Controls</h3>
+        <table class="data-table">
+            <tbody>
+            <c:forEach items="${ccList}" var="cc">
+                <tr>
+                    <td><c:out value="${cc.name}"/></td>
+                    <td>
+                        <form method="get" action="${pageContext.request.contextPath}/verifications/control">
+                            <input type="hidden" name="creditedControlId" value="${cc.creditedControlId}"/>
+                            <button class="single-char-button" type="submit">&rarr;</button>
+                        </form>
+                    </td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+        <h3>RF Segments</h3>
+        <table class="data-table">
+            <tbody>
+            <c:forEach items="${segmentList}" var="segment">
+                <tr>
+                    <td><c:out value="${segment.name}"/></td>
+                    <td>
+                        <form method="get" action="${pageContext.request.contextPath}/verifications/segment">
+                            <input type="hidden" name="rfSegmentId" value="${segment.rfSegmentId}"/>
+                            <button class="single-char-button" type="submit">&rarr;</button>
+                        </form>
+                    </td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
+        <h3>Beam Destinations</h3>
+        <table class="data-table">
+            <tbody>
+            <c:forEach items="${destinationList}" var="destination">
+                <tr>
+                    <td>
+                        <c:choose>
+                            <c:when test="${destination.verification.verificationStatusId eq 1}">
+                                <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
+                            </c:when>
+                            <c:when test="${destination.verification.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="${destination.name}"/>
+                    </td>
+                    <td>
+                        <form method="get" action="${pageContext.request.contextPath}/verifications/destination">
+                            <input type="hidden" name="destinationId" value="${destination.beamDestinationId}"/>
+                            <button class="single-char-button" type="submit">&rarr;</button>
+                        </form>
+                    </td>
+                </tr>
+            </c:forEach>
+            </tbody>
+        </table>
         <div id="expired-dialog" class="dialog" title="Expired Controls">
             <c:choose>
                 <c:when test="${fn:length(expiredList) > 0}">
diff --git a/src/main/webapp/resources/css/credited-controls.css b/src/main/webapp/resources/css/control-verification.css
similarity index 97%
rename from src/main/webapp/resources/css/credited-controls.css
rename to src/main/webapp/resources/css/control-verification.css
index 988732b..2005d70 100644
--- a/src/main/webapp/resources/css/credited-controls.css
+++ b/src/main/webapp/resources/css/control-verification.css
@@ -10,9 +10,6 @@
     overflow: auto;
     padding: 0.1em;
 }
-.expire-links {
-    float: right;
-}
 .small-icon.comment-icon {
     background: rgba(0, 0, 0, 0) url("../img/comment.png") repeat scroll 0 0;
 }
diff --git a/src/main/webapp/resources/css/verifications.css b/src/main/webapp/resources/css/verifications.css
new file mode 100644
index 0000000..8d56405
--- /dev/null
+++ b/src/main/webapp/resources/css/verifications.css
@@ -0,0 +1,3 @@
+.expire-links {
+    float: right;
+}
\ No newline at end of file
diff --git a/src/main/webapp/resources/js/credited-controls.js b/src/main/webapp/resources/js/control-verification.js
similarity index 98%
rename from src/main/webapp/resources/js/credited-controls.js
rename to src/main/webapp/resources/js/control-verification.js
index 9d68ad9..e429172 100644
--- a/src/main/webapp/resources/js/credited-controls.js
+++ b/src/main/webapp/resources/js/control-verification.js
@@ -396,14 +396,6 @@ jlab.editableRowTable.updateSelectionCount = function () {
     $("#selected-count").text(numSelected);
     return numSelected;
 };
-$(document).on("click", "#expired-link", function () {
-    $("#expired-dialog").dialog("open");
-    return false;
-});
-$(document).on("click", "#expiring-link", function () {
-    $("#expiring-dialog").dialog("open");
-    return false;
-});
 $(function () {
     /*Custom time picker*/
     var myControl = {
diff --git a/src/main/webapp/resources/js/verifications.js b/src/main/webapp/resources/js/verifications.js
new file mode 100644
index 0000000..b2ff57d
--- /dev/null
+++ b/src/main/webapp/resources/js/verifications.js
@@ -0,0 +1,13 @@
+var jlab = jlab || {};
+$(document).on("click", "#expired-link", function () {
+    $("#expired-dialog").dialog("open");
+    return false;
+});
+$(document).on("click", "#expiring-link", function () {
+    $("#expiring-dialog").dialog("open");
+    return false;
+});
+$(document).on("click", ".default-clear-panel", function () {
+    $("#facility-select").val('');
+    return false;
+});
\ No newline at end of file

From dad4c8dd6af8ccba431b35a37880b562901f4c27 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 11:20:01 -0500
Subject: [PATCH 34/44] Separate Facilities

---
 .../jam/business/session/RFSegmentFacade.java | 16 +++-
 .../BeamDestinationInformation.java           | 58 ---------------
 .../controller/FacilityAuthorization.java     |  2 +-
 ...egmentsAuthorizationHistoryController.java |  2 +-
 .../controller/VerificationsController.java   |  8 +-
 .../inventory/ParticipationController.java    |  2 +-
 .../WEB-INF/tags/beam-operations-panel.tag    | 28 ++++---
 .../views/beam-destination-information.jsp    | 73 -------------------
 .../views/destination-verification.jsp        | 29 +-------
 .../webapp/WEB-INF/views/verifications.jsp    | 19 ++++-
 10 files changed, 54 insertions(+), 183 deletions(-)
 delete mode 100644 src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
 delete mode 100644 src/main/webapp/WEB-INF/views/beam-destination-information.jsp

diff --git a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
index 97ec999..8c89d71 100644
--- a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
@@ -29,25 +29,35 @@ public RFSegmentFacade() {
   }
 
   @PermitAll
-  public List<RFSegment> findByFacility(Facility facility) {
+  public List<RFSegment> filterList(Boolean active, Facility facility) {
     CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
     CriteriaQuery<RFSegment> cq = cb.createQuery(RFSegment.class);
     Root<RFSegment> root = cq.from(RFSegment.class);
 
     List<Predicate> filters = new ArrayList<>();
 
-    filters.add(cb.equal(root.get("facility"), facility));
+    if (facility != null) {
+      filters.add(cb.equal(root.get("facility"), facility));
+    }
 
-    filters.add(cb.equal(root.get("active"), true));
+    if (active != null) {
+      filters.add(cb.equal(root.get("active"), active));
+    }
 
     if (!filters.isEmpty()) {
       cq.where(cb.and(filters.toArray(new Predicate[] {})));
     }
 
     List<Order> orders = new ArrayList<>();
+
+    Path p1 = root.get("facility");
+    Order o1 = cb.asc(p1);
+    orders.add(o1);
+
     Path p0 = root.get("weight");
     Order o0 = cb.asc(p0);
     orders.add(o0);
+
     cq.orderBy(orders);
 
     cq.select(root);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java b/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
deleted file mode 100644
index 22926fd..0000000
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamDestinationInformation.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package org.jlab.jam.presentation.controller;
-
-import java.io.IOException;
-import java.math.BigInteger;
-import java.util.List;
-import javax.ejb.EJB;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import org.jlab.jam.business.session.BeamControlVerificationFacade;
-import org.jlab.jam.business.session.BeamDestinationFacade;
-import org.jlab.jam.persistence.entity.BeamControlVerification;
-import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.smoothness.presentation.util.ParamConverter;
-
-/**
- * @author ryans
- */
-@WebServlet(
-    name = "BeamDestinationInformation",
-    urlPatterns = {"/beam-destination-information"})
-public class BeamDestinationInformation extends HttpServlet {
-
-  @EJB BeamDestinationFacade beamDestinationFacade;
-  @EJB BeamControlVerificationFacade verificationFacade;
-
-  /**
-   * Handles the HTTP <code>GET</code> method.
-   *
-   * @param request servlet request
-   * @param response servlet response
-   * @throws ServletException if a servlet-specific error occurs
-   * @throws IOException if an I/O error occurs
-   */
-  @Override
-  protected void doGet(HttpServletRequest request, HttpServletResponse response)
-      throws ServletException, IOException {
-
-    BigInteger beamDestinationId = ParamConverter.convertBigInteger(request, "beamDestinationId");
-
-    BeamDestination beamDestination = null;
-    List<BeamControlVerification> verificationList = null;
-
-    if (beamDestinationId != null) {
-      beamDestination = beamDestinationFacade.find(beamDestinationId);
-      verificationList = verificationFacade.findByBeamDestination(beamDestinationId);
-    }
-
-    request.setAttribute("beamDestination", beamDestination);
-    request.setAttribute("verificationList", verificationList);
-
-    request
-        .getRequestDispatcher("WEB-INF/views/beam-destination-information.jsp")
-        .forward(request, response);
-  }
-}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 890a5e3..3191522 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -125,7 +125,7 @@ private void handleFacility(
     RFAuthorization rfAuthorization = rfAuthorizationFacade.findCurrent();
     BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
-    List<RFSegment> rfList = rfSegmentFacade.findByFacility(facility);
+    List<RFSegment> rfList = rfSegmentFacade.filterList(true, facility);
     List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
 
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
index 876c491..6db8d6c 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
@@ -50,7 +50,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     // authorization,
     // it would be better to grab list of destinations and segments that existed at time of
     // authorization.
-    List<RFSegment> rfList = rfSegmentFacade.findByFacility(facility);
+    List<RFSegment> rfList = rfSegmentFacade.filterList(true, facility);
 
     Map<BigInteger, RFSegmentAuthorization> segmentAuthorizationMap =
         rfAuthorizationFacade.createSegmentAuthorizationMap(rfAuthorization);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
index 29afc58..99b8575 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
@@ -11,10 +11,7 @@
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.*;
 import org.jlab.jam.business.session.AbstractFacade.OrderDirective;
-import org.jlab.jam.persistence.entity.BeamControlVerification;
-import org.jlab.jam.persistence.entity.BeamDestination;
-import org.jlab.jam.persistence.entity.CreditedControl;
-import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.jam.persistence.entity.*;
 import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
@@ -27,6 +24,7 @@ public class VerificationsController extends HttpServlet {
 
   @EJB CreditedControlFacade ccFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
+  @EJB RFSegmentFacade segmentFacade;
   @EJB BeamDestinationFacade destinationFacade;
   @EJB FacilityFacade facilityFacade;
 
@@ -63,6 +61,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
 
     List<CreditedControl> ccList = ccFacade.findAll(new OrderDirective("weight"));
 
+    List<RFSegment> segmentList = segmentFacade.filterList(true, facility);
     List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
 
     List<Facility> facilityList = facilityFacade.findAll(new OrderDirective("weight"));
@@ -76,6 +75,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("facility", facility);
     request.setAttribute("selectionMessage", selectionMessage);
     request.setAttribute("facilityList", facilityList);
+    request.setAttribute("segmentList", segmentList);
     request.setAttribute("destinationList", destinationList);
     request.setAttribute("adminOrLeader", adminOrLeader);
     request.setAttribute("ccList", ccList);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
index 47e4269..d52ab0a 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
@@ -54,7 +54,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
         throw new ServletException("Facility not found");
       }
 
-      List<RFSegment> segmentList = segmentFacade.findByFacility(facility);
+      List<RFSegment> segmentList = segmentFacade.filterList(true, facility);
       List<BeamDestination> destinationList = destinationFacade.findByFacility(facility);
       List<CreditedControl> ccList = ccFacade.findAllWithVerificationList();
 
diff --git a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
index 7e975bf..739c1fb 100644
--- a/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/beam-operations-panel.tag
@@ -31,7 +31,7 @@
             <c:set var="beamDestinationAuthorization" value="${destinationAuthorizationMap[destination.beamDestinationId]}"/>
             <c:set var="units" value="${unitsMap[destination.beamDestinationId] ne null ? unitsMap[destination.beamDestinationId] : 'uA'}"/>
             <tr>
-                <td><a data-dialog-title="${destination.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${destination.beamDestinationId}"><c:out value="${destination.name}"/></a></td>
+                <td><a data-dialog-title="${destination.name} Verification" class="dialog-ready" href="${pageContext.request.contextPath}/verifications/destination?destinationId=${destination.beamDestinationId}&notEditable=Y"><c:out value="${destination.name}"/></a></td>
                     <c:if test="${not isHistory}">
                     <td class="icon-cell">
                         <c:choose>
@@ -101,20 +101,18 @@
                 </td>
                 <c:if test="${not isHistory}">
                     <td class="icon-cell">
-                        <a data-dialog-title="${destination.name} Information" class="dialog-ready" href="${pageContext.request.contextPath}/beam-destination-information?beamDestinationId=${destination.beamDestinationId}">
-                            <c:choose>
-                                <c:when test="${destination.verification.verificationStatusId eq 1}">
-                                    <span title="Verified" class="small-icon verified-icon"></span>
-                                </c:when>
-                                <c:when test="${destination.verification.verificationStatusId eq 50}">
-                                    <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
-                                </c:when>
-                                <c:otherwise>
-                                    <span title="Not Verified" class="small-icon not-verified-icon"></span>
-                                </c:otherwise>
-                            </c:choose>
-                            <span class="expiring-soon" style="<c:out value="${destination.verification.expirationDate ne null and destination.verification.expirationDate.time > beamauth:now().time and destination.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>                                    
-                        </a>
+                        <c:choose>
+                            <c:when test="${destination.verification.verificationStatusId eq 1}">
+                                <span title="Verified" class="small-icon verified-icon"></span>
+                            </c:when>
+                            <c:when test="${destination.verification.verificationStatusId eq 50}">
+                                <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
+                            </c:when>
+                            <c:otherwise>
+                                <span title="Not Verified" class="small-icon not-verified-icon"></span>
+                            </c:otherwise>
+                        </c:choose>
+                        <span class="expiring-soon" style="<c:out value="${destination.verification.expirationDate ne null and destination.verification.expirationDate.time > beamauth:now().time and destination.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
                     </td>
                 </c:if>
             </tr>
diff --git a/src/main/webapp/WEB-INF/views/beam-destination-information.jsp b/src/main/webapp/WEB-INF/views/beam-destination-information.jsp
deleted file mode 100644
index 03395ce..0000000
--- a/src/main/webapp/WEB-INF/views/beam-destination-information.jsp
+++ /dev/null
@@ -1,73 +0,0 @@
-<%@page contentType="text/html" pageEncoding="UTF-8"%>
-<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
-<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
-<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
-<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Beam Destination Information: ${beamDestination.name}">
-    <jsp:attribute name="stylesheets">
-        <style type="text/css">
-        </style>
-    </jsp:attribute>
-    <jsp:attribute name="scripts">       
-    </jsp:attribute>        
-    <jsp:body>
-        <section>
-            <h2>${beamDestination.name} Information</h2>
-            <div class="dialog-content">
-                <h3>
-                    <c:choose>
-                        <c:when test="${beamDestination.verification.verificationStatusId eq 1}">
-                            <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
-                        </c:when>
-                        <c:when test="${beamDestination.verification.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>  
-                    <a href="${pageContext.request.contextPath}/destinations?destinationId=${beamDestination.beamDestinationId}"><c:out value="${beamDestination.name}"/></a> Credited Control Status
-                </h3>
-                <c:choose>
-                    <c:when test="${fn:length(verificationList) > 0}">
-                        <table class="data-table stripped-table">
-                            <thead>
-                                <tr>
-                                    <th>Credited Control</th>
-                                    <th>Status</th>
-                                    <th>Expiration Date</th>
-                                </tr>
-                            </thead>
-                            <tbody>
-                                <c:forEach items="${verificationList}" var="verification">
-                                    <tr>
-                                        <td><a href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${verification.creditedControl.creditedControlId}"><c:out value="${verification.creditedControl.name}"/></a></td>
-                                        <td class="icon-cell">
-                                            <c:choose>
-                                                <c:when test="${verification.verificationStatusId eq 1}">
-                                                    <span title="Verified" class="small-icon verified-icon"></span>
-                                                </c:when>
-                                                <c:when test="${verification.verificationStatusId eq 50}">
-                                                    <span title="Provisionally Verified" class="small-icon provisional-icon"></span>
-                                                </c:when>
-                                                <c:otherwise>
-                                                    <span title="Not Verified" class="small-icon not-verified-icon"></span>
-                                                </c:otherwise>
-                                            </c:choose>                                
-                                        </td>           
-                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/><span class="expiring-soon" style="<c:out value="${verification.expirationDate ne null and verification.expirationDate.time > beamauth:now().time and verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span></td>
-                                    </tr>
-                                </c:forEach> 
-                            </tbody>
-                        </table>                        
-                    </c:when>
-                    <c:otherwise>
-                        <div class="message-box">No Credited Controls Required</div>
-                    </c:otherwise>
-                </c:choose>
-            </div>
-        </section>
-    </jsp:body>         
-</t:page>
diff --git a/src/main/webapp/WEB-INF/views/destination-verification.jsp b/src/main/webapp/WEB-INF/views/destination-verification.jsp
index 976af49..7fbd1a5 100644
--- a/src/main/webapp/WEB-INF/views/destination-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/destination-verification.jsp
@@ -51,17 +51,17 @@
                     <div class="dialog-content">
                         <h3>
                             <c:choose>
-                                <c:when test="${beamDestination.verification.verificationStatusId eq 1}">
+                                <c:when test="${destination.verification.verificationStatusId eq 1}">
                                     <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
                                 </c:when>
-                                <c:when test="${beamDestination.verification.verificationStatusId eq 50}">
+                                <c:when test="${destination.verification.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="${beamDestination.name}"/> Credited Control Verifications
+                            Credited Control Verifications
                         </h3>
                         <c:choose>
                             <c:when test="${fn:length(destination.beamControlVerificationList) < 1}">
@@ -120,28 +120,7 @@
                     </div>
                 </c:when>
                 <c:otherwise>                   
-                    <h2>Beam Destinations</h2>
-                    <table class="data-table stripped-table">
-                        <thead>
-                            <tr>
-                                <th>Select</th>
-                                <th>Name</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <c:forEach items="${destinationList}" var="destination">
-                                <tr data-destination-id="${destination.beamDestinationId}">
-                                    <td>
-                                        <form method="get" action="destinations">
-                                            <input type="hidden" name="destinationId" value="${destination.beamDestinationId}"/>
-                                            <button class="single-char-button" type="submit">&rarr;</button>
-                                        </form>
-                                    </td>
-                                    <td><c:out value="${destination.name}"/></td>
-                                </tr>
-                            </c:forEach>
-                        </tbody>
-                    </table>                              
+                    Choose a Beam Destination to continue
                 </c:otherwise>
             </c:choose>
             <div id="verify-dialog" class="dialog" title="Edit Credited Control Verification">
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index b778f4e..bd859a9 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -65,10 +65,24 @@
             <tbody>
             <c:forEach items="${segmentList}" var="segment">
                 <tr>
-                    <td><c:out value="${segment.name}"/></td>
+                    <td>
+                        <c:choose>
+                            <c:when test="${segment.verification.verificationStatusId eq 1}">
+                                <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
+                            </c:when>
+                            <c:when test="${segment.verification.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="${segment.name}"/>
+                    </td>
+                    <td><c:out value="${segment.facility.name}"/></td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/segment">
-                            <input type="hidden" name="rfSegmentId" value="${segment.rfSegmentId}"/>
+                            <input type="hidden" name="rfSegmentId" value="${segment.getRFSegmentId()}"/>
                             <button class="single-char-button" type="submit">&rarr;</button>
                         </form>
                     </td>
@@ -95,6 +109,7 @@
                         </c:choose>
                         <c:out value="${destination.name}"/>
                     </td>
+                    <td><c:out value="${destination.facility.name}"/></td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/destination">
                             <input type="hidden" name="destinationId" value="${destination.beamDestinationId}"/>

From 05d9122020f89e05fbc8602a7aa7d8151e038fb8 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 12:05:37 -0500
Subject: [PATCH 35/44] Separate Facilities

---
 .../session/BeamDestinationFacade.java        |  63 ++----
 .../jam/business/session/RFSegmentFacade.java |  39 +++-
 .../controller/DestinationVerification.java   |   2 +-
 ...nationsAuthorizationHistoryController.java |   2 +-
 .../controller/FacilityAuthorization.java     |   2 +-
 .../controller/SegmentVerification.java       |  60 ++++++
 .../controller/VerificationsController.java   |   2 +-
 .../inventory/ParticipationController.java    |   2 +-
 .../WEB-INF/tags/rf-operations-panel.tag      |   2 +-
 .../WEB-INF/views/segment-verification.jsp    | 191 ++++++++++++++++++
 .../webapp/WEB-INF/views/verifications.jsp    |   2 +-
 11 files changed, 309 insertions(+), 58 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java
 create mode 100644 src/main/webapp/WEB-INF/views/segment-verification.jsp

diff --git a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
index 2b1f07d..a0743fe 100644
--- a/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamDestinationFacade.java
@@ -9,7 +9,6 @@
 import javax.ejb.Stateless;
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.*;
 import org.jlab.jam.persistence.entity.BeamControlVerification;
@@ -33,50 +32,6 @@ public BeamDestinationFacade() {
     super(BeamDestination.class);
   }
 
-  @SuppressWarnings("unchecked")
-  @PermitAll
-  public List<BeamDestination> findActiveDestinations() {
-    Query q =
-        em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where ACTIVE_YN = 'Y' order by weight",
-            BeamDestination.class);
-
-    return q.getResultList();
-  }
-
-  @SuppressWarnings("unchecked")
-  @PermitAll
-  public List<BeamDestination> findCebafDestinations() {
-    Query q =
-        em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where FACILITY_ID = 1 and ACTIVE_YN = 'Y' order by weight",
-            BeamDestination.class);
-
-    return q.getResultList();
-  }
-
-  @SuppressWarnings("unchecked")
-  @PermitAll
-  public List<BeamDestination> findLerfDestinations() {
-    Query q =
-        em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where facility_id = 2 and ACTIVE_YN = 'Y' order by weight",
-            BeamDestination.class);
-
-    return q.getResultList();
-  }
-
-  @SuppressWarnings("unchecked")
-  @PermitAll
-  public List<BeamDestination> findUitfDestinations() {
-    Query q =
-        em.createNativeQuery(
-            "select * from JAM_OWNER.beam_destination where facility_id = 3 and ACTIVE_YN = 'Y' order by weight",
-            BeamDestination.class);
-
-    return q.getResultList();
-  }
-
   @PermitAll
   public BeamDestination findWithVerificationList(BigInteger destinationId) {
     TypedQuery<BeamDestination> q =
@@ -112,25 +67,35 @@ public int compare(BeamControlVerification o1, BeamControlVerification o2) {
   }
 
   @PermitAll
-  public List<BeamDestination> findByFacility(Facility facility) {
+  public List<BeamDestination> filterList(Boolean active, Facility facility) {
     CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
     CriteriaQuery<BeamDestination> cq = cb.createQuery(BeamDestination.class);
     Root<BeamDestination> root = cq.from(BeamDestination.class);
 
     List<Predicate> filters = new ArrayList<>();
 
-    filters.add(cb.equal(root.get("facility"), facility));
+    if (active != null) {
+      filters.add(cb.equal(root.get("active"), active));
+    }
 
-    filters.add(cb.equal(root.get("active"), true));
+    if (facility != null) {
+      filters.add(cb.equal(root.get("facility"), facility));
+    }
 
     if (!filters.isEmpty()) {
       cq.where(cb.and(filters.toArray(new Predicate[] {})));
     }
 
     List<Order> orders = new ArrayList<>();
-    Path p0 = root.get("weight");
+
+    Path p0 = root.get("facility");
     Order o0 = cb.asc(p0);
     orders.add(o0);
+
+    Path p1 = root.get("weight");
+    Order o1 = cb.asc(p1);
+    orders.add(o1);
+
     cq.orderBy(orders);
 
     cq.select(root);
diff --git a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
index 8c89d71..f461d87 100644
--- a/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/RFSegmentFacade.java
@@ -1,6 +1,9 @@
 package org.jlab.jam.business.session;
 
+import java.math.BigInteger;
 import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import javax.annotation.security.PermitAll;
 import javax.ejb.Stateless;
@@ -8,8 +11,7 @@
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
 import javax.persistence.criteria.*;
-import org.jlab.jam.persistence.entity.Facility;
-import org.jlab.jam.persistence.entity.RFSegment;
+import org.jlab.jam.persistence.entity.*;
 
 /**
  * @author ryans
@@ -28,6 +30,39 @@ public RFSegmentFacade() {
     super(RFSegment.class);
   }
 
+  @PermitAll
+  public RFSegment findWithVerificationList(BigInteger segmentId) {
+    TypedQuery<RFSegment> q =
+        em.createQuery(
+            "select a from RFSegment a where a.rfSegmentId = :segmentId", RFSegment.class);
+
+    q.setParameter("segmentId", segmentId);
+
+    List<RFSegment> segmentList = q.getResultList();
+
+    RFSegment segment = null;
+
+    if (segmentList != null && !segmentList.isEmpty()) {
+      segment = segmentList.get(0);
+
+      // JPAUtil.initialize(destination.getControlVerificationList());
+      for (RFControlVerification verification : segment.getRFControlVerificationList()) {
+        verification.getCreditedControl().getName();
+      }
+
+      Collections.sort(
+          segment.getRFControlVerificationList(),
+          new Comparator<RFControlVerification>() {
+            @Override
+            public int compare(RFControlVerification o1, RFControlVerification o2) {
+              return o1.getCreditedControl().compareTo(o2.getCreditedControl());
+            }
+          });
+    }
+
+    return segment;
+  }
+
   @PermitAll
   public List<RFSegment> filterList(Boolean active, Facility facility) {
     CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
index 84dee28..d5e55f9 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerification.java
@@ -47,7 +47,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       // creditedControl.getWorkgroup().getWorkgroupId());
     }
 
-    List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
+    List<BeamDestination> destinationList = destinationFacade.filterList(true, null);
 
     request.setAttribute("destinationList", destinationList);
     request.setAttribute("adminOrLeader", adminOrLeader);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index 93f781a..5482b8d 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -51,7 +51,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     // authorization,
     // it would be better to grab list of destinations and segments that existed at time of
     // authorization.
-    List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
+    List<BeamDestination> beamList = beamDestinationFacade.filterList(true, facility);
 
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
         beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
index 3191522..50533c5 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/FacilityAuthorization.java
@@ -126,7 +126,7 @@ private void handleFacility(
     BeamAuthorization beamAuthorization = beamAuthorizationFacade.findCurrent();
 
     List<RFSegment> rfList = rfSegmentFacade.filterList(true, facility);
-    List<BeamDestination> beamList = beamDestinationFacade.findByFacility(facility);
+    List<BeamDestination> beamList = beamDestinationFacade.filterList(true, facility);
 
     Map<BigInteger, BeamDestinationAuthorization> destinationAuthorizationMap =
         beamAuthorizationFacade.createDestinationAuthorizationMap(beamAuthorization);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java
new file mode 100644
index 0000000..e7d5851
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerification.java
@@ -0,0 +1,60 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.RFSegmentFacade;
+import org.jlab.jam.persistence.entity.RFSegment;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "SegmentVerification",
+    urlPatterns = {"/verifications/segment"})
+public class SegmentVerification extends HttpServlet {
+
+  @EJB RFSegmentFacade segmentFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    BigInteger segmentId = ParamConverter.convertBigInteger(request, "segmentId");
+
+    RFSegment segment = null;
+    boolean adminOrLeader = false;
+
+    if (segmentId != null) {
+      segment = segmentFacade.findWithVerificationList(segmentId);
+      adminOrLeader = request.getRemoteUser() != null;
+      // adminOrLeader = ccFacade.isAdminOrGroupLeader(request.getRemoteUser(),
+      // creditedControl.getWorkgroup().getWorkgroupId());
+    }
+
+    List<RFSegment> segmentList = segmentFacade.filterList(true, null);
+
+    request.setAttribute("segmentList", segmentList);
+    request.setAttribute("adminOrLeader", adminOrLeader);
+    request.setAttribute("segment", segment);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/segment-verification.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
index 99b8575..825f2a9 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
@@ -62,7 +62,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     List<CreditedControl> ccList = ccFacade.findAll(new OrderDirective("weight"));
 
     List<RFSegment> segmentList = segmentFacade.filterList(true, facility);
-    List<BeamDestination> destinationList = destinationFacade.findActiveDestinations();
+    List<BeamDestination> destinationList = destinationFacade.filterList(true, facility);
 
     List<Facility> facilityList = facilityFacade.findAll(new OrderDirective("weight"));
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
index d52ab0a..f428c36 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ParticipationController.java
@@ -55,7 +55,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       }
 
       List<RFSegment> segmentList = segmentFacade.filterList(true, facility);
-      List<BeamDestination> destinationList = destinationFacade.findByFacility(facility);
+      List<BeamDestination> destinationList = destinationFacade.filterList(true, facility);
       List<CreditedControl> ccList = ccFacade.findAllWithVerificationList();
 
       request.setAttribute("facility", facility);
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
index 986a6fb..75d8df6 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
@@ -30,7 +30,7 @@
             <c:set var="rfSegmentAuthorization" value="${rfAuthorizationMap[segment.getRFSegmentId()]}"/>
             <tr>
                 <td>
-                    <c:out value="${segment.name}"/>
+                    <a data-dialog-title="${segment.name} Verification" class="dialog-ready" href="${pageContext.request.contextPath}/verifications/segment?segmentId=${segment.getRFSegmentId()}&notEditable=Y"><c:out value="${segment.name}"/></a>
                     <input type="hidden" name="rfSegmentId[]" value="${segment.getRFSegmentId()}"/>
                 </td>
                     <c:if test="${not isHistory}">
diff --git a/src/main/webapp/WEB-INF/views/segment-verification.jsp b/src/main/webapp/WEB-INF/views/segment-verification.jsp
new file mode 100644
index 0000000..55b3b34
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/segment-verification.jsp
@@ -0,0 +1,191 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%>
+<c:set var="title" value="Segment Verification"/>
+<t:page title="${title}">
+    <jsp:attribute name="stylesheets">
+        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/control-verification.css"/>
+        <style type="text/css">
+            .dialog-content {
+                padding-bottom: 1em;
+            }
+            .dialog-content button {
+                font-size: 14px;
+            }
+        </style>
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+        <script type="text/javascript">
+            jlab = jlab || {};
+            jlab.verificationType = 'Control-Group';
+        </script>
+        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/control-verification.js"></script>
+    </jsp:attribute>        
+    <jsp:body>
+        <c:if test="${segment ne null}">
+            <div class="banner-breadbox">
+                <ul>
+                    <li>
+                        <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
+                    </li>
+                    <li>
+                        <form method="get" action="segment">
+                            <select name="segmentId" class="change-submit">
+                                <c:forEach items="${segmentList}" var="segment">
+                                    <option value="${segment.getRFSegmentId()}"${param.segmentId eq segment.getRFSegmentId() ? ' selected="selected"' : ''}><c:out value="${segment.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </form>
+                    </li>
+                </ul>
+            </div>
+        </c:if>
+        <section>
+            <h2><c:out value="${title}${empty segment ? '' : ': '.concat(segment.name)}"/></h2>
+            <c:choose>
+                <c:when test="${segment ne null}">
+                    <div class="dialog-content">
+                        <h3>
+                            <c:choose>
+                                <c:when test="${segment.verification.verificationStatusId eq 1}">
+                                    <span title="Verified" class="small-icon baseline-small-icon verified-icon"></span>
+                                </c:when>
+                                <c:when test="${segment.verification.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>
+                            Credited Control Verifications
+                        </h3>
+                        <c:choose>
+                            <c:when test="${fn:length(segment.getRFControlVerificationList()) < 1}">
+                                <div class="message-box">None</div>
+                            </c:when>
+                            <c:otherwise>
+                                <c:if test="${adminOrLeader && param.notEditable eq null}">
+                                    <button id="edit-selected-button" type="button" class="verify-button selected-row-action" disabled="disabled">Edit Selected</button>
+                                </c:if>
+                                <table id="verification-table" class="data-table stripped-table${(adminOrLeader && param.notEditable eq null) ? ' multicheck-table editable-row-table' : ''}">
+                                    <thead>
+                                        <tr>
+                                            <c:if test="${adminOrLeader && param.notEditable eq null}">
+                                                <th>
+                                                    Select
+                                                    <select id="check-select" name="check-select">
+                                                        <option value="">&nbsp;</option>
+                                                        <option value="all">All</option>
+                                                        <option value="none">None</option>
+                                                    </select>
+                                                </th>
+                                            </c:if>
+                                            <th>Credited Control and Group</th>
+                                            <th>Verified</th>
+                                            <th>Verified Date</th>
+                                            <th>Verified By</th>
+                                            <th>Comments</th>
+                                            <th>Expiration Date</th>
+                                            <th></th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <c:forEach items="${segment.getRFControlVerificationList()}" var="verification">
+                                            <tr data-control-verification-id="${verification.getRFControlVerificationId()}" data-verified-username="${verification.verifiedBy}" data-status-id="${verification.verificationStatusId}">
+                                                <c:if test="${adminOrLeader && param.notEditable eq null}">
+                                                    <td>
+                                                        <input class="segment-checkbox" type="checkbox" name="segment-checkbox" value="${verification.getRFControlVerificationId()}"/>
+                                                    </td>
+                                                </c:if>
+                                                <td><c:out value="${verification.creditedControl.name}"/>; <c:out value="${verification.creditedControl.group.name}"/></td>
+                                                <td class="icon-cell"><span 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')}"></span></td>
+                                                <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.verificationDate}"/></td>
+                                                <td><c:out value="${s:formatUsername(verification.verifiedBy)}"/></td>
+                                                <td><c:out value="${verification.comments}"/></td>
+                                                <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
+                                                <td><a class="small-icon dialog-ready comment-icon" data-dialog-title="Verification History" href="credited-controls/verification-history?rfControlVerificationId=${verification.getRFControlVerificationId()}" title="Click for verification history"></a></td>
+                                            </tr>
+                                        </c:forEach>
+                                    </tbody>
+                                </table>
+                                <c:if test="${adminOrLeader && param.notEditable eq null}">
+                                    <div id="multi-instructions">Hold down the control (Ctrl) or shift key when clicking to select multiple.  Hold down the Command (⌘) key on Mac.</div> 
+                                </c:if>
+                            </c:otherwise>
+                        </c:choose>
+                    </div>
+                </c:when>
+                <c:otherwise>                   
+                    Choose an RF Segment to continue
+                </c:otherwise>
+            </c:choose>
+            <div id="verify-dialog" class="dialog" title="Edit Credited Control Verification">
+                <form>
+                    <ul class="key-value-list">
+                        <li>
+                            <div class="li-key"><span id="edit-dialog-verification-label">Beam Destinations</span>:</div>
+                            <div class="li-value">
+                                <ul id="selected-verification-list">
+
+                                </ul>
+                                <span id="edit-dialog-verification-count"></span>
+                            </div>
+                        </li>                    
+                        <li>
+                            <div class="li-key">Status:</div>
+                            <div class="li-value">
+                                <select id="verificationId" name="verificationId">
+                                    <option value="&nbsp;"> </option>
+                                    <option value="100">Not Verified</option>
+                                    <option value="50">Provisionally Verified</option>
+                                    <option value="1">Verified</option>
+                                </select>
+                            </div>
+                        </li>      
+                        <li>
+                            <div class="li-key">Verification Date:</div>
+                            <div class="li-value">
+                                <input id="verificationDate" name="verificationDate" type="text" class="date-time-field nowable-field" placeholder="${s:getFriendlyDateTimePlaceholder()}"/>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="li-key">Verified By:</div>
+                            <div class="li-value">
+                                <input id="verifiedBy" name="verifiedBy" type="text" placeholder="username" class="username-autocomplete" maxlength="64"/>
+                                <button class="me-button" type="button">Me</button>
+                            </div>
+                        </li>                        
+                        <li>
+                            <div class="li-key">Expiration Date:</div>
+                            <div class="li-value">
+                                <input id="expirationDate" name="expirationDate" type="text" class="date-time-field" placeholder="${s:getFriendlyDateTimePlaceholder()}"/>
+                            </div>
+                        </li>
+                        <li>
+                            <div class="li-key">Comments:</div>
+                            <div class="li-value">
+                                <textarea id="comments" name="comments"></textarea>
+                            </div>
+                        </li>                    
+                    </ul>
+                    <input type="hidden" id="creditedControlId" name="creditedControlId"/>
+                    <div class="dialog-button-panel">
+                        <span id="rows-differ-message">Note: One or more selected rows existing values differ</span>
+                        <button id="verifySaveButton" class="dialog-submit ajax-button" type="button">Save</button>
+                        <button class="dialog-close-button" type="button">Cancel</button>
+                    </div>
+                </form>
+            </div>
+        </section>
+        <div id="success-dialog" class="dialog" title="Verification Saved Successfully">
+            <span class="logentry-success">Verification contained downgrade so a new log entry was created: <a id="new-entry-url" href="#"></a></span>
+            <div class="dialog-button-panel">
+                <button class="dialog-close-button" type="button">OK</button>
+            </div>
+        </div>        
+    </jsp:body>         
+</t:page>
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index bd859a9..aa048de 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -82,7 +82,7 @@
                     <td><c:out value="${segment.facility.name}"/></td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/segment">
-                            <input type="hidden" name="rfSegmentId" value="${segment.getRFSegmentId()}"/>
+                            <input type="hidden" name="segmentId" value="${segment.getRFSegmentId()}"/>
                             <button class="single-char-button" type="submit">&rarr;</button>
                         </form>
                     </td>

From 2177c3575e02ed2a447c6e223d67eb45d0673a96 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 13:13:21 -0500
Subject: [PATCH 36/44] Separate Facilities

---
 .../session/CreditedControlFacade.java        | 66 ++++++++++++++++
 .../persistence/entity/CreditedControl.java   | 20 +++--
 .../jlab/jam/persistence/entity/Facility.java |  8 +-
 .../view/FacilityControlVerification.java     | 20 ++---
 .../view/FacilityControlVerificationPK.java   | 75 +++++++++++++++++++
 .../controller/VerificationsController.java   |  2 +-
 .../WEB-INF/views/inventory/authorizers.jsp   |  2 -
 .../WEB-INF/views/inventory/controls.jsp      |  2 -
 .../WEB-INF/views/inventory/destinations.jsp  |  2 -
 .../WEB-INF/views/inventory/facilities.jsp    |  2 -
 .../WEB-INF/views/inventory/participation.jsp | 10 +--
 .../WEB-INF/views/inventory/segments.jsp      |  2 -
 .../WEB-INF/views/inventory/verifiers.jsp     |  2 -
 .../webapp/WEB-INF/views/verifications.jsp    | 22 +++++-
 .../webapp/resources/css/verifications.css    |  5 ++
 15 files changed, 195 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java

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 051d766..eb70f28 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -1,7 +1,9 @@
 package org.jlab.jam.business.session;
 
 import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 import javax.annotation.security.PermitAll;
 import javax.annotation.security.RolesAllowed;
@@ -9,7 +11,10 @@
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceContext;
 import javax.persistence.TypedQuery;
+import javax.persistence.criteria.*;
 import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.jam.persistence.entity.Facility;
+import org.jlab.jam.persistence.view.FacilityControlVerification;
 import org.jlab.smoothness.persistence.util.JPAUtil;
 
 /**
@@ -78,4 +83,65 @@ public void updateComments(BigInteger creditedControlId, String comments) {
 
     control.setComments(comments);
   }
+
+  @PermitAll
+  public List<CreditedControl> filterList(Facility facility) {
+    CriteriaBuilder cb = getEntityManager().getCriteriaBuilder();
+    CriteriaQuery<CreditedControl> cq = cb.createQuery(CreditedControl.class);
+    Root<CreditedControl> root = cq.from(CreditedControl.class);
+
+    List<Order> orders = new ArrayList<>();
+    List<Predicate> filters = new ArrayList<>();
+
+    if (facility != null) {
+      Join<CreditedControl, FacilityControlVerification> facilityControlVerificationJoin =
+          root.join("facilityControlVerificationList");
+
+      filters.add(
+          cb.equal(
+              facilityControlVerificationJoin.get("facilityControlVerificationPK").get("facility"),
+              facility));
+
+      Path p1 =
+          facilityControlVerificationJoin.get("facilityControlVerificationPK").get("facility");
+      Order o1 = cb.asc(p1);
+      orders.add(o1);
+    }
+
+    if (!filters.isEmpty()) {
+      cq.where(cb.and(filters.toArray(new Predicate[] {})));
+    }
+
+    Path p0 = root.get("weight");
+    Order o0 = cb.asc(p0);
+    orders.add(o0);
+
+    cq.orderBy(orders);
+
+    cq.select(root);
+    TypedQuery<CreditedControl> q = getEntityManager().createQuery(cq);
+
+    return q.getResultList();
+  }
+
+  @PermitAll
+  public List<CreditedControl> findWithFacilityVerification(Facility facility) {
+    List<CreditedControl> ccList = filterList(facility);
+
+    if (ccList != null) {
+      for (CreditedControl cc : ccList) {
+        Collections.sort(
+            cc.getFacilityControlVerificationList(),
+            new Comparator<FacilityControlVerification>() {
+              @Override
+              public int compare(FacilityControlVerification o1, FacilityControlVerification o2) {
+                return o1.getFacilityControlVerificationPK()
+                    .compareTo(o2.getFacilityControlVerificationPK());
+              }
+            });
+      }
+    }
+
+    return ccList;
+  }
 }
diff --git a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
index 7cb22de..cfb31b2 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/CreditedControl.java
@@ -3,19 +3,10 @@
 import java.io.Serializable;
 import java.math.BigInteger;
 import java.util.List;
-import javax.persistence.Basic;
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.FetchType;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Table;
+import javax.persistence.*;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
+import org.jlab.jam.persistence.view.FacilityControlVerification;
 
 /**
  * @author ryans
@@ -66,6 +57,9 @@ public class CreditedControl implements Serializable, Comparable<CreditedControl
   @OneToMany(mappedBy = "creditedControl", fetch = FetchType.LAZY)
   private List<RFControlVerification> rfControlVerificationList;
 
+  @OneToMany(mappedBy = "facilityControlVerificationPK.creditedControl", fetch = FetchType.LAZY)
+  private List<FacilityControlVerification> facilityControlVerificationList;
+
   public CreditedControl() {}
 
   public CreditedControl(BigInteger creditedControlId) {
@@ -145,6 +139,10 @@ public void setBeamControlVerificationList(
     this.beamControlVerificationList = beamControlVerificationList;
   }
 
+  public List<FacilityControlVerification> getFacilityControlVerificationList() {
+    return facilityControlVerificationList;
+  }
+
   public boolean hasRFSegment(RFSegment segment) {
     boolean hasSegment = false;
     if (beamControlVerificationList != null) {
diff --git a/src/main/java/org/jlab/jam/persistence/entity/Facility.java b/src/main/java/org/jlab/jam/persistence/entity/Facility.java
index 01874d8..7a909fe 100644
--- a/src/main/java/org/jlab/jam/persistence/entity/Facility.java
+++ b/src/main/java/org/jlab/jam/persistence/entity/Facility.java
@@ -12,7 +12,7 @@
  */
 @Entity
 @Table(name = "FACILITY", schema = "JAM_OWNER")
-public class Facility implements Serializable {
+public class Facility implements Serializable, Comparable<Facility> {
   private static final long serialVersionUID = 1L;
 
   @Id
@@ -114,4 +114,10 @@ public boolean equals(Object obj) {
     final Facility other = (Facility) obj;
     return Objects.equals(this.facilityId, other.facilityId);
   }
+
+  @Override
+  public int compareTo(Facility o) {
+    return (this.getWeight() == null ? BigInteger.ZERO : this.getWeight())
+        .compareTo(o.getWeight() == null ? BigInteger.ZERO : o.getWeight());
+  }
 }
diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
index 6375215..146f559 100644
--- a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
+++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
@@ -1,10 +1,8 @@
 package org.jlab.jam.persistence.view;
 
 import java.io.Serializable;
-import java.math.BigInteger;
 import java.util.Date;
 import javax.persistence.*;
-import javax.validation.constraints.NotNull;
 
 /**
  * @author ryans
@@ -15,14 +13,7 @@ public class FacilityControlVerification implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
-  @Id
-  @Basic(optional = false)
-  @NotNull
-  @Column(name = "FACILITY_ID", nullable = false)
-  private BigInteger facilityId;
-
-  @Column(name = "CREDITED_CONTROL_ID")
-  private BigInteger creditedControlId;
+  @EmbeddedId protected FacilityControlVerificationPK facilityControlVerificationPK;
 
   @Column(name = "VERIFICATION_STATUS_ID")
   private Integer verificationStatusId;
@@ -33,12 +24,13 @@ public class FacilityControlVerification implements Serializable {
 
   public FacilityControlVerification() {}
 
-  public BigInteger getFacilityId() {
-    return facilityId;
+  public FacilityControlVerificationPK getFacilityControlVerificationPK() {
+    return facilityControlVerificationPK;
   }
 
-  public BigInteger getCreditedControlId() {
-    return creditedControlId;
+  public void setFacilityControlVerificationPK(
+      FacilityControlVerificationPK facilityControlVerificationPK) {
+    this.facilityControlVerificationPK = facilityControlVerificationPK;
   }
 
   public Integer getVerificationStatusId() {
diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java
new file mode 100644
index 0000000..266ed19
--- /dev/null
+++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerificationPK.java
@@ -0,0 +1,75 @@
+package org.jlab.jam.persistence.view;
+
+import java.io.Serializable;
+import java.util.Objects;
+import javax.persistence.*;
+import javax.validation.constraints.NotNull;
+import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.jam.persistence.entity.Facility;
+
+/**
+ * @author ryans
+ */
+@Embeddable
+public class FacilityControlVerificationPK
+    implements Serializable, Comparable<FacilityControlVerificationPK> {
+  @NotNull
+  @ManyToOne
+  @JoinColumn(name = "FACILITY_ID", referencedColumnName = "FACILITY_ID", nullable = false)
+  private Facility facility;
+
+  @NotNull
+  @ManyToOne
+  @JoinColumn(
+      name = "CREDITED_CONTROL_ID",
+      referencedColumnName = "CREDITED_CONTROL_ID",
+      nullable = false)
+  private CreditedControl creditedControl;
+
+  public FacilityControlVerificationPK() {}
+
+  public FacilityControlVerificationPK(Facility facility, CreditedControl creditedControl) {
+    this.facility = facility;
+    this.creditedControl = creditedControl;
+  }
+
+  public Facility getFacility() {
+    return facility;
+  }
+
+  public void setFacility(Facility facility) {
+    this.facility = facility;
+  }
+
+  public CreditedControl getCreditedControl() {
+    return creditedControl;
+  }
+
+  public void setCreditedControl(CreditedControl creditedControl) {
+    this.creditedControl = creditedControl;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (!(o instanceof FacilityControlVerificationPK)) return false;
+    FacilityControlVerificationPK that = (FacilityControlVerificationPK) o;
+    return Objects.equals(facility, that.facility)
+        && Objects.equals(creditedControl, that.creditedControl);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(facility, creditedControl);
+  }
+
+  @Override
+  public int compareTo(FacilityControlVerificationPK o) {
+    int compare = this.facility.compareTo(o.facility);
+
+    if (compare == 0) {
+      compare = this.creditedControl.compareTo(o.creditedControl);
+    }
+
+    return compare;
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
index 825f2a9..29ce5e0 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationsController.java
@@ -59,7 +59,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     expiredList = verificationFacade.checkForExpired();
     expiringList = verificationFacade.checkForUpcomingVerificationExpirations();
 
-    List<CreditedControl> ccList = ccFacade.findAll(new OrderDirective("weight"));
+    List<CreditedControl> ccList = ccFacade.findWithFacilityVerification(facility);
 
     List<RFSegment> segmentList = segmentFacade.filterList(true, facility);
     List<BeamDestination> destinationList = destinationFacade.filterList(true, facility);
diff --git a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
index 649c1f2..982433f 100644
--- a/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/authorizers.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="Facility Operations Authorizers"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
index 559b906..3aa9cc7 100644
--- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="Credited Controls"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/inventory/destinations.jsp b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp
index b7e8830..0aff85c 100644
--- a/src/main/webapp/WEB-INF/views/inventory/destinations.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/destinations.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="Beam Destinations"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/inventory/facilities.jsp b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp
index 60ec482..ba43360 100644
--- a/src/main/webapp/WEB-INF/views/inventory/facilities.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/facilities.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="Facilities"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/inventory/participation.jsp b/src/main/webapp/WEB-INF/views/inventory/participation.jsp
index 475db8d..e0fdf9f 100644
--- a/src/main/webapp/WEB-INF/views/inventory/participation.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/participation.jsp
@@ -7,7 +7,7 @@
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
         <link rel="stylesheet" type="text/css"
-              href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/credited-controls.css"/>
+              href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/control-verification.css"/>
         <link rel="stylesheet" type="text/css"
               href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/control-participation.css"/>
     </jsp:attribute>
@@ -62,9 +62,9 @@
                                             <tbody>
                                             <c:forEach items="${ccList}" var="cc">
                                                 <tr data-cc-id="${cc.creditedControlId}">
-                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information"
+                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Verification"
                                                            class="dialog-ready"
-                                                           href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                           href="${pageContext.request.contextPath}/verifications/control?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
                                                             value="${cc.name}"/></a></th>
                                                     <c:forEach items="${segmentList}" var="segment">
                                                         <td data-segment-id="${segment.getRFSegmentId()}">
@@ -108,9 +108,9 @@
                                             <tbody>
                                             <c:forEach items="${ccList}" var="cc">
                                                 <tr data-cc-id="${cc.creditedControlId}">
-                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Information"
+                                                    <th><a data-dialog-title="${fn:escapeXml(cc.name)} Verification"
                                                            class="dialog-ready"
-                                                           href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
+                                                           href="${pageContext.request.contextPath}/verifications/control?creditedControlId=${cc.creditedControlId}&amp;notEditable=1"><c:out
                                                             value="${cc.name}"/></a></th>
                                                     <c:forEach items="${destinationList}" var="destination">
                                                         <td data-destination-id="${destination.beamDestinationId}">
diff --git a/src/main/webapp/WEB-INF/views/inventory/segments.jsp b/src/main/webapp/WEB-INF/views/inventory/segments.jsp
index 7ec507b..04ad9ba 100644
--- a/src/main/webapp/WEB-INF/views/inventory/segments.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/segments.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="RF Segments"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
index fbadf2d..b9dd657 100644
--- a/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/verifiers.jsp
@@ -7,10 +7,8 @@
 <c:set var="title" value="Credited Control Verifiers"/>
 <t:inventory-page title="${title}">
     <jsp:attribute name="stylesheets">
-        <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/css/systems.css"/>
     </jsp:attribute>
     <jsp:attribute name="scripts">
-        <script type="text/javascript" src="${pageContext.request.contextPath}/resources/v${initParam.releaseNumber}/js/systems.js"></script>
     </jsp:attribute>        
     <jsp:body>
         <section>
diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index aa048de..68b09ad 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -45,11 +45,31 @@
         <h2 id="page-header-title"><c:out value="${title}"/></h2>
         <div class="message-box"><c:out value="${selectionMessage}"/></div>
         <h3>Credited Controls</h3>
-        <table class="data-table">
+        <table id="credited-control-verifications-table" class="data-table">
             <tbody>
             <c:forEach items="${ccList}" var="cc">
                 <tr>
                     <td><c:out value="${cc.name}"/></td>
+                    <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}"/>
+                                </li>
+                            </c:forEach>
+                        </ul>
+                    </td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/control">
                             <input type="hidden" name="creditedControlId" value="${cc.creditedControlId}"/>
diff --git a/src/main/webapp/resources/css/verifications.css b/src/main/webapp/resources/css/verifications.css
index 8d56405..c7dcdc3 100644
--- a/src/main/webapp/resources/css/verifications.css
+++ b/src/main/webapp/resources/css/verifications.css
@@ -1,3 +1,8 @@
 .expire-links {
     float: right;
+}
+#credited-control-verifications-table ul {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
 }
\ No newline at end of file

From b3ec89874407b806108312dd703ec454300d518e Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 13:53:10 -0500
Subject: [PATCH 37/44] Separate Facilities

---
 .../session/CreditedControlFacade.java        |  3 +-
 .../view/FacilityControlVerification.java     |  8 ++-
 .../controller/ControlVerification.java       |  2 +-
 .../WEB-INF/views/control-verification.jsp    | 51 +++++++------------
 .../resources/css/control-verification.css    |  5 ++
 5 files changed, 34 insertions(+), 35 deletions(-)

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 eb70f28..c12b2af 100644
--- a/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/CreditedControlFacade.java
@@ -36,7 +36,7 @@ public CreditedControlFacade() {
   }
 
   @PermitAll
-  public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
+  public CreditedControl findWithVerificationListTrio(BigInteger creditedControlId) {
     TypedQuery<CreditedControl> q =
         em.createQuery(
             "select a from CreditedControl a where a.creditedControlId = :creditedControlId",
@@ -54,6 +54,7 @@ public CreditedControl findWithVerificationList(BigInteger creditedControlId) {
       // JPAUtil.initialize(cc.getControlVerificationList());
       Collections.sort(cc.getBeamControlVerificationList());
       Collections.sort(cc.getRFControlVerificationList());
+      Collections.sort(cc.getFacilityControlVerificationList());
     }
 
     return cc;
diff --git a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
index 146f559..3a6b80b 100644
--- a/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
+++ b/src/main/java/org/jlab/jam/persistence/view/FacilityControlVerification.java
@@ -9,7 +9,8 @@
  */
 @Entity
 @Table(name = "FACILITY_CONTROL_VERIFICATION", schema = "JAM_OWNER")
-public class FacilityControlVerification implements Serializable {
+public class FacilityControlVerification
+    implements Serializable, Comparable<FacilityControlVerification> {
 
   private static final long serialVersionUID = 1L;
 
@@ -40,4 +41,9 @@ public Integer getVerificationStatusId() {
   public Date getExpirationDate() {
     return expirationDate;
   }
+
+  @Override
+  public int compareTo(FacilityControlVerification o) {
+    return this.facilityControlVerificationPK.compareTo(o.facilityControlVerificationPK);
+  }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
index 6137304..85e1de5 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/ControlVerification.java
@@ -49,7 +49,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     boolean adminOrLeader = false;
 
     if (creditedControlId != null) {
-      creditedControl = ccFacade.findWithVerificationList(creditedControlId);
+      creditedControl = ccFacade.findWithVerificationListTrio(creditedControlId);
 
       if (creditedControl != null) {
         removeInactiveVerifications(creditedControl);
diff --git a/src/main/webapp/WEB-INF/views/control-verification.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp
index f9d4707..1e10cfe 100644
--- a/src/main/webapp/WEB-INF/views/control-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/control-verification.jsp
@@ -33,42 +33,29 @@
             </div>
         </c:if>
         <section>
-            <h2><c:out value="${title}${empty creditedControl ? '' : ': '.concat(creditedControl.name)}"/></h2>
+            <h2><c:out value="${title}${empty creditedControl ? '' : ': '.concat(creditedControl.name)}"/> (<a href="${pageContext.request.contextPath}/inventory/controls?controlId=${creditedControl.creditedControlId}" class="dialog-ready" data-dialog-title="${creditedControl.name}">🗗</a>)</h2>
             <c:choose>
                 <c:when test="${creditedControl ne null}">
                     <div class="dialog-content">
                         <h3>Facility Verifications</h3>
-                        <table>
-                            <tbody>
-                                <tr>
-                                    <td>
-                                    </td>
-                                </tr>
-                            </tbody>
-                        </table>
-                        <c:if test="${pageContext.request.isUserInRole('jam-admin')}">
-                            <h3>Operability Notes <span class="readonly-field"><button id="operability-notes-edit-button" type="button">Edit</button></span></h3>    
-                            <div class="notes-field">
-                                <form id="operability-form" method="post" action="ajax/edit-operability-note">
-                                    <span class="readonly-field">
-                                        <c:out value="${fn:length(creditedControl.comments) == 0 ? 'None' : creditedControl.comments}"/>
-                                    </span>
-                                    <span class="editable-field">
-                                        <textarea id="operability-comments" name="comments"><c:out value="${creditedControl.comments}"/></textarea>
-                                        <input type="hidden" name="creditedControlId" value="${creditedControl.creditedControlId}"/>
-                                    </span>
-                                </form>
-                            </div>
-                            <div class="edit-button-block editable-field">
-                                <span>
-                                    <button id="save-button" class="ajax-button inline-button" type="button">Save</button>
-                                    <span class="cancel-text">
-                                        or 
-                                        <a id="cancel-button" href="#">Cancel</a>
-                                    </span>
-                                </span>
-                            </div>
-                        </c:if>
+                        <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}"/>
+                                </li>
+                            </c:forEach>
+                        </ul>
                         <h3>Operations Verifications</h3>
                         <div class="accordion">
                             <h3>RF Operations</h3>
diff --git a/src/main/webapp/resources/css/control-verification.css b/src/main/webapp/resources/css/control-verification.css
index 2005d70..535f81b 100644
--- a/src/main/webapp/resources/css/control-verification.css
+++ b/src/main/webapp/resources/css/control-verification.css
@@ -71,4 +71,9 @@ ul.ui-autocomplete {
 }
 .accordion .ui-widget-content a:hover {
     color: red;
+}
+#facility-control-verification-list {
+    list-style-type: none;
+    margin: 0;
+    padding: 0;
 }
\ No newline at end of file

From fd6e9cd20f072a0d307e0096039114faab7cacce Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 14:15:01 -0500
Subject: [PATCH 38/44] Separate Facilities

---
 .../inventory/WatchersController.java         | 46 +++++++++++
 .../webapp/WEB-INF/tags/inventory-page.tag    |  1 +
 .../WEB-INF/views/control-verification.jsp    | 82 +------------------
 .../WEB-INF/views/inventory/watchers.jsp      | 82 +++++++++++++++++++
 4 files changed, 130 insertions(+), 81 deletions(-)
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java
 create mode 100644 src/main/webapp/WEB-INF/views/inventory/watchers.jsp

diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java
new file mode 100644
index 0000000..892564b
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/WatchersController.java
@@ -0,0 +1,46 @@
+package org.jlab.jam.presentation.controller.inventory;
+
+import java.io.IOException;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.AbstractFacade;
+import org.jlab.jam.business.session.FacilityFacade;
+import org.jlab.jam.persistence.entity.Facility;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "WatchersController",
+    urlPatterns = {"/inventory/watchers"})
+public class WatchersController extends HttpServlet {
+
+  @EJB FacilityFacade facilityFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    List<Facility> facilityList =
+        facilityFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+
+    request.setAttribute("facilityList", facilityList);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/inventory/watchers.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/inventory-page.tag b/src/main/webapp/WEB-INF/tags/inventory-page.tag
index 049b94b..b42fe41 100644
--- a/src/main/webapp/WEB-INF/tags/inventory-page.tag
+++ b/src/main/webapp/WEB-INF/tags/inventory-page.tag
@@ -21,6 +21,7 @@
             <li${fn:startsWith(currentPath, '/inventory/participation') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/participation">Participation</a></li>
             <li${fn:startsWith(currentPath, '/inventory/authorizers') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/authorizers">Authorizers</a></li>
             <li${fn:startsWith(currentPath, '/inventory/verifiers') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/verifiers">Verifiers</a></li>
+            <li${fn:startsWith(currentPath, '/inventory/watchers') ? ' class="current-secondary"' : ''}><a href="${pageContext.request.contextPath}/inventory/watchers">Watchers</a></li>
         </ul>
     </jsp:attribute>
     <jsp:body>
diff --git a/src/main/webapp/WEB-INF/views/control-verification.jsp b/src/main/webapp/WEB-INF/views/control-verification.jsp
index 1e10cfe..17fa50a 100644
--- a/src/main/webapp/WEB-INF/views/control-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/control-verification.jsp
@@ -86,33 +86,7 @@
                     </div>
                 </c:when>
                 <c:otherwise>
-                    <div class="expire-links"><a id="expired-link" href="#">Expired</a> | <a id="expiring-link" href="#">Expiring</a></div>                    
-                    <h2>Credited Controls</h2>
-                    <table class="data-table stripped-table">
-                        <thead>
-                            <tr>
-                                <th>Select</th>
-                                <th>Name</th>
-                                <th>Description</th>
-                                <th>Group</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <c:forEach items="${ccList}" var="cc">
-                                <tr data-credited-control-id="${cc.creditedControlId}">
-                                    <td>
-                                        <form method="get" action="credited-controls">
-                                            <input type="hidden" name="creditedControlId" value="${cc.creditedControlId}"/>
-                                            <button class="single-char-button" type="submit">&rarr;</button>
-                                        </form>
-                                    </td>
-                                    <td><c:out value="${cc.name}"/></td>
-                                    <td><c:out value="${cc.description}"/></td>
-                                    <td><a data-dialog-title="${cc.group.name} Information" class="dialog-ready" href="group-information?groupId=${cc.group.workgroupId}"><c:out value="${cc.group.name}"/></a></td>
-                                </tr>
-                            </c:forEach>
-                        </tbody>
-                    </table> 
+                    Choose a Credited Control to continue
                 </c:otherwise>
             </c:choose>
         </section>
@@ -178,60 +152,6 @@
             <div class="dialog-button-panel">
                 <button class="dialog-close-button" type="button">OK</button>
             </div>
-        </div>  
-        <div id="expired-dialog" class="dialog" title="Expired Controls">
-            <c:choose>
-                <c:when test="${fn:length(expiredList) > 0}">
-                    <table class="data-table stripped-table">
-                        <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Beam Destination</th>
-                                <th>Expiration Date</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <c:forEach items="${expiredList}" var="verification">
-                                <tr>
-                                    <td><c:out value="${verification.creditedControl.name}"/></td>                                    
-                                    <td><c:out value="${verification.beamDestination.name}"/></td>
-                                    <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                </tr>
-                            </c:forEach>
-                        </tbody>
-                    </table>                            
-                </c:when>
-                <c:otherwise>
-                    <div>No expired controls</div>
-                </c:otherwise>
-            </c:choose>
-        </div>  
-        <div id="expiring-dialog" class="dialog" title="Controls Expiring within Seven Days">
-            <c:choose>
-                <c:when test="${fn:length(expiringList) > 0}">
-                    <table class="data-table stripped-table">
-                        <thead>
-                            <tr>
-                                <th>Name</th>
-                                <th>Beam Destination</th>
-                                <th>Expiration Date</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            <c:forEach items="${expiringList}" var="verification">
-                                <tr>
-                                    <td><c:out value="${verification.creditedControl.name}"/></td>                                    
-                                    <td><c:out value="${verification.beamDestination.name}"/></td>
-                                    <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                </tr>
-                            </c:forEach>
-                        </tbody>
-                    </table>                            
-                </c:when>
-                <c:otherwise>
-                    <div>No controls expiring within seven days</div>
-                </c:otherwise>
-            </c:choose>            
         </div>
         <div id="component-edit-dialog" class="dialog" title="Components">
             <div class="row">
diff --git a/src/main/webapp/WEB-INF/views/inventory/watchers.jsp b/src/main/webapp/WEB-INF/views/inventory/watchers.jsp
new file mode 100644
index 0000000..5b27f99
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/inventory/watchers.jsp
@@ -0,0 +1,82 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<c:set var="title" value="Event Watchers"/>
+<t:inventory-page title="${title}">
+    <jsp:attribute name="stylesheets">
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+    </jsp:attribute>        
+    <jsp:body>
+        <section>
+            <h2 class="page-header-title"><c:out value="${title}"/></h2>
+            <div class="message-box"><c:out value="${selectionMessage}"/></div>
+            <div id="chart-wrap" class="chart-wrap-backdrop">
+                <c:set var="readonly" value="${!pageContext.request.isUserInRole('jaws-admin')}"/>
+                <c:if test="${not readonly}">
+                    <s:editable-row-table-controls>
+                    </s:editable-row-table-controls>
+                </c:if>
+                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                    <thead>
+                        <tr>
+                            <th>Name</th>
+                            <th>Event</th>
+                            <th>Facility</th>
+                        </tr>
+                    </thead>
+                    <tbody>
+                    <c:forEach items="${facilityList}" var="facility">
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="MCCOPS (mccops)"/></td>
+                            <td><c:out value="UPCOMING_EXPIRATION"/></td>
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="MCCOPS (mccops)"/></td>
+                            <td><c:out value="VERIFICATION_DOWNGRADED"/></td>
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                        <tr data-id="${facility.facilityId}">
+                            <td><c:out value="MCCOPS (mccops)"/></td>
+                            <td><c:out value="AUTHORIZATION_DOWNGRADED"/></td>
+                            <td><c:out value="${facility.name}"/></td>
+                        </tr>
+                    </c:forEach>
+                    </tbody>
+                </table>
+            </div>
+        </section>
+        <s:editable-row-table-dialog>
+            <form id="row-form">
+                <ul class="key-value-list">
+                    <li>
+                        <div class="li-key">
+                            <label for="row-name">Name</label>
+                        </div>
+                        <div class="li-value">
+                            <input type="text" required="required" id="row-name"/>
+                        </div>
+                    </li>
+                    <li>
+                        <div class="li-key">
+                            <label for="row-team">Team</label>
+                        </div>
+                        <div class="li-value">
+                            <select id="row-team" required="required">
+                                <option value="">&nbsp;</option>
+                                <c:forEach items="${teamList}" var="team">
+                                    <option value="${team.teamId}">
+                                        <c:out value="${team.name}"/></option>
+                                </c:forEach>
+                            </select>
+                        </div>
+                    </li>
+                </ul>
+            </form>
+        </s:editable-row-table-dialog>
+    </jsp:body>         
+</t:inventory-page>
\ No newline at end of file

From ef4ee467b25e690a9e1398d9c7efb23518be0b66 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 15:13:18 -0500
Subject: [PATCH 39/44] Separate Facilities

---
 container/oracle/initdb.d/03_default_data.sql |  8 ++---
 .../BeamAuthorizationHistoryController.java   |  2 +-
 ...nationsAuthorizationHistoryController.java |  2 +-
 .../RFAuthorizationHistoryController.java     |  2 +-
 ...egmentsAuthorizationHistoryController.java |  2 +-
 ...ficationDestinationHistoryController.java} |  8 ++---
 .../inventory/ControlsController.java         | 20 +++++++++--
 .../WEB-INF/tags/verification-panel.tag       |  2 +-
 .../beam-history.jsp                          |  0
 .../destinations-history.jsp                  |  0
 .../rf-history.jsp                            |  0
 .../segments-history.jsp                      |  0
 .../WEB-INF/views/inventory/controls.jsp      | 36 +++++++++++--------
 .../destination-history.jsp}                  |  4 +--
 14 files changed, 54 insertions(+), 32 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{VerificationHistoryController.java => VerificationDestinationHistoryController.java} (91%)
 rename src/main/webapp/WEB-INF/views/{history => authorization-history}/beam-history.jsp (100%)
 rename src/main/webapp/WEB-INF/views/{history => authorization-history}/destinations-history.jsp (100%)
 rename src/main/webapp/WEB-INF/views/{history => authorization-history}/rf-history.jsp (100%)
 rename src/main/webapp/WEB-INF/views/{history => authorization-history}/segments-history.jsp (100%)
 rename src/main/webapp/WEB-INF/views/{credited-controls/verification-history.jsp => verification-history/destination-history.jsp} (96%)

diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
index ecea6d9..db38098 100644
--- a/container/oracle/initdb.d/03_default_data.sql
+++ b/container/oracle/initdb.d/03_default_data.sql
@@ -45,10 +45,10 @@ insert into JAM_OWNER.CREDITED_CONTROL (CREDITED_CONTROL_ID,NAME,DESCRIPTION,WOR
 insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Injector', 1, 'Y', 1);
 insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'North Linac', 1, 'Y', 2);
 insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'South Linac', 1, 'Y', 3);
-insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 2, 'Y', 1);
-insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 3, 'Y', 1);
-insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 4, 'Y', 1);
-insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 5, 'Y', 1);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 2, 'Y', 4);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 3, 'Y', 5);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 4, 'Y', 6);
+insert into JAM_OWNER.rf_segment (RF_SEGMENT_ID, NAME, FACILITY_ID, ACTIVE_YN, WEIGHT) values(JAM_OWNER.rf_segment_id.nextval, 'Entire Facility', 5, 'Y', 7);
 
 -- Populate Beam Destinations
 insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, FACILITY_ID, CURRENT_LIMIT_UNITS, ACTIVE_YN, WEIGHT) values(JAM_OWNER.beam_destination_id.nextval, '1D Spectrometer (IDL1D00)', 1, 'uA', 'Y', 1);
diff --git a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
index 3bb3fa2..a0385ca 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/BeamAuthorizationHistoryController.java
@@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("paginator", paginator);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/history/beam-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/authorization-history/beam-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
index 5482b8d..e5d699b 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationsAuthorizationHistoryController.java
@@ -62,7 +62,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("destinationAuthorizationMap", destinationAuthorizationMap);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/history/destinations-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/authorization-history/destinations-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
index 57c033a..16159df 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/RFAuthorizationHistoryController.java
@@ -66,7 +66,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("paginator", paginator);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/history/rf-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/authorization-history/rf-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
index 6db8d6c..be3844c 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentsAuthorizationHistoryController.java
@@ -60,7 +60,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("segmentAuthorizationMap", segmentAuthorizationMap);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/history/segments-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/authorization-history/segments-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java
similarity index 91%
rename from src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java
rename to src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java
index 7bb6a68..39e8749 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java
@@ -23,9 +23,9 @@
  * @author ryans
  */
 @WebServlet(
-    name = "VerificationHistoryController",
-    urlPatterns = {"/credited-controls/verification-history"})
-public class VerificationHistoryController extends HttpServlet {
+    name = "VerificationDestinationHistoryController",
+    urlPatterns = {"/verifications/control/destination-history"})
+public class VerificationDestinationHistoryController extends HttpServlet {
 
   @EJB VerificationHistoryFacade historyFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
@@ -82,7 +82,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     request.setAttribute("paginator", paginator);
 
     request
-        .getRequestDispatcher("/WEB-INF/views/credited-controls/verification-history.jsp")
+        .getRequestDispatcher("/WEB-INF/views/verification-history/destination-history.jsp")
         .forward(request, response);
   }
 }
diff --git a/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
index 1f27d15..d5a66ae 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/inventory/ControlsController.java
@@ -1,6 +1,8 @@
 package org.jlab.jam.presentation.controller.inventory;
 
 import java.io.IOException;
+import java.math.BigInteger;
+import java.util.ArrayList;
 import java.util.List;
 import javax.ejb.EJB;
 import javax.servlet.ServletException;
@@ -11,6 +13,7 @@
 import org.jlab.jam.business.session.AbstractFacade;
 import org.jlab.jam.business.session.CreditedControlFacade;
 import org.jlab.jam.persistence.entity.CreditedControl;
+import org.jlab.smoothness.presentation.util.ParamConverter;
 
 /**
  * @author ryans
@@ -34,8 +37,21 @@ public class ControlsController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
-    List<CreditedControl> controlList =
-        controlFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+    BigInteger controlId = ParamConverter.convertBigInteger(request, "controlId");
+
+    List<CreditedControl> controlList = null;
+
+    if (controlId != null) {
+      controlList = new ArrayList<CreditedControl>();
+
+      CreditedControl control = controlFacade.find(controlId);
+
+      if (control != null) {
+        controlList.add(control);
+      }
+    } else {
+      controlList = controlFacade.findAll(new AbstractFacade.OrderDirective("weight"));
+    }
 
     request.setAttribute("controlList", controlList);
 
diff --git a/src/main/webapp/WEB-INF/tags/verification-panel.tag b/src/main/webapp/WEB-INF/tags/verification-panel.tag
index 2f88a2f..7c07a2f 100644
--- a/src/main/webapp/WEB-INF/tags/verification-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/verification-panel.tag
@@ -74,7 +74,7 @@
                 </td>
                 <td><c:out value="${verification.comments}"/></td>
                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                <td><a data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification[operationsId]}" title="Click for verification history">History</a></td>
+                <td><a data-dialog-title="Verification History" href="${pageContext.request.contextPath}/verifications/control/destination-history?beamControlVerificationId=${verification[operationsId]}" title="Click for verification history">History</a></td>
             </tr>
         </c:forEach>
         </tbody>
diff --git a/src/main/webapp/WEB-INF/views/history/beam-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/history/beam-history.jsp
rename to src/main/webapp/WEB-INF/views/authorization-history/beam-history.jsp
diff --git a/src/main/webapp/WEB-INF/views/history/destinations-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/history/destinations-history.jsp
rename to src/main/webapp/WEB-INF/views/authorization-history/destinations-history.jsp
diff --git a/src/main/webapp/WEB-INF/views/history/rf-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/history/rf-history.jsp
rename to src/main/webapp/WEB-INF/views/authorization-history/rf-history.jsp
diff --git a/src/main/webapp/WEB-INF/views/history/segments-history.jsp b/src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp
similarity index 100%
rename from src/main/webapp/WEB-INF/views/history/segments-history.jsp
rename to src/main/webapp/WEB-INF/views/authorization-history/segments-history.jsp
diff --git a/src/main/webapp/WEB-INF/views/inventory/controls.jsp b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
index 3aa9cc7..82b307f 100644
--- a/src/main/webapp/WEB-INF/views/inventory/controls.jsp
+++ b/src/main/webapp/WEB-INF/views/inventory/controls.jsp
@@ -20,26 +20,32 @@
                     <s:editable-row-table-controls>
                     </s:editable-row-table-controls>
                 </c:if>
-                <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
-                    <thead>
+                <div class="dialog-content">
+                    <table class="data-table stripped-table ${readonly ? '' : 'uniselect-table editable-row-table'}">
+                        <thead>
                         <tr>
-                            <th>Name</th>
+                            <c:if test="${empty param.controlId}">
+                                <th>Name</th>
+                            </c:if>
                             <th>Description</th>
                             <th>Verification Team</th>
                             <th>Verification Frequency</th>
                         </tr>
-                    </thead>
-                    <tbody>
-                    <c:forEach items="${controlList}" var="control">
-                        <tr data-id="${control.creditedControlId}">
-                            <td><c:out value="${control.name}"/></td>
-                            <td><c:out value="${control.description}"/></td>
-                            <td><c:out value="${control.group.name}"/></td>
-                            <td><c:out value="${empty control.verificationFrequency ? 'As Needed' : control.verificationFrequency}"/></td>
-                        </tr>
-                    </c:forEach>
-                    </tbody>
-                </table>
+                        </thead>
+                        <tbody>
+                        <c:forEach items="${controlList}" var="control">
+                            <tr data-id="${control.creditedControlId}">
+                                <c:if test="${empty param.controlId}">
+                                <td><c:out value="${control.name}"/></td>
+                                </c:if>
+                                <td><c:out value="${control.description}"/></td>
+                                <td><c:out value="${control.group.name}"/></td>
+                                <td><c:out value="${empty control.verificationFrequency ? 'As Needed' : control.verificationFrequency}"/></td>
+                            </tr>
+                        </c:forEach>
+                        </tbody>
+                    </table>
+                </div>
             </div>
         </section>
         <s:editable-row-table-dialog>
diff --git a/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
similarity index 96%
rename from src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp
rename to src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
index 694c3f6..8e8a706 100644
--- a/src/main/webapp/WEB-INF/views/credited-controls/verification-history.jsp
+++ b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
@@ -14,10 +14,10 @@
         <div class="banner-breadbox">
             <ul>
                 <li>
-                    <a href="${pageContext.request.contextPath}/credited-controls">Credited Controls</a>
+                    <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
                 </li>
                 <li>
-                    <a href="${pageContext.request.contextPath}/credited-controls?creditedControlId=${verification.creditedControl.creditedControlId}">${verification.creditedControl.name}</a>
+                    <a href="${pageContext.request.contextPath}/verifications/control?creditedControlId=${verification.creditedControl.creditedControlId}">${verification.creditedControl.name}</a>
                 </li>
                 <li>
                     <c:out value="${verification.beamDestination.name}"/> <span>History</span>

From 067c33502a419fde502913a0451df87dc2b5f86d Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 15:20:15 -0500
Subject: [PATCH 40/44] Separate Facilities

---
 ...=> DestinationVerificationHistoryController.java} | 12 ++++++------
 .../verification-history/destination-history.jsp     |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename src/main/java/org/jlab/jam/presentation/controller/{VerificationDestinationHistoryController.java => DestinationVerificationHistoryController.java} (87%)

diff --git a/src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
similarity index 87%
rename from src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java
rename to src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
index 39e8749..fa9469e 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/VerificationDestinationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
@@ -25,7 +25,7 @@
 @WebServlet(
     name = "VerificationDestinationHistoryController",
     urlPatterns = {"/verifications/control/destination-history"})
-public class VerificationDestinationHistoryController extends HttpServlet {
+public class DestinationVerificationHistoryController extends HttpServlet {
 
   @EJB VerificationHistoryFacade historyFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
@@ -43,17 +43,17 @@ public class VerificationDestinationHistoryController extends HttpServlet {
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
 
-    BigInteger controlVerificationId =
-        ParamConverter.convertBigInteger(request, "controlVerificationId");
+    BigInteger beamControlVerificationId =
+        ParamConverter.convertBigInteger(request, "beamControlVerificationId");
     int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
     int maxPerPage = 10;
 
     BeamControlVerification verification =
-        verificationFacade.findWithCreditedControl(controlVerificationId);
+        verificationFacade.findWithCreditedControl(beamControlVerificationId);
 
     List<BeamControlVerificationHistory> historyList =
-        historyFacade.findHistory(controlVerificationId, offset, maxPerPage);
-    Long totalRecords = historyFacade.countHistory(controlVerificationId);
+        historyFacade.findHistory(beamControlVerificationId, offset, maxPerPage);
+    Long totalRecords = historyFacade.countHistory(beamControlVerificationId);
 
     Paginator paginator = new Paginator(totalRecords.intValue(), offset, maxPerPage);
 
diff --git a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
index 8e8a706..3b84fdc 100644
--- a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
+++ b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
@@ -26,7 +26,7 @@
         </div>        
         <section>
             <div class="dialog-content">
-                <h3>Name</h3>
+                <h3>Credited Control</h3>
                 <c:out value="${verification.creditedControl.name}"/>
                 <h3>Beam Destination</h3>
                 <c:out value="${verification.beamDestination.name}"/>
@@ -65,7 +65,7 @@
                                 </c:forEach>
                             </tbody>
                         </table>
-                        <form id="filter-form" action="${pageContext.request.contextPath}/credited-controls/verification-history" method="get">
+                        <form id="filter-form" action="${pageContext.request.contextPath}/verifications/control/destination-history" method="get">
                             <input type="hidden" name="beamControlVerificationId" value="${fn:escapeXml(param.beamControlVerificationId)}"/>
                             <input type="hidden" id="offset-input" name="offset" value="0"/>
                         </form>

From 17e97523938a87c3dc697e6ba7d12ef73db1b820 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 15:51:18 -0500
Subject: [PATCH 41/44] Separate Facilities

---
 ...BeamControlVerificationHistoryFacade.java} |  5 +-
 .../RFControlVerificationHistoryFacade.java   | 56 ++++++++++++
 ...tinationVerificationHistoryController.java |  6 +-
 .../SegmentVerificationHistoryController.java | 88 +++++++++++++++++++
 .../WEB-INF/tags/verification-panel.tag       |  4 +-
 .../views/destination-verification.jsp        |  4 +-
 .../WEB-INF/views/segment-verification.jsp    |  4 +-
 .../destination-history.jsp                   |  2 +-
 .../verification-history/segment-history.jsp  | 79 +++++++++++++++++
 9 files changed, 237 insertions(+), 11 deletions(-)
 rename src/main/java/org/jlab/jam/business/session/{VerificationHistoryFacade.java => BeamControlVerificationHistoryFacade.java} (90%)
 create mode 100644 src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java
 create mode 100644 src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java
 create mode 100644 src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp

diff --git a/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java
similarity index 90%
rename from src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java
rename to src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java
index 06348ed..3ddf42d 100644
--- a/src/main/java/org/jlab/jam/business/session/VerificationHistoryFacade.java
+++ b/src/main/java/org/jlab/jam/business/session/BeamControlVerificationHistoryFacade.java
@@ -13,7 +13,8 @@
  * @author ryans
  */
 @Stateless
-public class VerificationHistoryFacade extends AbstractFacade<BeamControlVerificationHistory> {
+public class BeamControlVerificationHistoryFacade
+    extends AbstractFacade<BeamControlVerificationHistory> {
   @PersistenceContext(unitName = "jamPU")
   private EntityManager em;
 
@@ -22,7 +23,7 @@ protected EntityManager getEntityManager() {
     return em;
   }
 
-  public VerificationHistoryFacade() {
+  public BeamControlVerificationHistoryFacade() {
     super(BeamControlVerificationHistory.class);
   }
 
diff --git a/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java b/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java
new file mode 100644
index 0000000..668887a
--- /dev/null
+++ b/src/main/java/org/jlab/jam/business/session/RFControlVerificationHistoryFacade.java
@@ -0,0 +1,56 @@
+package org.jlab.jam.business.session;
+
+import java.math.BigInteger;
+import java.util.List;
+import javax.annotation.security.PermitAll;
+import javax.ejb.Stateless;
+import javax.persistence.EntityManager;
+import javax.persistence.PersistenceContext;
+import javax.persistence.TypedQuery;
+import org.jlab.jam.persistence.entity.RFControlVerificationHistory;
+
+/**
+ * @author ryans
+ */
+@Stateless
+public class RFControlVerificationHistoryFacade
+    extends AbstractFacade<RFControlVerificationHistory> {
+  @PersistenceContext(unitName = "jamPU")
+  private EntityManager em;
+
+  @Override
+  protected EntityManager getEntityManager() {
+    return em;
+  }
+
+  public RFControlVerificationHistoryFacade() {
+    super(RFControlVerificationHistory.class);
+  }
+
+  @PermitAll
+  public List<RFControlVerificationHistory> findHistory(
+      BigInteger controlVerificationId,
+      int offset,
+      int maxPerPage) { // join fetch a.controlVerification b join fetch b.creditedControl
+    TypedQuery<RFControlVerificationHistory> q =
+        em.createQuery(
+            "select a from RFControlVerificationHistory a where a.rfControlVerification.rfControlVerificationId = :id order by a.rfControlVerificationHistoryId desc",
+            RFControlVerificationHistory.class);
+
+    q.setParameter("id", controlVerificationId);
+
+    return q.setFirstResult(offset).setMaxResults(maxPerPage).getResultList();
+  }
+
+  @PermitAll
+  public Long countHistory(BigInteger controlVerificationId) {
+    TypedQuery<Long> q =
+        em.createQuery(
+            "select count(a) from RFControlVerificationHistory a where a.rfControlVerification.rfControlVerificationId = :id",
+            Long.class);
+
+    q.setParameter("id", controlVerificationId);
+
+    return q.getSingleResult();
+  }
+}
diff --git a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
index fa9469e..ea6c1f2 100644
--- a/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
+++ b/src/main/java/org/jlab/jam/presentation/controller/DestinationVerificationHistoryController.java
@@ -11,8 +11,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.jlab.jam.business.session.BeamControlVerificationFacade;
+import org.jlab.jam.business.session.BeamControlVerificationHistoryFacade;
 import org.jlab.jam.business.session.CreditedControlFacade;
-import org.jlab.jam.business.session.VerificationHistoryFacade;
 import org.jlab.jam.persistence.entity.BeamControlVerification;
 import org.jlab.jam.persistence.entity.BeamControlVerificationHistory;
 import org.jlab.smoothness.presentation.util.Paginator;
@@ -23,11 +23,11 @@
  * @author ryans
  */
 @WebServlet(
-    name = "VerificationDestinationHistoryController",
+    name = "DestinationVerificationHistoryController",
     urlPatterns = {"/verifications/control/destination-history"})
 public class DestinationVerificationHistoryController extends HttpServlet {
 
-  @EJB VerificationHistoryFacade historyFacade;
+  @EJB BeamControlVerificationHistoryFacade historyFacade;
   @EJB BeamControlVerificationFacade verificationFacade;
   @EJB CreditedControlFacade creditedControlFacade;
 
diff --git a/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java
new file mode 100644
index 0000000..813b868
--- /dev/null
+++ b/src/main/java/org/jlab/jam/presentation/controller/SegmentVerificationHistoryController.java
@@ -0,0 +1,88 @@
+package org.jlab.jam.presentation.controller;
+
+import java.io.IOException;
+import java.math.BigInteger;
+import java.text.DecimalFormat;
+import java.util.List;
+import javax.ejb.EJB;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import org.jlab.jam.business.session.CreditedControlFacade;
+import org.jlab.jam.business.session.RFControlVerificationFacade;
+import org.jlab.jam.business.session.RFControlVerificationHistoryFacade;
+import org.jlab.jam.persistence.entity.RFControlVerification;
+import org.jlab.jam.persistence.entity.RFControlVerificationHistory;
+import org.jlab.smoothness.presentation.util.Paginator;
+import org.jlab.smoothness.presentation.util.ParamConverter;
+import org.jlab.smoothness.presentation.util.ParamUtil;
+
+/**
+ * @author ryans
+ */
+@WebServlet(
+    name = "SegmentVerificationHistoryController",
+    urlPatterns = {"/verifications/control/segment-history"})
+public class SegmentVerificationHistoryController extends HttpServlet {
+
+  @EJB RFControlVerificationHistoryFacade historyFacade;
+  @EJB RFControlVerificationFacade verificationFacade;
+  @EJB CreditedControlFacade creditedControlFacade;
+
+  /**
+   * Handles the HTTP <code>GET</code> method.
+   *
+   * @param request servlet request
+   * @param response servlet response
+   * @throws ServletException if a servlet-specific error occurs
+   * @throws IOException if an I/O error occurs
+   */
+  @Override
+  protected void doGet(HttpServletRequest request, HttpServletResponse response)
+      throws ServletException, IOException {
+
+    BigInteger rfControlVerificationId =
+        ParamConverter.convertBigInteger(request, "rfControlVerificationId");
+    int offset = ParamUtil.convertAndValidateNonNegativeInt(request, "offset", 0);
+    int maxPerPage = 10;
+
+    RFControlVerification verification =
+        verificationFacade.findWithCreditedControl(rfControlVerificationId);
+
+    List<RFControlVerificationHistory> historyList =
+        historyFacade.findHistory(rfControlVerificationId, offset, maxPerPage);
+    Long totalRecords = historyFacade.countHistory(rfControlVerificationId);
+
+    Paginator paginator = new Paginator(totalRecords.intValue(), offset, maxPerPage);
+
+    DecimalFormat formatter = new DecimalFormat("###,###");
+
+    String selectionMessage = "All Verifications";
+
+    if (paginator.getTotalRecords() < maxPerPage && offset == 0) {
+      selectionMessage =
+          selectionMessage + " {" + formatter.format(paginator.getTotalRecords()) + "}";
+    } else {
+      selectionMessage =
+          selectionMessage
+              + " {"
+              + formatter.format(paginator.getStartNumber())
+              + " - "
+              + formatter.format(paginator.getEndNumber())
+              + " of "
+              + formatter.format(paginator.getTotalRecords())
+              + "}";
+    }
+
+    request.setAttribute("selectionMessage", selectionMessage);
+    request.setAttribute("verification", verification);
+    request.setAttribute("historyList", historyList);
+    request.setAttribute("paginator", paginator);
+
+    request
+        .getRequestDispatcher("/WEB-INF/views/verification-history/segment-history.jsp")
+        .forward(request, response);
+  }
+}
diff --git a/src/main/webapp/WEB-INF/tags/verification-panel.tag b/src/main/webapp/WEB-INF/tags/verification-panel.tag
index 7c07a2f..2035c03 100644
--- a/src/main/webapp/WEB-INF/tags/verification-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/verification-panel.tag
@@ -10,10 +10,12 @@
 <c:set var="operationsName" value="Beam Destination"/>
 <c:set var="operationsId" value="beamControlVerificationId"/>
 <c:set var="operationsEntity" value="beamDestination"/>
+<c:set var="historyPathSuffix" value="destination-history?beamControlVerificationId"/>
 <c:if test="${'rf' eq operationsType}">
     <c:set var="operationsName" value="RF Segment"/>
     <c:set var="operationsId" value="RFControlVerificationId"/>
     <c:set var="operationsEntity" value="RFSegment"/>
+    <c:set var="historyPathSuffix" value="segment-history?rfControlVerificationId"/>
 </c:if>
 <div class="verification-panel">
     <c:if test="${adminOrLeader && param.notEditable eq null}">
@@ -74,7 +76,7 @@
                 </td>
                 <td><c:out value="${verification.comments}"/></td>
                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                <td><a data-dialog-title="Verification History" href="${pageContext.request.contextPath}/verifications/control/destination-history?beamControlVerificationId=${verification[operationsId]}" title="Click for verification history">History</a></td>
+                <td><a data-dialog-title="Verification History" href="${pageContext.request.contextPath}/verifications/control/${historyPathSuffix}=${verification[operationsId]}" title="Click for verification history">History</a></td>
             </tr>
         </c:forEach>
         </tbody>
diff --git a/src/main/webapp/WEB-INF/views/destination-verification.jsp b/src/main/webapp/WEB-INF/views/destination-verification.jsp
index 7fbd1a5..14e858d 100644
--- a/src/main/webapp/WEB-INF/views/destination-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/destination-verification.jsp
@@ -90,7 +90,7 @@
                                             <th>Verified By</th>
                                             <th>Comments</th>
                                             <th>Expiration Date</th>
-                                            <th></th>
+                                            <th>Audit</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -107,7 +107,7 @@
                                                 <td><c:out value="${s:formatUsername(verification.verifiedBy)}"/></td>
                                                 <td><c:out value="${verification.comments}"/></td>
                                                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                                <td><a class="small-icon dialog-ready comment-icon" data-dialog-title="Verification History" href="credited-controls/verification-history?beamControlVerificationId=${verification.beamControlVerificationId}" title="Click for verification history"></a></td>
+                                                <td><a class="dialog-ready" data-dialog-title="Destination Verification History" href="${pageContext.request.contextPath}/verifications/control/destination-history?beamControlVerificationId=${verification.beamControlVerificationId}" title="Click for verification history">History</a></td>
                                             </tr>
                                         </c:forEach>
                                     </tbody>
diff --git a/src/main/webapp/WEB-INF/views/segment-verification.jsp b/src/main/webapp/WEB-INF/views/segment-verification.jsp
index 55b3b34..9103874 100644
--- a/src/main/webapp/WEB-INF/views/segment-verification.jsp
+++ b/src/main/webapp/WEB-INF/views/segment-verification.jsp
@@ -90,7 +90,7 @@
                                             <th>Verified By</th>
                                             <th>Comments</th>
                                             <th>Expiration Date</th>
-                                            <th></th>
+                                            <th>Audit</th>
                                         </tr>
                                     </thead>
                                     <tbody>
@@ -107,7 +107,7 @@
                                                 <td><c:out value="${s:formatUsername(verification.verifiedBy)}"/></td>
                                                 <td><c:out value="${verification.comments}"/></td>
                                                 <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${verification.expirationDate}"/></td>
-                                                <td><a class="small-icon dialog-ready comment-icon" data-dialog-title="Verification History" href="credited-controls/verification-history?rfControlVerificationId=${verification.getRFControlVerificationId()}" title="Click for verification history"></a></td>
+                                                <td><a class="dialog-ready" data-dialog-title="Segment Verification History" href="${pageContext.request.contextPath}/verifications/control/segment-history?rfControlVerificationId=${verification.getRFControlVerificationId()}" title="Click for verification history">History</a></td>
                                             </tr>
                                         </c:forEach>
                                     </tbody>
diff --git a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
index 3b84fdc..f77a999 100644
--- a/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
+++ b/src/main/webapp/WEB-INF/views/verification-history/destination-history.jsp
@@ -5,7 +5,7 @@
 <%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
 <%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
 <%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
-<t:page title="Credited Controls > Verification History"> 
+<t:page title="Destination Verification History">
     <jsp:attribute name="stylesheets">
     </jsp:attribute>
     <jsp:attribute name="scripts">
diff --git a/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp b/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp
new file mode 100644
index 0000000..bcee2ff
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/verification-history/segment-history.jsp
@@ -0,0 +1,79 @@
+<%@page contentType="text/html" pageEncoding="UTF-8"%>
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@taglib prefix="s" uri="http://jlab.org/jsp/smoothness" %>
+<%@taglib prefix="beamauth" uri="http://jlab.org/beamauth/functions"%>
+<%@taglib prefix="t" tagdir="/WEB-INF/tags"%> 
+<t:page title="Segment Verification History">
+    <jsp:attribute name="stylesheets">
+    </jsp:attribute>
+    <jsp:attribute name="scripts">
+    </jsp:attribute>        
+    <jsp:body>
+        <div class="banner-breadbox">
+            <ul>
+                <li>
+                    <a href="${pageContext.request.contextPath}/verifications">Verifications</a>
+                </li>
+                <li>
+                    <a href="${pageContext.request.contextPath}/verifications/control?creditedControlId=${verification.creditedControl.creditedControlId}">${verification.creditedControl.name}</a>
+                </li>
+                <li>
+                    <c:out value="${verification.getRFSegment().name}"/> <span>History</span>
+                </li>
+            </ul>
+        </div>        
+        <section>
+            <div class="dialog-content">
+                <h3>Credited Control</h3>
+                <c:out value="${verification.creditedControl.name}"/>
+                <h3>RF Segment</h3>
+                <c:out value="${verification.getRFSegment().name}"/>
+                <h3>Group</h3>
+                <c:out value="${verification.creditedControl.group.name}"/>
+                <h3>History</h3>
+                <c:choose>
+                    <c:when test="${fn:length(historyList) < 1}">
+                        <div class="message-box">None</div>
+                    </c:when>
+                    <c:otherwise>
+                        <div class="message-box"><c:out value="${selectionMessage}"/></div>
+                        <table id="verification-table" class="data-table stripped-table">
+                            <thead>
+                                <tr>
+                                    <th>Modified Date</th>
+                                    <th>Modified By</th>
+                                    <th>Verified Date</th>
+                                    <th>Verified By</th>
+                                    <th>Verified</th>                                            
+                                    <th>Comments</th>
+                                    <th>Expiration Date</th>
+                                </tr>
+                            </thead>
+                            <tbody>
+                                <c:forEach items="${historyList}" var="history">
+                                    <tr>
+                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.modifiedDate}"/></td>
+                                        <td><c:out value="${s:formatUsername(history.modifiedBy)}"/></td>
+                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.verificationDate}"/></td>
+                                        <td><c:out value="${s:formatUsername(history.verifiedBy)}"/></td>
+                                        <td class="icon-cell"><span title="${history.verificationStatusId eq 1 ? 'Verified' : (history.verificationStatusId eq 50 ? 'Provisionally Verified' : 'Not Verified')}" class="small-icon baseline-small-icon ${history.verificationStatusId eq 1 ? 'verified-icon' : (history.verificationStatusId eq 50 ? 'provisional-icon' : 'not-verified-icon')}"></span></td>
+                                        <td><c:out value="${history.comments}"/></td>
+                                        <td><fmt:formatDate pattern="${s:getFriendlyDateTimePattern()}" value="${history.expirationDate}"/></td>
+                                    </tr>
+                                </c:forEach>
+                            </tbody>
+                        </table>
+                        <form id="filter-form" action="${pageContext.request.contextPath}/verifications/control/segment-history" method="get">
+                            <input type="hidden" name="rfControlVerificationId" value="${fn:escapeXml(param.rfControlVerificationId)}"/>
+                            <input type="hidden" id="offset-input" name="offset" value="0"/>
+                        </form>
+                        <button id="previous-button" type="button" data-offset="${paginator.previousOffset}" value="Previous"${paginator.previous ? '' : ' disabled="disabled"'}>Previous</button>                        
+                        <button id="next-button" type="button" data-offset="${paginator.nextOffset}" value="Next"${paginator.next ? '' : ' disabled="disabled"'}>Next</button>
+                    </c:otherwise>
+                </c:choose>
+            </div>
+        </section>          
+    </jsp:body>         
+</t:page>

From 99520c03bbf3c427d5ff36f1babccd49dd709cc6 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 16:25:18 -0500
Subject: [PATCH 42/44] Separate Facilities

---
 src/main/webapp/resources/js/control-verification.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/resources/js/control-verification.js b/src/main/webapp/resources/js/control-verification.js
index e429172..c416c8b 100644
--- a/src/main/webapp/resources/js/control-verification.js
+++ b/src/main/webapp/resources/js/control-verification.js
@@ -11,7 +11,7 @@ jlab.dateTimeToJLabString = function (x) {
     return jlab.pad(day, 2) + '-' + jlab.triCharMonthNames[month] + '-' + year + ' ' + jlab.pad(hour, 2) + ':' + jlab.pad(minute, 2);
 };
 jlab.addComponent = function () {
-    var verificationId = $("#verification-table tbody tr.selected-row").attr("data-control-verification-id"),
+    var verificationId = $("#beam-content .verification-table tbody tr.selected-row").attr("data-control-verification-id"),
         componentId = $("#component").attr("data-component-id"),
         $dialog = $("#component-edit-dialog"),
         url = jlab.contextPath + "/ajax/add-component",
@@ -35,7 +35,7 @@ jlab.addComponent = function () {
     });
 };
 jlab.removeComponent = function () {
-    var verificationId = $("#verification-table tbody tr.selected-row").attr("data-control-verification-id"),
+    var verificationId = $("#beam-content .verification-table tbody tr.selected-row").attr("data-control-verification-id"),
         componentId = $("#selected-component-list").val(),
         $dialog = $("#component-edit-dialog"),
         url = jlab.contextPath + "/ajax/remove-component",
@@ -185,7 +185,7 @@ $(document).on("click", ".verify-button", function () {
 
     $selectedList.empty();
 
-    var $verificationList = $("#verification-table tbody tr");
+    var $verificationList = $("#beam-content .verification-table tbody tr");
 
     var statusArray = [],
             verificationDateArray = [],
@@ -209,7 +209,7 @@ $(document).on("click", ".verify-button", function () {
             statusArray.push($(this).attr("data-status-id"));
             verificationDateArray.push($(".verified-date", value).text());
             verifiedByArray.push($(this).attr("data-verified-username"));
-            expirationDateArray.push($("td:nth-child(7)", value).text());
+            expirationDateArray.push($("td:nth-child(6)", value).text());
             commentsArray.push($("td:nth-child(6)", value).text());
         }
     });

From 719e70c0d12d132695343fcf9f89921fbb7e7b09 Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 16:47:05 -0500
Subject: [PATCH 43/44] Separate Facilities

---
 container/oracle/initdb.d/02_ddl.sql                 |  2 +-
 src/main/webapp/WEB-INF/tags/rf-operations-panel.tag | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
index a7fb97b..d8af2b4 100644
--- a/container/oracle/initdb.d/02_ddl.sql
+++ b/container/oracle/initdb.d/02_ddl.sql
@@ -172,7 +172,7 @@ CREATE TABLE JAM_OWNER.RF_SEGMENT_AUTHORIZATION
     CONSTRAINT RF_SEGMENT_AUTHORIZATION_PK PRIMARY KEY (RF_SEGMENT_ID,RF_AUTHORIZATION_ID),
     CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK1 FOREIGN KEY (RF_SEGMENT_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_SEGMENT (RF_SEGMENT_ID, FACILITY_ID),
     CONSTRAINT RF_SEGMENT_AUTHORIZATION_FK2 FOREIGN KEY (RF_AUTHORIZATION_ID, FACILITY_ID) REFERENCES JAM_OWNER.RF_AUTHORIZATION (RF_AUTHORIZATION_ID, FACILITY_ID),
-    CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (RF_MODE IN ('None', 'RF ON'))
+    CONSTRAINT RF_SEGMENT_AUTHORIZATION_CK1 CHECK (RF_MODE IN ('None', 'RF On'))
 );
 
 CREATE TABLE JAM_OWNER.CREDITED_CONTROL
diff --git a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
index 75d8df6..e3ce54c 100644
--- a/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
+++ b/src/main/webapp/WEB-INF/tags/rf-operations-panel.tag
@@ -27,7 +27,7 @@
     </thead>
     <tbody>
         <c:forEach items="${rfList}" var="segment">
-            <c:set var="rfSegmentAuthorization" value="${rfAuthorizationMap[segment.getRFSegmentId()]}"/>
+            <c:set var="segmentAuthorization" value="${segmentAuthorizationMap[segment.getRFSegmentId()]}"/>
             <tr>
                 <td>
                     <a data-dialog-title="${segment.name} Verification" class="dialog-ready" href="${pageContext.request.contextPath}/verifications/segment?segmentId=${segment.getRFSegmentId()}&notEditable=Y"><c:out value="${segment.name}"/></a>
@@ -36,7 +36,7 @@
                     <c:if test="${not isHistory}">
                     <td class="icon-cell">
                         <c:choose>
-                            <c:when test="${(segment.verification.verificationStatusId eq 1 or segment.verification.verificationStatusId eq 50) and rfSegmentAuthorization.getRFMode() ne null and rfSegmentAuthorization.getRFMode() ne 'None'}">
+                            <c:when test="${(segment.verification.verificationStatusId eq 1 or segment.verification.verificationStatusId eq 50) and segmentAuthorization.getRFMode() ne null and segmentAuthorization.getRFMode() ne 'None'}">
                                 <span title="Approved" class="small-icon verified-icon"></span>
                             </c:when>
                             <c:otherwise>
@@ -46,7 +46,7 @@
                     </td>
                 </c:if>
                 <td>
-                    <c:set var="selectedRFMode" value="${rfSegmentAuthorization.getRFMode() eq null ? 'None' : rfSegmentAuthorization.getRFMode()}"/>
+                    <c:set var="selectedRFMode" value="${segmentAuthorization.getRFMode() eq null ? 'None' : segmentAuthorization.getRFMode()}"/>
                     <div class="readonly-field"><c:out value="${selectedRFMode}"/></div>
                     <div class="editable-field">
                         <select name="mode[]" class="mode-select">
@@ -58,7 +58,7 @@
                     </div>
                 </td>
                 <td class="${(not isHistory) && (not (selectedBeamMode eq 'None')) && (segment.verification.verificationStatusId eq 50) ? 'provisional-comments' : ''}">
-                    <c:set var="selectedComment" value="${rfSegmentAuthorization.comments eq null ? '' : rfSegmentAuthorization.comments}"/>
+                    <c:set var="selectedComment" value="${segmentAuthorization.comments eq null ? '' : segmentAuthorization.comments}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedComment}"/>
                     </span>
@@ -67,10 +67,10 @@
                     </span>
                 </td>
                 <td>
-                    <fmt:formatDate var="selectedExpiration" value="${rfSegmentAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                    <fmt:formatDate var="selectedExpiration" value="${segmentAuthorization.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
                     <span class="readonly-field">
                         <c:out value="${selectedExpiration}"/>
-                        <span class="expiring-soon" style="<c:out value="${rfSegmentAuthorization.expirationDate ne null and rfSegmentAuthorization.expirationDate.time > beamauth:now().time and rfSegmentAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                        <span class="expiring-soon" style="<c:out value="${segmentAuthorization.expirationDate ne null and segmentAuthorization.expirationDate.time > beamauth:now().time and segmentAuthorization.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
                     </span>
                     <span class="editable-field">
                         <input name="expiration[]" type="text" class="expiration-input date-time-field" autocomplete="off" placeholder="${s:getFriendlyDateTimePlaceholder()}" value="${selectedBeamMode eq 'None' ? '' : selectedExpiration}"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}/>

From 3a8d88db620a79b485ba0e6283ee213444c6e51d Mon Sep 17 00:00:00 2001
From: Ryan Slominski <Ryan.Slominski@gmail.com>
Date: Thu, 30 Jan 2025 17:06:08 -0500
Subject: [PATCH 44/44] Separate Facilities

---
 src/main/webapp/WEB-INF/views/verifications.jsp | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/main/webapp/WEB-INF/views/verifications.jsp b/src/main/webapp/WEB-INF/views/verifications.jsp
index 68b09ad..961bb2b 100644
--- a/src/main/webapp/WEB-INF/views/verifications.jsp
+++ b/src/main/webapp/WEB-INF/views/verifications.jsp
@@ -66,6 +66,8 @@
                                         </c:otherwise>
                                     </c:choose>
                                     <c:out value="${fv.getFacilityControlVerificationPK().facility.name}"/>
+                                    <fmt:formatDate value="${fv.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                                    <span class="expiring-soon" style="<c:out value="${fv.expirationDate ne null and fv.expirationDate.time > beamauth:now().time and fv.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: inline-block;' : 'display: none;'}"/>">(Expiring Soon)</span>
                                 </li>
                             </c:forEach>
                         </ul>
@@ -100,6 +102,10 @@
                         <c:out value="${segment.name}"/>
                     </td>
                     <td><c:out value="${segment.facility.name}"/></td>
+                    <td>
+                        <fmt:formatDate value="${segment.verification.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                        <span class="expiring-soon" style="<c:out value="${segment.verification.expirationDate ne null and segment.verification.expirationDate.time > beamauth:now().time and segment.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                    </td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/segment">
                             <input type="hidden" name="segmentId" value="${segment.getRFSegmentId()}"/>
@@ -129,6 +135,10 @@
                         </c:choose>
                         <c:out value="${destination.name}"/>
                     </td>
+                    <td>
+                        <fmt:formatDate value="${destination.verification.expirationDate}" pattern="${s:getFriendlyDateTimePattern()}"/>
+                        <span class="expiring-soon" style="<c:out value="${destination.verification.expirationDate ne null and destination.verification.expirationDate.time > beamauth:now().time and destination.verification.expirationDate.time < beamauth:twoDaysFromNow().time ? 'display: block;' : 'display: none;'}"/>">(Expiring Soon)</span>
+                    </td>
                     <td><c:out value="${destination.facility.name}"/></td>
                     <td>
                         <form method="get" action="${pageContext.request.contextPath}/verifications/destination">