Added guild emoji for reserved slot

Alf-Melmac · Jan 28, 2022 · 913242f · 913242f
1 parent 65de3ac
commit 913242f
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 2 deletions.
diff --git a/src/main/java/de/webalf/slotbot/assembler/website/EventDetailsAssembler.java b/src/main/java/de/webalf/slotbot/assembler/website/EventDetailsAssembler.java
@@ -140,7 +140,7 @@ private EventDetailsSlotDto toEventDetailsSlotDto(@NonNull Slot slot) {
 				.id(slot.getId())
 				.name(slot.getName())
 				.number(slot.getNumber())
-				.reservedFor(GuildAssembler.toDto(slot.getReservedFor()))
+				.reservedFor(GuildAssembler.toDto(slot.getEffectiveReservedForDisplay()))
 				.text(text)
 				.occupied(!(slot.getUser() == null || slot.getUser().isDefaultUser()))
 				.blocked(blocked)

diff --git a/src/main/java/de/webalf/slotbot/model/Slot.java b/src/main/java/de/webalf/slotbot/model/Slot.java
@@ -95,6 +95,21 @@ public Guild getEffectiveReservedFor() {
 		return reservedFor != null ? reservedFor : getSquad().getReservedFor();
 	}
 
+	/**
+	 * Same as {@link #getEffectiveReservedFor()} but doesn't return {@link #reservedFor} if the whole squad is reserved
+	 * for this {@link Guild}
+	 *
+	 * @see #getEffectiveReservedFor()
+	 */
+	public Guild getEffectiveReservedForDisplay() {
+		final Guild effectiveReservedFor = getEffectiveReservedFor();
+		if (effectiveReservedFor != null &&
+				getSquad().getSlotList().stream().allMatch(slot -> effectiveReservedFor.equals(slot.getReservedFor()))) {
+			return null;
+		}
+		return effectiveReservedFor;
+	}
+
 	// Setter
 
 	/**

diff --git a/src/main/resources/templates/eventDetails.html b/src/main/resources/templates/eventDetails.html
@@ -172,7 +172,18 @@ <h5 class="modal-title" id="addChannelLabel">Kanal hinzufügen</h5>
 													<p class="mb-1" th:text="${slot.number}"></p>
 												</div>
 												<div class="col-md-5">
-													<p class="mb-1" th:text="${slot.name}"></p>
+													<p class="mb-1">
+														<span th:text="${slot.name}"></span>
+														<th:block th:if="${slot.reservedFor != null}"
+														          th:with="reservedFor=${slot.reservedFor}">
+															<img th:unless="${#strings.isEmpty(reservedFor.emojiUrl)}"
+															     class="square-em-1" th:src="${reservedFor.emojiUrl}"
+															     th:title="${reservedFor.groupIdentifier}"
+															     th:alt="${reservedFor.groupIdentifier}">
+															<span th:if="${#strings.isEmpty(reservedFor.emojiUrl)}"
+															      th:text="${'[' + reservedFor.groupIdentifier + ']'}"></span>
+														</th:block>
+													</p>
 												</div>
 												<div th:if="${#strings.isEmpty(slot.text)}">
 													<p class="mb-1 font-weight-bold">Freier Slot</p>