Skip to content

Commit 2d89c02

Browse files
committed
Use ShiftInfoSummary as extra slide
Use blank iframe slide for HCO
1 parent ab60ec2 commit 2d89c02

1 file changed

Lines changed: 17 additions & 11 deletions

File tree

  • src/main/java/org/jlab/presenter/presentation/controller

src/main/java/org/jlab/presenter/presentation/controller/PDMenu.java

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -322,14 +322,17 @@ private List<Slide> getNewHCOSlides(
322322
slides.add(summarySlide);
323323

324324
// Extra PD
325-
TitleBodySlide extraPD = new TitleBodySlide(TitleBodySlideType.DYNAMIC_TWO_COLUMN);
326-
extraPD.setTitle("PD Summary");
327-
extraPD.setOrderId(order++);
328-
extraPD.setPresentation(presentation);
329-
slides.add(extraPD);
325+
ShiftInfoSlide summarySlide2 = new ShiftInfoSlide();
326+
summarySlide2.setShiftSlideType(ShiftSlideType.HCO);
327+
summarySlide2.setBody("");
328+
summarySlide2.setProgram("HCO");
329+
summarySlide2.setYmd(TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()));
330+
summarySlide2.setOrderId(order++);
331+
summarySlide2.setPresentation(presentation);
332+
slides.add(summarySlide2);
330333

331334
// HCO Graph Slide
332-
Slide hcoSlide = UrlUtil.getHcoSlide();
335+
Slide hcoSlide = new IFrameSlide();
333336
hcoSlide.setOrderId(order++);
334337
hcoSlide.setPresentation(presentation);
335338
slides.add(hcoSlide);
@@ -496,11 +499,14 @@ private List<Slide> getNewSADSlides(
496499
slides.add(summarySlide);
497500

498501
// Extra PD
499-
TitleBodySlide extraPD = new TitleBodySlide(TitleBodySlideType.DYNAMIC_TWO_COLUMN);
500-
extraPD.setTitle("PD Summary");
501-
extraPD.setOrderId(order++);
502-
extraPD.setPresentation(presentation);
503-
slides.add(extraPD);
502+
ShiftInfoSlide summarySlide2 = new ShiftInfoSlide();
503+
summarySlide2.setShiftSlideType(ShiftSlideType.PD);
504+
summarySlide2.setBody("");
505+
summarySlide2.setProgram("");
506+
summarySlide2.setYmd(TimeUtil.getLSDContentDate(presentation.getDeliveryYmd()));
507+
summarySlide2.setOrderId(order++);
508+
summarySlide2.setPresentation(presentation);
509+
slides.add(summarySlide2);
504510

505511
// Workmap
506512
IFrameSlide workmapSlide = UrlUtil.getWorkmapSlide(presentation.getDeliveryYmd());

0 commit comments

Comments
 (0)