diff --git a/compose.yaml b/compose.yaml
index 904237f..6a385b1 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -36,7 +36,7 @@ services:
BACKEND_SERVER_URL: 'http://presenter:8080'
FRONTEND_SERVER_URL: 'https://localhost:8443'
DTM_URL: 'https://ace.jlab.org/dtm'
- BTM_URL: 'https://cebaf.jlab.org/btm'
+ BTM_URL: 'https://ace.jlab.org/btm'
RESIZE_URL: 'http://resize:8080/resize'
SRM_URL: 'https://ace.jlab.org/srm'
CALENDAR_URL: 'https://ace.jlab.org/calendar'
diff --git a/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java b/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java
index 10bb9cc..e8c2b0f 100644
--- a/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java
+++ b/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java
@@ -74,31 +74,34 @@ public ShiftInfoSlide(Date ymd, Shift shift, ShiftSlideType shiftSlideType) {
this.shiftSlideType = shiftSlideType;
body =
- " Summary
\n"
- + " ES&H:
\n"
- + "
"
- + " INJ:
\n"
+ " Injector:
\n"
+ "
"
- + " MSS:
\n"
+ + " Mechanical Support:
\n"
+ "
"
+ " RF:
\n"
+ "
"
+ " SRF:
\n"
+ "
"
- + " DC:
\n"
+ + " Vacuum:
\n"
+ + "
"
+ + " DC Power:
\n"
+ "
"
- + " I&C:
\n"
+ + " Instrumentation & Controls:
\n"
+ "
"
- + " SSG:
\n"
+ + " Safety Systems:
\n"
+ "
"
- + " S&A:
\n"
+ + " Survey & Alignment:
\n"
+ "
"
- + " ACG:
\n"
+ + " Accelerator Computing:
\n"
+ "
"
- + " Cryo:
\n"
+ + " Cyrogenics:
\n"
+ "
"
+ " FML:
\n"
+ "
"
+ + " ES&H:
\n"
+ + "
"
+ + " MOLLER Install:
\n"
+ + "
"
+ " Physics:
\n"
+ "
"
+ " LERF:
\n"
diff --git a/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java b/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java
index 97fc074..e50ebe2 100644
--- a/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java
+++ b/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java
@@ -21,19 +21,8 @@
import org.jlab.presenter.business.session.*;
import org.jlab.presenter.business.util.TimeUtil;
import org.jlab.presenter.business.util.UrlUtil;
-import org.jlab.presenter.persistence.entity.BodySlide;
-import org.jlab.presenter.persistence.entity.IFrameSlide;
-import org.jlab.presenter.persistence.entity.PDPresentation;
-import org.jlab.presenter.persistence.entity.PdAccessSlide;
-import org.jlab.presenter.persistence.entity.PdBeamAccSlide;
-import org.jlab.presenter.persistence.entity.PdInfoSlide;
-import org.jlab.presenter.persistence.entity.ShiftInfoSlide;
-import org.jlab.presenter.persistence.entity.Slide;
-import org.jlab.presenter.persistence.enumeration.BodySlideType;
-import org.jlab.presenter.persistence.enumeration.PDPresentationType;
-import org.jlab.presenter.persistence.enumeration.PdInfoSlideType;
-import org.jlab.presenter.persistence.enumeration.PresentationType;
-import org.jlab.presenter.persistence.enumeration.ShiftSlideType;
+import org.jlab.presenter.persistence.entity.*;
+import org.jlab.presenter.persistence.enumeration.*;
import org.jlab.presenter.presentation.util.ConvertAndValidateUtil;
import org.jlab.presenter.presentation.util.DailyFsdGraphSlideGenerator;
import org.jlab.presenter.presentation.util.DailySlideGenerator;
@@ -332,6 +321,19 @@ private List getNewHCOSlides(
summarySlide.setPresentation(presentation);
slides.add(summarySlide);
+ // Extra PD
+ TitleBodySlide extraPD = new TitleBodySlide(TitleBodySlideType.DYNAMIC_TWO_COLUMN);
+ extraPD.setTitle("PD Summary");
+ extraPD.setOrderId(order++);
+ extraPD.setPresentation(presentation);
+ slides.add(extraPD);
+
+ // HCO Graph Slide
+ Slide hcoSlide = UrlUtil.getHcoSlide();
+ hcoSlide.setOrderId(order++);
+ hcoSlide.setPresentation(presentation);
+ slides.add(hcoSlide);
+
// Workmap Slide
IFrameSlide workmapSlide = UrlUtil.getWorkmapSlide(presentation.getDeliveryYmd());
workmapSlide.setOrderId(order++);
@@ -344,12 +346,6 @@ private List getNewHCOSlides(
calendarSlide.setPresentation(presentation);
slides.add(calendarSlide);
- // HCO Graph Slide
- Slide hcoSlide = UrlUtil.getHcoSlide();
- hcoSlide.setOrderId(order++);
- hcoSlide.setPresentation(presentation);
- slides.add(hcoSlide);
-
// LERF Slides
List lerfSlides =
PDPresentationUtil.getLerfSlides(
@@ -499,6 +495,13 @@ private List getNewSADSlides(
summarySlide.setPresentation(presentation);
slides.add(summarySlide);
+ // Extra PD
+ TitleBodySlide extraPD = new TitleBodySlide(TitleBodySlideType.DYNAMIC_TWO_COLUMN);
+ extraPD.setTitle("PD Summary");
+ extraPD.setOrderId(order++);
+ extraPD.setPresentation(presentation);
+ slides.add(extraPD);
+
// Workmap
IFrameSlide workmapSlide = UrlUtil.getWorkmapSlide(presentation.getDeliveryYmd());
workmapSlide.setOrderId(order++);