Last minute fixes for temporary slots

FroMage · Jan 9, 2024 · 837d240 · 837d240
1 parent 82ad49a
commit 837d240
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/main/java/model/TemporarySlot.java b/src/main/java/model/TemporarySlot.java
@@ -4,14 +4,14 @@
 import java.util.Date;
 import java.util.List;
 
+import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import io.quarkus.qute.TemplateData;
 import jakarta.persistence.Entity;
 import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
-import jakarta.validation.constraints.NotBlank;
 import jakarta.validation.constraints.NotNull;
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
 
-@SuppressWarnings("serial")
+@TemplateData
 @Entity
 public class TemporarySlot extends PanacheEntity {
 
@@ -54,7 +54,7 @@ public String toString() {
 		return strbuf.toString();
 	}
 
-	public static List<Slot> findPerDay(Date day){
+	public static List<TemporarySlot> findPerDay(Date day){
 		return list("date_trunc('day', startDate) = ?1 ORDER BY startDate", day);
 	}
 

diff --git a/src/main/resources/templates/tags/previousSpeakers.html b/src/main/resources/templates/tags/previousSpeakers.html
@@ -1,7 +1,7 @@
 <div class="persons__list">
     {#for speaker in speakers}
         <figure class="personSummary">
-            <div class="personSummary__photo" style="background-image: url('@{Application.previousSpeakerPhoto(speaker.id)}')">
+            <div class="personSummary__photo" style="background-image: url('{uri:Application.previousSpeakerPhoto(speaker.id)}')">
             </div>
             <figcaption class="personSummary__desc">
                 <div class="personSummary__name">{speaker}</div>

diff --git a/src/main/resources/templates/tags/sponsorsPreviousYears.html b/src/main/resources/templates/tags/sponsorsPreviousYears.html
@@ -4,7 +4,7 @@
     <div class="partenaires__list">
         {#for sponsor in sponsorsPreviousYears}
             <a class="partenaire__logo" href="{sponsor.companyURL}" target="_blank" title="{sponsor.company}">
-                <img class="partenaire__logoImg" src="@{Application.sponsorLogo(sponsor.id)}" />
+                <img class="partenaire__logoImg" src="{uri:Application.sponsorLogo(sponsor.id)}" />
             </a>
         {/for}
     </div>

diff --git a/src/main/resources/templates/tags/temporarySchedule.html b/src/main/resources/templates/tags/temporarySchedule.html
@@ -3,13 +3,13 @@
     <col class="tempSchedule__col--time">
     <col class="tempSchedule__col">
 
-    {#for slot in models.TemporarySlot.findPerDay(day)}
+    {#for slot in model_TemporarySlot:findPerDay(day)}
         <tr>
             <th class="tempSchedule__time" scope="row">
                 <span>{slot.startDate.format('HH:mm')}</span>
             </th>
 
-            {#if slot.isBreak != null && slot.isBreak != models.BreakType.NotABreak}
+            {#if slot.isBreak && slot.isBreak != BreakType:NotABreak}
                 <td class="tempSchedule__{slot.isBreak.code}">
                     <span class="tempSchedule__breakTitle">
                         {#if inject:i18n.get() == "en" && slot.labelEN}

diff --git a/src/main/resources/templates/tags/temporaryScheduleXs.html b/src/main/resources/templates/tags/temporaryScheduleXs.html
@@ -1,14 +1,14 @@
 <table class="tempSchedule">
 
-    {#for slot in models.TemporarySlot.findPerDay(day)}
+    {#for slot in model_TemporarySlot:findPerDay(day)}
         <tr>
             <td class="tempSchedule__time">
                 <span>{slot.startDate.format('HH:mm')}</span>
             </td>
         </tr>
 
         <tr>
-            {#if slot.isBreak != null && slot.isBreak != models.BreakType.NotABreak}
+            {#if slot.isBreak && slot.isBreak != BreakType:NotABreak}
                 <td class="tempSchedule__{slot.isBreak.code}">
                     <span class="tempSchedule__breakTitle">
                         {#if inject:i18n.get() == "en" && slot.labelEN}