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 1f005a1..c9bb1d2 100644 --- a/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java +++ b/src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java @@ -73,6 +73,9 @@ public ShiftInfoSlide(Date ymd, Shift shift, ShiftSlideType shiftSlideType) { this.shift = shift; this.shiftSlideType = shiftSlideType; + // Off as scheduled has been labeled many things over the years: + // Long ShutDown (LSD) / Scheduled Accelerator Down (SAD) / Scheduled Accelerator Maintenance + // (SAM) Body body = "

Injector: 

\n" + "


" @@ -116,8 +119,9 @@ public ShiftInfoSlide(Date ymd, Shift shift, ShiftSlideType shiftSlideType) { + " "; switch (shiftSlideType) { + // case SAM: case LSD: - setLabel("LSD Summary"); + setLabel("PD Summary (SAM)"); program = "LSD"; break; case HCO: @@ -125,8 +129,31 @@ public ShiftInfoSlide(Date ymd, Shift shift, ShiftSlideType shiftSlideType) { program = "HCO"; break; case PD: - setLabel("PD Summary"); + setLabel("PD Summary (RUN)"); program = ""; + body = + "

FML: 

\n" + + "


" + + "

ES&H: 

\n" + + "


" + + "

MOLLER Install: 

\n" + + "


" + + "

Hall B: 

\n" + + "


" + + "

Hall C: 

\n" + + "


" + + "

Hall D: 

\n" + + "


" + + "

LERF: 

\n" + + "


" + + "

Gun Test Stand: 

\n" + + "


" + + "

UITF: 

\n" + + "


" + + "

Problems Requiring Attention

\n" + + " "; break; case LO: setLabel("LERF Shift Log"); 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 0907459..d130be2 100644 --- a/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java +++ b/src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java @@ -461,6 +461,17 @@ private List getNewRunSlides( order = slides.size() + 1; + // Summary Slide + ShiftInfoSlide summarySlide = + new ShiftInfoSlide( + TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()), + Shift.DAY, + ShiftSlideType.PD); + summarySlide.setOrderId(order++); + summarySlide.setPresentation(presentation); + slides.add(summarySlide); + + // Whiteboard Slide whiteboardSlide = UrlUtil.getWhiteboardSlide(); whiteboardSlide.setOrderId(order++); whiteboardSlide.setPresentation(presentation); @@ -490,17 +501,18 @@ private List getNewSADSlides( long order = slides.size() + 1; // Summary Slide - ShiftInfoSlide summarySlide = new ShiftInfoSlide(); - summarySlide.setShiftSlideType(ShiftSlideType.PD); - summarySlide.setProgram(""); - summarySlide.setYmd(TimeUtil.getLSDContentDate(presentation.getDeliveryYmd())); + ShiftInfoSlide summarySlide = + new ShiftInfoSlide( + TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()), + Shift.DAY, + ShiftSlideType.LSD); summarySlide.setOrderId(order++); summarySlide.setPresentation(presentation); slides.add(summarySlide); // Extra PD ShiftInfoSlide summarySlide2 = new ShiftInfoSlide(); - summarySlide2.setShiftSlideType(ShiftSlideType.PD); + summarySlide2.setShiftSlideType(ShiftSlideType.LSD); summarySlide2.setBody(""); summarySlide2.setProgram(""); summarySlide2.setYmd(TimeUtil.getLSDContentDate(presentation.getDeliveryYmd())); diff --git a/src/main/java/org/jlab/presenter/presentation/util/ShowInfo.java b/src/main/java/org/jlab/presenter/presentation/util/ShowInfo.java index 653dc9d..2817752 100644 --- a/src/main/java/org/jlab/presenter/presentation/util/ShowInfo.java +++ b/src/main/java/org/jlab/presenter/presentation/util/ShowInfo.java @@ -255,7 +255,7 @@ public PDShowInfo(PDPresentation presentation) { new ShiftInfoSlide( TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()), Shift.DAY, - ShiftSlideType.PD)); + ShiftSlideType.LSD)); templates.add(UrlUtil.getWeatherSlide()); templates.add(UrlUtil.getWorkmapSlide(presentation.getDeliveryYmd())); templates.add(UrlUtil.getCalendarSlide(presentation.getDeliveryYmd())); @@ -267,7 +267,9 @@ public PDShowInfo(PDPresentation presentation) { case LSD: templates.add( new ShiftInfoSlide( - TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()), Shift.DAY)); + TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()), + Shift.DAY, + ShiftSlideType.LSD)); templates.add(UrlUtil.getWorkmapSlide(presentation.getDeliveryYmd())); templates.add(UrlUtil.getCalendarSlide(presentation.getDeliveryYmd())); templates.addAll(generalTemplates);