Skip to content
Snippets Groups Projects

Resolve "lab dropdown needs more context"

All threads resolved!
3 files
+ 7
1
Compare changes
  • Side-by-side
  • Inline

Files

@@ -20,6 +20,8 @@ package nl.tudelft.queue.dto.view;
@@ -20,6 +20,8 @@ package nl.tudelft.queue.dto.view;
import static java.time.LocalDateTime.now;
import static java.time.LocalDateTime.now;
import static nl.tudelft.librador.SpringContext.getBean;
import static nl.tudelft.librador.SpringContext.getBean;
 
import java.time.format.DateTimeFormatter;
 
import lombok.AllArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.EqualsAndHashCode;
@@ -45,6 +47,7 @@ public class QueueSessionSummaryDTO extends View<QueueSession<?>> {
@@ -45,6 +47,7 @@ public class QueueSessionSummaryDTO extends View<QueueSession<?>> {
private QueueSessionType type;
private QueueSessionType type;
private String name;
private String name;
 
private String readableName;
private Slot slot;
private Slot slot;
private Integer slotsOccupied;
private Integer slotsOccupied;
@@ -60,6 +63,8 @@ public class QueueSessionSummaryDTO extends View<QueueSession<?>> {
@@ -60,6 +63,8 @@ public class QueueSessionSummaryDTO extends View<QueueSession<?>> {
var session = getBean(SessionCacheManager.class).getOrThrow(data.getSession());
var session = getBean(SessionCacheManager.class).getOrThrow(data.getSession());
this.name = session.getName();
this.name = session.getName();
 
this.readableName = session.getName() + " : " + DateTimeFormatter.ofPattern("HH:mm - dd " +
 
"MMM yyyy").format(session.getStart());
this.slot = new Slot(session.getStart(), session.getEnd());
this.slot = new Slot(session.getStart(), session.getEnd());
this.status = getBean(LabService.class).getLabStatus(data);
this.status = getBean(LabService.class).getLabStatus(data);
Loading