RF Only support (#12)

JeffersonLab · Dec 9, 2024 · b34ce00 · b34ce00
1 parent 673c1b4
commit b34ce00
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 15 deletions.
diff --git a/container/oracle/initdb.d/02_ddl.sql b/container/oracle/initdb.d/02_ddl.sql
@@ -73,7 +73,7 @@ CREATE TABLE JAM_OWNER.DESTINATION_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')),
+    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 ,

diff --git a/container/oracle/initdb.d/03_default_data.sql b/container/oracle/initdb.d/03_default_data.sql
@@ -28,6 +28,7 @@ insert into JAM_OWNER.beam_destination (BEAM_DESTINATION_ID, NAME, MACHINE, CURR
 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);
 
 -- 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/presentation/util/BeamAuthFunctions.java b/src/main/java/org/jlab/jam/presentation/util/BeamAuthFunctions.java
@@ -13,6 +13,7 @@ public final class BeamAuthFunctions {
 
   private static final Logger LOGGER = Logger.getLogger(BeamAuthFunctions.class.getName());
 
+  private static final List<String> RF_LIST = Arrays.asList("None", "RF Only");
   private static final List<String> CEBAF_LIST = Arrays.asList("None", "Tune", "CW");
   private static final List<String> LERF_LIST =
       Arrays.asList(
@@ -24,20 +25,25 @@ private BeamAuthFunctions() {
     // cannot instantiate publicly
   }
 
-  public static List<String> beamModeList(String facility) {
+  public static List<String> beamModeList(String facility, String destination) {
     List<String> modes = null;
 
-    switch (facility) {
-      case "cebaf":
-        modes = CEBAF_LIST;
-        break;
-      case "lerf":
-        modes = LERF_LIST;
-        break;
-      case "uitf":
-        modes = UITF_LIST;
-        break;
+    if (destination.contains("RF Operations")) {
+      modes = RF_LIST;
+    } else {
+      switch (facility) {
+        case "cebaf":
+          modes = CEBAF_LIST;
+          break;
+        case "lerf":
+          modes = LERF_LIST;
+          break;
+        case "uitf":
+          modes = UITF_LIST;
+          break;
+      }
     }
+
     return modes;
   }
 

diff --git a/src/main/webapp/WEB-INF/functions.tld b/src/main/webapp/WEB-INF/functions.tld
@@ -13,7 +13,7 @@
     <function>
         <name>beamModeList</name>
         <function-class>org.jlab.jam.presentation.util.BeamAuthFunctions</function-class>
-        <function-signature>java.util.List beamModeList(java.lang.String)</function-signature>
+        <function-signature>java.util.List beamModeList(java.lang.String, java.lang.String)</function-signature>
     </function>
     <function>
         <name>laseModeList</name>

diff --git a/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag b/src/main/webapp/WEB-INF/tags/destination-permissions-table.tag
@@ -50,7 +50,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)}" var="beamMode">
+                            <c:forEach items="${beamauth:beamModeList(facility, destination.name)}" var="beamMode">
                                 <option${beamMode eq selectedBeamMode ? ' selected="selected"' : ''}><c:out value="${beamMode}"/></option>
                             </c:forEach>
                         </select>
@@ -61,6 +61,9 @@
                     <c:set var="selectedLimit" value="${destinationAuthorization.cwLimit eq null ? '' : destinationAuthorization.cwLimit}"/>
                     <span class="readonly-field">
                         <c:choose>
+                            <c:when test="${fn:contains(destination.name, 'RF Operations')}">
+                                N/A
+                            </c:when>
                             <c:when test="${selectedLimit ne ''}">
                                 <fmt:formatNumber value="${selectedLimit}"/>
                                 <c:out value="${units}"/>
@@ -73,7 +76,7 @@
                         </c:choose>
                     </span>
                     <span class="editable-field">
-                        <input name="limit[]" class="limit-input" type="text" value="${selectedBeamMode eq 'None' ? '' : fn:escapeXml(selectedLimit)}"${selectedBeamMode eq 'None' ? ' readonly="readonly"' : ''}/>
+                        <input name="limit[]" class="limit-input" type="text" value="${selectedBeamMode eq 'None' ? '' : fn:escapeXml(selectedLimit)}"${selectedBeamMode eq 'None' || selectedBeamMode eq 'RF Only' ? ' readonly="readonly"' : ''}/>
                         <c:out value="${units}"/>
                     </span>
                     <input type="hidden" name="beamDestinationId[]" value="${destination.beamDestinationId}"/>