diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index 2fef1c882..ce814e54e 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -2,6 +2,7 @@ package org.springframework.cheapy.web; import java.time.format.DateTimeFormatter; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -60,6 +61,15 @@ public class FoodOfferController { } return res; } + + @GetMapping("/offers/foodOfferList") + public String processFindForm(Map model) { + List foodOfferLs=this.foodOfferService.findActiveFoodOffer(); + model.put("foodOfferLs", foodOfferLs); + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/food/foodOffersList"; + + } @GetMapping("/offers/food/new") public String initCreationForm(Map model) { diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index a6c79db67..01a3f9cb0 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -2,6 +2,7 @@ package org.springframework.cheapy.web; import java.security.Principal; import java.time.format.DateTimeFormatter; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -79,6 +80,15 @@ public class NuOfferController { } return res; } + + @GetMapping("/offers/nuOfferList") + public String processFindForm(Map model) { + List foodOfferLs=this.nuOfferService.findActiveNuOffer(); + model.put("nuOfferLs", foodOfferLs); + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/nu/nuOffersList"; + + } @GetMapping("/offers/nu/new") public String initCreationForm(Map model) { diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index ab42eacb6..bbf1372b6 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -1,6 +1,7 @@ package org.springframework.cheapy.web; import java.time.format.DateTimeFormatter; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -78,6 +79,15 @@ public class SpeedOfferController { } return res; } + + @GetMapping("/offers/speedOfferList") + public String processFindForm(Map model) { + List speedOfferLs=this.speedOfferService.findActiveSpeedOffer(); + model.put("speedOfferLs", speedOfferLs); + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/speed/speedOffersList"; + + } @GetMapping("/offers/speed/new") public String initCreationForm(Map model) { diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index 2e584cdea..23480e3b7 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -1,6 +1,7 @@ package org.springframework.cheapy.web; import java.time.format.DateTimeFormatter; +import java.util.List; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -66,6 +67,15 @@ public class TimeOfferController { } return res; } + + @GetMapping("/offers/timeOfferList") + public String processFindForm(Map model) { + List timeOfferLs=this.timeOfferService.findActiveTimeOffer(); + model.put("timeOfferLs", timeOfferLs); + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/time/timeOffersList"; + + } @GetMapping("/offers/time/new") public String initCreationForm(Map model) { diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp new file mode 100644 index 000000000..2ca621bf4 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp @@ -0,0 +1,85 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + + + +

+ + +

No hay ninguna oferta por plato específico activa.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp new file mode 100644 index 000000000..d3a0725ce --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp @@ -0,0 +1,82 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + + + +

+ +

No hay ninguna oferta por número de comensales activa.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index 5373e4e7f..db1b101a0 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -8,6 +8,31 @@ + + + + + + + + + + + + + + + + +

diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp new file mode 100644 index 000000000..01a638bd0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp @@ -0,0 +1,82 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + + + +

+ +

No hay ninguna oferta por tiempo empleado en comer activa.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
+
+
+
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp new file mode 100644 index 000000000..f51d2a1f9 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp @@ -0,0 +1,82 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + + + + + + + + + +

+ +

No hay ninguna oferta por franja horaria activa.

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + +
+ +
+
+
+ +