From 0a4db394c2e1e2ddd09ed21ea5b638322bb545a6 Mon Sep 17 00:00:00 2001 From: David Date: Fri, 16 Apr 2021 14:36:28 +0200 Subject: [PATCH] =?UTF-8?q?Intento=20de=20arreglo=20de=20la=20codificaci?= =?UTF-8?q?=C3=B3n=20del=20proyecto=20y=20cambio=20en=20algunas=20vistas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../springframework/cheapy/model/Client.java | 13 +-- .../cheapy/model/Municipio.java | 27 +++++- .../cheapy/model/StatusOffer.java | 28 +++++- .../springframework/cheapy/model/Usuario.java | 8 +- .../repository/TimeOfferRepository.java | 4 +- src/main/less/cheapy.less | 62 ++++++++++++- src/main/resources/db/mysql/data.sql | 8 +- .../resources/messages/messages_es.properties | 2 +- .../WEB-INF/jsp/clients/clientActivate.jsp | 4 +- .../WEB-INF/jsp/clients/clientDisable.jsp | 4 +- .../webapp/WEB-INF/jsp/clients/clientShow.jsp | 3 +- .../WEB-INF/jsp/clients/clientsList.jsp | 3 +- .../jsp/clients/createOrUpdateClientForm.jsp | 29 +++--- .../WEB-INF/jsp/clients/restaurantShow.jsp | 3 +- src/main/webapp/WEB-INF/jsp/error.jsp | 2 +- src/main/webapp/WEB-INF/jsp/login.jsp | 9 +- .../food/createOrUpdateFoodOfferForm.jsp | 3 +- .../jsp/offers/food/foodOffersDisable.jsp | 4 +- .../jsp/offers/food/foodOffersList.jsp | 33 +++++-- .../jsp/offers/food/foodOffersShow.jsp | 12 ++- .../WEB-INF/jsp/offers/myOffersList.jsp | 32 +++++-- .../offers/nu/createOrUpdateNuOfferForm.jsp | 9 +- .../WEB-INF/jsp/offers/nu/nuOffersDisable.jsp | 5 +- .../WEB-INF/jsp/offers/nu/nuOffersList.jsp | 32 ++++--- .../WEB-INF/jsp/offers/nu/nuOffersShow.jsp | 13 ++- .../WEB-INF/jsp/offers/offersCreate.jsp | 1 + .../webapp/WEB-INF/jsp/offers/offersList.jsp | 89 ++++++++++++------- .../WEB-INF/jsp/offers/offersListSearch.jsp | 3 +- .../WEB-INF/jsp/offers/offersRecordList.jsp | 3 +- .../speed/createOrUpdateSpeedOfferForm.jsp | 4 +- .../jsp/offers/speed/speedOffersDisable.jsp | 5 +- .../jsp/offers/speed/speedOffersList.jsp | 29 +++--- .../jsp/offers/speed/speedOffersShow.jsp | 12 ++- .../time/createOrUpdateTimeOfferForm.jsp | 3 +- .../jsp/offers/time/timeOffersDisable.jsp | 4 +- .../jsp/offers/time/timeOffersList.jsp | 30 ++++--- .../jsp/offers/time/timeOffersShow.jsp | 12 ++- .../jsp/reviews/createOrUpdateReviewForm.jsp | 12 +-- .../WEB-INF/jsp/reviews/reviewsList.jsp | 28 +++--- .../WEB-INF/jsp/reviews/reviewsShow.jsp | 5 +- .../WEB-INF/jsp/singup/singUpClient.jsp | 39 ++++---- .../webapp/WEB-INF/jsp/singup/singUpUser.jsp | 37 +++++--- .../usuarios/createOrUpdateUsuarioForm.jsp | 3 +- .../WEB-INF/jsp/usuarios/usuariosDisable.jsp | 5 +- .../WEB-INF/jsp/usuarios/usuariosList.jsp | 6 +- .../WEB-INF/jsp/usuarios/usuariosShow.jsp | 4 +- src/main/webapp/WEB-INF/jsp/welcome.jsp | 1 + src/main/webapp/WEB-INF/tags/menu.tag | 2 +- .../webapp/WEB-INF/tags/passwordField.tag | 2 +- 49 files changed, 490 insertions(+), 201 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java index e9f56687d..2f1e69bc4 100644 --- a/src/main/java/org/springframework/cheapy/model/Client.java +++ b/src/main/java/org/springframework/cheapy/model/Client.java @@ -27,13 +27,13 @@ public class Client extends BaseEntity { // (id, name, email, address, init, finish, telephone, description, code, food, // usuar) - @NotEmpty + @NotEmpty(message="No debe estar vacío") private String name; - @NotEmpty + @NotEmpty(message="No debe estar vacío") private String email; - @NotEmpty + @NotEmpty(message="No debe estar vacío") private String address; @NotNull @@ -145,13 +145,6 @@ public class Client extends BaseEntity { this.description = description; } - public Municipio getMunicipio() { - return municipio; - } - - public void setMunicipio(Municipio municipio) { - this.municipio = municipio; - } public Code getCode() { return cod; diff --git a/src/main/java/org/springframework/cheapy/model/Municipio.java b/src/main/java/org/springframework/cheapy/model/Municipio.java index dd4beecd9..c001e9905 100644 --- a/src/main/java/org/springframework/cheapy/model/Municipio.java +++ b/src/main/java/org/springframework/cheapy/model/Municipio.java @@ -2,5 +2,30 @@ package org.springframework.cheapy.model; public enum Municipio { - Dos_Hermanas, Sevilla + Dos_Hermanas{ + @Override + public String toString() { + return "Dos Hermanas"; + } + + } + + , Sevilla{ + @Override + public String toString() { + return "Sevilla"; + + } + + } + + , Carmona{ + @Override + public String toString() { + return "Carmona"; + + } + + } + } diff --git a/src/main/java/org/springframework/cheapy/model/StatusOffer.java b/src/main/java/org/springframework/cheapy/model/StatusOffer.java index b1b0f874b..931635eb7 100644 --- a/src/main/java/org/springframework/cheapy/model/StatusOffer.java +++ b/src/main/java/org/springframework/cheapy/model/StatusOffer.java @@ -1,5 +1,31 @@ package org.springframework.cheapy.model; public enum StatusOffer { - active, inactive, hidden + active{ + @Override + public String toString() { + return "Activa"; + + } + + } + + , inactive{ + @Override + public String toString() { + return "Inactiva"; + + } + + } + + + , hidden{ + @Override + public String toString() { + return "Oculta"; + + } + + } } diff --git a/src/main/java/org/springframework/cheapy/model/Usuario.java b/src/main/java/org/springframework/cheapy/model/Usuario.java index 9adf0a9ec..359af5189 100644 --- a/src/main/java/org/springframework/cheapy/model/Usuario.java +++ b/src/main/java/org/springframework/cheapy/model/Usuario.java @@ -19,20 +19,20 @@ public class Usuario extends BaseEntity{ private static final long serialVersionUID = 1L; - @NotBlank + @NotBlank(message="No debe estar vacío") private String nombre; - @NotBlank + @NotBlank(message="No debe estar vacío") private String apellidos; - @NotBlank + @NotBlank(message="No debe estar vacío") private String direccion; @Enumerated(value = EnumType.STRING) private Municipio municipio; @Email - @NotBlank + @NotBlank(message="No debe estar vacío") private String email; @OneToOne(cascade = CascadeType.ALL) diff --git a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java index e3cdd669d..9d96fe55c 100644 --- a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java @@ -13,7 +13,7 @@ import org.springframework.data.repository.PagingAndSortingRepository; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; -public interface TimeOfferRepository extends PagingAndSortingRepository { +public interface TimeOfferRepository extends PagingAndSortingRepository { TimeOffer findTimeOfferById(int timeOfferId); @@ -21,7 +21,7 @@ public interface TimeOfferRepository extends PagingAndSortingRepository findAllTimeOffer(Pageable p); - void save(TimeOffer timeOffer); + //void save(TimeOffer timeOffer); @Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.status =:status") @Transactional(readOnly = true) diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less index a6a211767..da0e89be5 100644 --- a/src/main/less/cheapy.less +++ b/src/main/less/cheapy.less @@ -227,6 +227,7 @@ img.img-responsive{ .btn-filter{ background: rgb(40, 140, 215); color: white; + border: none; } .btn-filter:hover{ @@ -237,6 +238,14 @@ img.img-responsive{ .btn-filter-active{ background: rgb(0, 64, 128); color: white; + border: none; + +} + +.select-municipio{ + padding:10px; + border:solid; + border-color: rgb(0, 64, 128); } @@ -246,6 +255,47 @@ img.img-responsive{ } +.btn-mas{ + background: rgb(40, 140, 215); + color: white; + padding: 10px; + margin:10px; + border: none; +} + +.btn-mas:hover{ + background: rgb(0, 64, 128); + color: white; +} + +.btn-pag{ + background: rgb(40, 140, 215); + color: white; + padding: 10px; + margin:10px; + border: none; +} + +.btn-pag:hover{ + background: rgb(0, 64, 128); + color: white; +} + +.btn-search{ + background: rgb(40, 140, 215); + color: white; + padding: 5px; + margin:10px; + border: none; + border-radius: 30%; +} + +.btn-search:hover{ + background: rgb(0, 64, 128); + color: white; +} + + .btn-home { display: flex; justify-content: center; @@ -339,24 +389,28 @@ img.img-responsive{ } #foodOfferTable th { - width: 20%; + width: 15%; text-align: center; + } #nuOfferTable th { - width: 20%; + width: 15%; text-align: center; +vertical-align: middle; } #speedOfferTable th { - width: 20%; + width: 15%; text-align: center; +vertical-align: middle; } #timeOfferTable th { - width: 20%; + width: 15%; text-align: center; +vertical-align: middle; } .btn-detalles button { diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 22b93de26..0c8238235 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -14,10 +14,10 @@ INSERT INTO users (username,password,enabled) VALUES ('pepe','pepe', TRUE ); INSERT INTO authorities (username,authority) VALUES ('pepe','usuario'); -INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin', 'C/admin', 'carmona', 'admin@gmail.com','admin'); -INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'sevilla', 'Paco@gmail.com','paco'); -INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez', 'C/Macarena', 'dos_hermanas', 'Lolo@gmail.com','lolo'); -INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'carmona', 'Pepe@gmail.com','pepe'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin', 'C/admin', 'Carmona', 'admin@gmail.com','admin'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'Sevilla', 'Paco@gmail.com','paco'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez', 'C/Macarena', 'Dos_Hermanas', 'Lolo@gmail.com','lolo'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'Carmona', 'Pepe@gmail.com','pepe'); INSERT INTO codes (id,code,activo) VALUES (1,'code1',FALSE); INSERT INTO codes (id,code,activo) VALUES (2,'code2',FALSE); diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties index d93fb4800..68e2c4821 100644 --- a/src/main/resources/messages/messages_es.properties +++ b/src/main/resources/messages/messages_es.properties @@ -1,5 +1,5 @@ welcome=Bienvenido a -new=Nueva +new=Nuevo deleteOffer=Eliminar Oferta cancel=Cancelar deleteOfferMessage=Confirme que quiere eliminar su oferta diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp index 43b68b4b3..df129da08 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp @@ -5,11 +5,13 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

¿Está seguro de que quiere activar esta cuenta?

+

¿Está seguro de que quiere activar esta cuenta?

diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp index 2e824727e..d7009da1e 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientDisable.jsp @@ -5,11 +5,13 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

¿Está seguro de que quiere eliminar su cuenta?

+

¿Está seguro de que quiere eliminar su cuenta?

diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp index 9ccf3f800..44ddce8bc 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp @@ -5,11 +5,12 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp index abb1bc295..de4927126 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientsList.jsp @@ -5,10 +5,11 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

No hay ningun Cliente.

diff --git a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp index a42dd67c5..91ed84126 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp @@ -5,33 +5,36 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

- + - -
- - -
- - + + + +
+ +
+ +
+
diff --git a/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp index 150a738bc..9de6c43ed 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp @@ -5,11 +5,12 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp index 44cc60e51..bdf972f26 100644 --- a/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -1,7 +1,7 @@ <%@ page session="false" trimDirectiveWhitespaces="true" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +<%@ page contentType="text/html; charset=UTF-8" %>

Algo malo ha pasado...

diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 81bd7c811..5768e9992 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -5,6 +5,7 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -284,7 +285,7 @@
-

El usuario y/o la contraseña son incorrectos

+

El usuario y/o la contraseña son incorrectos

@@ -292,16 +293,16 @@
diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp index 736f83797..6b2044e28 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp @@ -5,10 +5,11 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp index 15a051c8e..3b41f5dbf 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp @@ -5,11 +5,13 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

¿Está seguro de que quiere eliminar su oferta?

+

¿Está seguro de que quiere eliminar su oferta?

diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp index 1a6a725e8..60c8b1b10 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp @@ -5,6 +5,7 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -42,10 +43,10 @@
-

+

:

-

No hay ninguna oferta por plato espec�fico activa.

+

No hay ninguna oferta por plato específico activa.

@@ -57,6 +58,7 @@ + @@ -79,6 +81,9 @@ +
+ + @@ -95,23 +100,33 @@
+
+ +
+
+
- + +
- + +
+ - + +
+
diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp index bfd854ea4..156da80ed 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp @@ -5,16 +5,22 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

:

+ + + + @@ -31,6 +37,10 @@ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/myOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/myOffersList.jsp index 13abd2508..1010010b2 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/myOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/myOffersList.jsp @@ -4,12 +4,16 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+ + + +

:

-

No hay ninguna oferta por plato específico creada.

+

No hay ninguna oferta por plato específico creada.

@@ -21,6 +25,7 @@
+ +
@@ -41,6 +46,9 @@ + + @@ -58,9 +66,9 @@
-

+

:

-

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

+

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

@@ -71,6 +79,7 @@ + @@ -90,6 +99,9 @@ + + + @@ -107,7 +119,7 @@
-

+

:

No hay ninguna oferta por tiempo empleado en comer creada.

@@ -120,6 +132,7 @@ + @@ -139,6 +152,9 @@ + + + @@ -157,7 +173,7 @@ -

+

:

No hay ninguna oferta por franja horaria creada.

@@ -170,6 +186,7 @@ + @@ -188,6 +205,9 @@ + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp index 0200bdc9a..fc9bc9923 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp @@ -5,6 +5,7 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -32,7 +33,7 @@ -

+

@@ -66,11 +67,11 @@ - + - + - + diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp index 1071ec5bc..096694a02 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp @@ -5,11 +5,14 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + + -

¿Está seguro de que quiere eliminar su oferta?

+

¿Está seguro de que quiere eliminar su oferta?

diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp index 1ea94e7c6..94bbaf41a 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp @@ -5,6 +5,7 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -15,7 +16,7 @@
+ Ofertas de plato específico @@ -40,9 +41,9 @@ -

+

:

-

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

+

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

@@ -90,22 +91,31 @@
- +
+ +
+ + +
- + +
- + + +
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp index dd4f68713..4ec023ffc 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp @@ -5,15 +5,20 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

+ + + + @@ -50,6 +55,12 @@ + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp index a9b2e5d7d..6ee4fda8e 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersCreate.jsp @@ -4,6 +4,7 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index 3f421f8ff..5ba06db6f 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -46,36 +47,38 @@
-

Búsqueda por nombre del bar/restaurante:

+

Búsqueda por nombre del bar/restaurante:

- -
-

Búsqueda por comida:

+

Búsqueda por tipo de comida:

- -
- - +
+ + +
-

+

:

No hay ninguna oferta por plato específico activa.

@@ -134,19 +137,21 @@ - +
+ +
-

+

:

-

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

+

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

-
+
@@ -156,6 +161,7 @@ + @@ -178,6 +184,9 @@ +
+ + @@ -192,14 +201,16 @@
- +
+ +
-

+

:

No hay ninguna oferta por tiempo empleado en comer activa.

@@ -215,6 +226,7 @@ + @@ -237,6 +249,9 @@ + + + @@ -252,15 +267,17 @@ - - +
+ + +
-

+

:

No hay ninguna oferta por franja horaria activa.

@@ -276,6 +293,7 @@ + @@ -297,6 +315,9 @@ + + + @@ -311,10 +332,12 @@ - - +
+ + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersListSearch.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersListSearch.jsp index 65fc09f67..15f4545ce 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersListSearch.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersListSearch.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -13,7 +14,7 @@

-

No hay ninguna oferta por plato específico activa.

+

No hay ninguna oferta por plato específico activa.

diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp index 7598a1ddc..471182217 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp @@ -4,10 +4,11 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

Registro de Ofertas

+

Historial de Ofertas

No hay ninguna oferta creada.

diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp index 906baa373..67e14ba71 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp @@ -5,10 +5,12 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp index f13e29766..4ebf0512e 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp @@ -5,11 +5,14 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + + -

¿Está seguro de que quiere eliminar su oferta?

+

¿Está seguro de que quiere eliminar su oferta?

diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp index 76661379a..5f0a64c20 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp @@ -5,6 +5,8 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> + @@ -15,7 +17,7 @@
+ Ofertas de plato específico @@ -39,7 +41,7 @@ Ofertas de franja horaria -

+

:

No hay ninguna oferta por tiempo empleado en comer activa.

@@ -90,22 +92,29 @@ - +
+ +
+ +
- + +
- + +
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp index 829621d5e..61a4adb3e 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp @@ -5,15 +5,21 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

+ + + + @@ -50,6 +56,10 @@ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp index cc91be345..187c54e96 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp @@ -5,10 +5,11 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp index facc40f1a..32721051c 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp @@ -5,11 +5,13 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

¿Está seguro de que quiere eliminar su oferta?

+

¿Está seguro de que quiere eliminar su oferta?

diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp index 984ad9ecd..a59648ade 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp @@ -5,6 +5,7 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -15,7 +16,7 @@ + Ofertas de plato específico @@ -40,7 +41,7 @@
-

+

:

No hay ninguna oferta por franja horaria activa.

@@ -90,22 +91,29 @@ - +
+ +
+ +
- + +
- + - +
+ - + +
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp index 9fccf28f4..a1307692d 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp @@ -5,15 +5,21 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

:

+ + + + @@ -38,6 +44,10 @@ + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp index 93f628af0..ae1b43151 100644 --- a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp @@ -5,15 +5,17 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

- Nueva Reseña +

+ Nueva Reseña

- +
@@ -23,10 +25,10 @@ + Crear reseña - +
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp b/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp index 394e6fbbe..c443cbd10 100644 --- a/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp +++ b/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp @@ -4,10 +4,11 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

@@ -22,7 +23,7 @@ - + @@ -56,21 +57,28 @@
- +
+ +
+ +
- + +
- + +
- + +
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp b/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp index b13c31115..a63ebe277 100644 --- a/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp @@ -5,11 +5,12 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

@@ -35,7 +36,7 @@ + Editar opinión diff --git a/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp b/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp index 124ed5701..995214f4d 100644 --- a/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp +++ b/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -273,31 +274,25 @@ -

+
+

+
- -
- - -
+ - - @@ -305,11 +300,23 @@ name="food" /> - - - +
+ +
+ +
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp b/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp index a2127d97f..7736671d2 100644 --- a/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp +++ b/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp @@ -6,6 +6,7 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> @@ -273,33 +274,41 @@ -

- +
+

+

+
+ id="add-user-form">
- -
- - -
+ - - +
+ +
+ +
+
+
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp index ecfc2e070..65bee26ca 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp @@ -5,10 +5,11 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %> -

+

diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp index 6c04207c7..d1b108ec4 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosDisable.jsp @@ -5,11 +5,14 @@ <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags"%> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ page contentType="text/html; charset=UTF-8" %> + + -

¿Está seguro de que quiere eliminar su cuenta?

+

¿Está seguro de que quiere eliminar su cuenta?

diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp index e1c56b62e..0c76a79da 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosList.jsp @@ -5,13 +5,15 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

-

No hay ningún usuario.

+

No hay ningún usuario.

diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp index ae1cb8d4c..18f53193f 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp @@ -5,11 +5,13 @@ <%@ 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" %> +<%@ page contentType="text/html; charset=UTF-8" %> + -

+

diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 18a6e579c..e35be5a75 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -7,6 +7,7 @@ <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> +<%@ page contentType="text/html; charset=UTF-8" %>

diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index 4ed9e3984..fcb62075c 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -57,7 +57,7 @@ - Registro de ofertas + Historial de ofertas