Skip to content

Template Updates, Spring 2026 #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
slominskir merged 2 commits into from
Apr 1, 2026
Merged

Template Updates, Spring 2026 #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53154c8
Templates Updates, Spring 2026
slominskir Apr 1, 2026
9353166
Format
slominskir Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 29 additions & 2 deletions src/main/java/org/jlab/presenter/persistence/entity/ShiftInfoSlide.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
" <p><b>Injector:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
Expand Down Expand Up @@ -116,17 +119,41 @@ public ShiftInfoSlide(Date ymd, Shift shift, ShiftSlideType shiftSlideType) {
+ " </ul> ";

switch (shiftSlideType) {
// case SAM:
case LSD:
setLabel("LSD Summary");
setLabel("PD Summary (SAM)");
program = "LSD";
break;
case HCO:
setLabel("HCO Summary");
program = "HCO";
break;
case PD:
setLabel("PD Summary");
setLabel("PD Summary (RUN)");
program = "";
body =
" <p><b>FML:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>ES&H:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>MOLLER Install:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>Hall B:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>Hall C:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>Hall D:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>LERF:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>Gun Test Stand:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <p><b>UITF:</b>&nbsp;</p>\n"
+ " <p><br/></p>"
+ " <h1>Problems Requiring Attention</h1>\n"
+ " <ul>\n"
+ " <li></li>\n"
+ " </ul> ";
break;
case LO:
setLabel("LERF Shift Log");
Expand Down
22 changes: 17 additions & 5 deletions src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,17 @@ private List<Slide> 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);
Expand Down Expand Up @@ -490,17 +501,18 @@ private List<Slide> 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()));
Expand Down
6 changes: 4 additions & 2 deletions src/main/java/org/jlab/presenter/presentation/util/ShowInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
Expand All @@ -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);
Expand Down
Loading