From b54203910ac64a87ed83f3c65cd1de40a0d16a9f Mon Sep 17 00:00:00 2001
From: "gabgutpri@alum.us.es" <gabgutpri@alum.us.es>
Date: Mon, 12 Apr 2021 20:05:21 +0200
Subject: [PATCH 1/8] Filtro municipios sin select acabado

---
 .../springframework/cheapy/model/Client.java  | 106 ++++++++++--------
 .../cheapy/model/Municipio.java               |   7 ++
 .../repository/FoodOfferRepository.java       |  10 +-
 .../cheapy/service/FoodOfferService.java      |  16 ++-
 .../cheapy/web/OfertaController.java          |  34 +++++-
 src/main/resources/db/mysql/data.sql          |   4 +-
 .../webapp/WEB-INF/jsp/offers/offersList.jsp  |  16 ++-
 7 files changed, 131 insertions(+), 62 deletions(-)
 create mode 100644 src/main/java/org/springframework/cheapy/model/Municipio.java

diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java
index 41d81ca19..e968f4a10 100644
--- a/src/main/java/org/springframework/cheapy/model/Client.java
+++ b/src/main/java/org/springframework/cheapy/model/Client.java
@@ -1,3 +1,4 @@
+
 package org.springframework.cheapy.model;
 
 import java.time.LocalTime;
@@ -5,6 +6,8 @@ import java.util.List;
 
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
@@ -19,170 +22,183 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Table(name = "clients")
 public class Client extends BaseEntity {
 
-	private static final long serialVersionUID = 1L;
+	private static final long	serialVersionUID	= 1L;
 
 	// (id, name, email, address, init, finish, telephone, description, code, food,
 	// usuar)
 
 	@NotEmpty
-	private String name;
+	private String				name;
 
 	@NotEmpty
-	private String email;
+	private String				email;
 
 	@NotEmpty
-	private String address;
+	private String				address;
+
+	@NotNull
+	@Enumerated(value = EnumType.STRING)
+	private Municipio			municipio;
 
 	// Hora de apertura del local
 	@DateTimeFormat(pattern = "HH:mm")
 	@NotNull(message = "Debe introducir una hora de apertura")
-	private LocalTime init;
+	private LocalTime			init;
 
 	// Hora de cierre del local
 	@DateTimeFormat(pattern = "HH:mm")
 	@NotNull(message = "Debe introducir una hora de cierre")
-	private LocalTime finish;
+	private LocalTime			finish;
 
 	@NotEmpty
 	@Digits(fraction = 0, integer = 10)
-	private String telephone;
+	private String				telephone;
 
 	@NotEmpty
-	private String description;
+	private String				description;
 
 	// Codigo de activacion de cuenta
 	@NotEmpty
-	private String code;
+	private String				code;
 
 	@NotEmpty
-	private String food;
+	private String				food;
 
 	@OneToOne(cascade = CascadeType.ALL)
 	@JoinColumn(name = "username", referencedColumnName = "username")
-	private User usuar;
+	private User				usuar;
 
 	@OneToMany
-	private List<FoodOffer> foodOffers;
+	private List<FoodOffer>		foodOffers;
 
 	@OneToMany
-	private List<NuOffer> nuOffers;
+	private List<NuOffer>		nuOffers;
 
 	@OneToMany
-	private List<SpeedOffer> speedOffers;
+	private List<SpeedOffer>	speedOffers;
 
 	@OneToMany
-	private List<TimeOffer> timeOffers;
+	private List<TimeOffer>		timeOffers;
+
 
 	public String getName() {
-		return name;
+		return this.name;
 	}
 
-	public void setName(String name) {
+	public void setName(final String name) {
 		this.name = name;
 	}
 
 	public String getEmail() {
-		return email;
+		return this.email;
 	}
 
-	public void setEmail(String email) {
+	public void setEmail(final String email) {
 		this.email = email;
 	}
 
 	public String getAddress() {
-		return address;
+		return this.address;
 	}
 
-	public void setAddress(String address) {
+	public void setAddress(final String address) {
 		this.address = address;
 	}
 
-	public LocalTime getInit() {
-		return init;
+	public Municipio getMunicipio() {
+		return this.municipio;
 	}
 
-	public void setInit(LocalTime init) {
+	public void setMunicipio(final Municipio municipio) {
+		this.municipio = municipio;
+	}
+
+	public LocalTime getInit() {
+		return this.init;
+	}
+
+	public void setInit(final LocalTime init) {
 		this.init = init;
 	}
 
 	public LocalTime getFinish() {
-		return finish;
+		return this.finish;
 	}
 
-	public void setFinish(LocalTime finish) {
+	public void setFinish(final LocalTime finish) {
 		this.finish = finish;
 	}
 
 	public String getTelephone() {
-		return telephone;
+		return this.telephone;
 	}
 
-	public void setTelephone(String telephone) {
+	public void setTelephone(final String telephone) {
 		this.telephone = telephone;
 	}
 
 	public String getDescription() {
-		return description;
+		return this.description;
 	}
 
-	public void setDescription(String description) {
+	public void setDescription(final String description) {
 		this.description = description;
 	}
 
 	public String getCode() {
-		return code;
+		return this.code;
 	}
 
-	public void setCode(String code) {
+	public void setCode(final String code) {
 		this.code = code;
 	}
 
 	public String getFood() {
-		return food;
+		return this.food;
 	}
 
-	public void setFood(String food) {
+	public void setFood(final String food) {
 		this.food = food;
 	}
 
 	public User getUsuar() {
-		return usuar;
+		return this.usuar;
 	}
 
-	public void setUsuar(User usuar) {
+	public void setUsuar(final User usuar) {
 		this.usuar = usuar;
 	}
 
 	public List<FoodOffer> getFoodOffers() {
-		return foodOffers;
+		return this.foodOffers;
 	}
 
-	public void setFoodOffers(List<FoodOffer> foodOffers) {
+	public void setFoodOffers(final List<FoodOffer> foodOffers) {
 		this.foodOffers = foodOffers;
 	}
 
 	public List<NuOffer> getNuOffers() {
-		return nuOffers;
+		return this.nuOffers;
 	}
 
-	public void setNuOffers(List<NuOffer> nuOffers) {
+	public void setNuOffers(final List<NuOffer> nuOffers) {
 		this.nuOffers = nuOffers;
 	}
 
 	public List<SpeedOffer> getSpeedOffers() {
-		return speedOffers;
+		return this.speedOffers;
 	}
 
-	public void setSpeedOffers(List<SpeedOffer> speedOffers) {
+	public void setSpeedOffers(final List<SpeedOffer> speedOffers) {
 		this.speedOffers = speedOffers;
 	}
 
 	public List<TimeOffer> getTimeOffers() {
-		return timeOffers;
+		return this.timeOffers;
 	}
 
-	public void setTimeOffers(List<TimeOffer> timeOffers) {
+	public void setTimeOffers(final List<TimeOffer> timeOffers) {
 		this.timeOffers = timeOffers;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/src/main/java/org/springframework/cheapy/model/Municipio.java b/src/main/java/org/springframework/cheapy/model/Municipio.java
new file mode 100644
index 000000000..d643f29ed
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/model/Municipio.java
@@ -0,0 +1,7 @@
+
+package org.springframework.cheapy.model;
+
+public enum Municipio {
+	Dos_Hermanas, Sevilla
+
+}
diff --git a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
index 9a277197d..65682ac84 100644
--- a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
@@ -34,13 +34,17 @@ public interface FoodOfferRepository extends PagingAndSortingRepository<FoodOffe
 	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.id =:id AND foodOffer.status!= 'inactive'")
 	@Transactional(readOnly = true)
 	List<FoodOffer> findFoodOfferActOclByUserId(@Param("id") Integer id);
-	
+
 	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.name LIKE :name AND foodOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<FoodOffer> findFoodOfferByClientName(String name);
-	
+
 	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.food LIKE :name AND foodOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<FoodOffer> findFoodOfferByClientFood(String name);
-	
+
+	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.municipio =:municip AND foodOffer.status= 'active'")
+	@Transactional(readOnly = true)
+	List<FoodOffer> findFoodOfferByClientPlace(String municip);
+
 }
diff --git a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
index eb0a85b14..fe6675191 100644
--- a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
+++ b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
@@ -45,14 +45,18 @@ public class FoodOfferService {
 	public List<FoodOffer> findFoodOfferActOclByUserId(final int id) {
 		return this.foodOfferRepository.findFoodOfferActOclByUserId(id);
 	}
-	
-	public List<FoodOffer> findFoodOfferByClientName(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<FoodOffer> findFoodOfferByClientName(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.foodOfferRepository.findFoodOfferByClientName(nameEdit);
 	}
-	
-	public List<FoodOffer> findFoodOfferByClientFood(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<FoodOffer> findFoodOfferByClientFood(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.foodOfferRepository.findFoodOfferByClientFood(nameEdit);
 	}
+
+	public List<FoodOffer> findFoodOfferByClientPlace(final String municip) {
+		return this.foodOfferRepository.findFoodOfferByClientPlace(municip);
+	}
 }
diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java
index b2b302cf9..89d4aa4c5 100644
--- a/src/main/java/org/springframework/cheapy/web/OfertaController.java
+++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java
@@ -6,6 +6,7 @@ import java.util.List;
 import java.util.Map;
 
 import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.NuOffer;
 import org.springframework.cheapy.model.SpeedOffer;
 import org.springframework.cheapy.model.TimeOffer;
@@ -52,15 +53,18 @@ public class OfertaController {
 		model.put("speedOfferLs", speedOfferLs);
 		model.put("timeOfferLs", timeOfferLs);
 
+		// Añade la lista de municipios al desplegable
+		model.put("municipios", Municipio.values());
+
 		//Se añade formateador de fecha al modelo
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 
 		return "offers/offersList";
 
 	}
-	
+
 	@GetMapping("/offersByName")
-	public String processFindFormByName(final Map<String, Object> model, String name) {
+	public String processFindFormByName(final Map<String, Object> model, final String name) {
 
 		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientName(name);
 		List<NuOffer> nuOfferLs = this.nuOfferService.findNuOfferByClientName(name);
@@ -71,15 +75,18 @@ public class OfertaController {
 		model.put("speedOfferLs", speedOfferLs);
 		model.put("timeOfferLs", timeOfferLs);
 
+		// Añade la lista de municipios al desplegable
+		model.put("municipios", Municipio.values());
+
 		//Se añade formateador de fecha al modelo
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 
 		return "offers/offersListSearch";
 
 	}
-	
+
 	@GetMapping("/offersByFood")
-	public String processFindFormByFood(final Map<String, Object> model, String name) {
+	public String processFindFormByFood(final Map<String, Object> model, final String name) {
 
 		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientFood(name);
 		List<NuOffer> nuOfferLs = this.nuOfferService.findNuOfferByClientFood(name);
@@ -90,6 +97,25 @@ public class OfertaController {
 		model.put("speedOfferLs", speedOfferLs);
 		model.put("timeOfferLs", timeOfferLs);
 
+		// Añade la lista de municipios al desplegable
+		model.put("municipios", Municipio.values());
+
+		//Se añade formateador de fecha al modelo
+		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
+
+		return "offers/offersListSearch";
+
+	}
+
+	@GetMapping("/offersByPlace")
+	public String processFindFormByPlace(final Map<String, Object> model, final String municip) {
+
+		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientPlace(municip);
+		model.put("foodOfferLs", foodOfferLs);
+
+		// Añade la lista de municipios al desplegable
+		model.put("municipios", Municipio.values());
+
 		//Se añade formateador de fecha al modelo
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 
diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql
index f32637462..cfc9f4978 100644
--- a/src/main/resources/db/mysql/data.sql
+++ b/src/main/resources/db/mysql/data.sql
@@ -19,8 +19,8 @@ INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, us
 INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, username) VALUES (3, 'Lolo', 'Lopez', '25486596L', 'C/Macarena', '690670547' ,'Lolo@gmail.com','lolo');
 INSERT INTO usuarios (id, nombre, apellidos, dni, direccion, telefono, email, username) VALUES (4, 'Pepe', 'Lopez', '12456776V', 'C/Macarena', '690670547', 'Pepe@gmail.com','pepe');
 
-INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis','10:00:00','22:00:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
-INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username)  VALUES (2,'bar david','david@gmail.com','C/Sevilla','09:30:00','22:00:00','608726190', 'description 2', 'code2', 'americana','david');
+INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis', 'Sevilla','10:00:00','22:00:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
+INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, code, food, username)  VALUES (2,'bar david','david@gmail.com', 'C/Sevilla', 'Dos_Hermanas','09:30:00','22:00:00','608726190', 'description 2', 'code2', 'americana','david');
 
 INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-14 12:00:00', '2021-08-15 12:00:00', 'FO-1', 'inactive', 1, 'macarrones', 15);
 INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-15 12:00:00', '2021-08-16 12:00:00', 'FO-2', 'active', 1, 'macarrones con tomate', 10);
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
index 1bef89a39..275ba308b 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
@@ -41,12 +41,20 @@
 	
 	<form class="example" action="/offersByName">
   		<input type="text" name="name">
-  		<button type="submit"><i class="fa fa-search"></i></button>
+  		<button type="submit">Buscar por nombre</button>
 	</form>
 	
 	<form class="example" action="/offersByFood">
   		<input type="text" name="name">
-  		<button type="submit"><i class="fa fa-search"></i></button>
+  		<button type="submit">Buscar por comida</button>
+	</form>
+	
+	<form class="example" action="/offersByPlace">
+		<select name="municipios">
+			<option value="" label="Chose Type" />
+        	<options value="${municipios}"/>
+		<select>
+	<button type="submit">Buscar por municipio</button>
 	</form>
 	
 
@@ -67,6 +75,7 @@
         	<th><fmt:message key="discount"/></th>
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="municipio"/></th>
             
             <th> </th>
         </tr>
@@ -89,6 +98,9 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(foodOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${foodOffer.client.municipio}"/>
+                </td>
                 
                 <td>
 	                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">

From 3e9507e9a903319b337a86379d9a7e70f1905108 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Franco=20S=C3=A1nchez?=
 <56022165+pabfrasan@users.noreply.github.com>
Date: Wed, 14 Apr 2021 20:57:50 +0200
Subject: [PATCH 2/8] Arreglo en travis

Eliminado "apt-get update" al dar un error inesperado
---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 4957b38a3..3698c8809 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,6 @@ before_install:
   - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url)
   - chmod +x mvnw
   - mysql -e 'CREATE DATABASE cheapy;'
-  - sudo apt-get update
 after_success:
   - ls
   - ls target

From ec1aa037504b32222dfd1f0f7c21ea28f598d77d Mon Sep 17 00:00:00 2001
From: "gabgutpri@alum.us.es" <gabgutpri@alum.us.es>
Date: Thu, 15 Apr 2021 12:57:11 +0200
Subject: [PATCH 3/8] Filtro por municipio

---
 .../cheapy/repository/FoodOfferRepository.java  |  5 +++--
 .../cheapy/repository/NuOfferRepository.java    | 10 ++++++++--
 .../cheapy/repository/SpeedOfferRepository.java |  9 +++++++--
 .../cheapy/repository/TimeOfferRepository.java  |  9 +++++++--
 .../cheapy/service/FoodOfferService.java        |  3 ++-
 .../cheapy/service/NuOfferService.java          | 17 +++++++++++------
 .../cheapy/service/SpeedOfferService.java       | 17 +++++++++++------
 .../cheapy/service/TimeOfferService.java        | 17 +++++++++++------
 .../cheapy/web/OfertaController.java            | 13 +++++++++++--
 .../webapp/WEB-INF/jsp/offers/offersList.jsp    | 13 +++++++------
 10 files changed, 78 insertions(+), 35 deletions(-)

diff --git a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
index 65682ac84..a2aec96ef 100644
--- a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java
@@ -4,6 +4,7 @@ package org.springframework.cheapy.repository;
 import java.util.List;
 
 import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.Query;
@@ -43,8 +44,8 @@ public interface FoodOfferRepository extends PagingAndSortingRepository<FoodOffe
 	@Transactional(readOnly = true)
 	List<FoodOffer> findFoodOfferByClientFood(String name);
 
-	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.municipio =:municip AND foodOffer.status= 'active'")
+	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.municipio =:municipio AND foodOffer.status= 'active'")
 	@Transactional(readOnly = true)
-	List<FoodOffer> findFoodOfferByClientPlace(String municip);
+	List<FoodOffer> findFoodOfferByClientPlace(Municipio municipio);
 
 }
diff --git a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java
index d5631928e..e6ef658ff 100644
--- a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java
@@ -2,6 +2,8 @@
 package org.springframework.cheapy.repository;
 
 import java.util.List;
+
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.NuOffer;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.data.domain.Pageable;
@@ -31,12 +33,16 @@ public interface NuOfferRepository extends PagingAndSortingRepository<NuOffer, I
 	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.id =:id AND nuOffer.status!= 'inactive'")
 	@Transactional(readOnly = true)
 	List<NuOffer> findNuOfferActOclByUserId(@Param("id") Integer id);
-	
+
 	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.name LIKE :name AND nuOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<NuOffer> findNuOfferByClientName(String name);
-	
+
 	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.food LIKE :name AND nuOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<NuOffer> findNuOfferByClientFood(String name);
+
+	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.municipio =:municipio AND nuOffer.status= 'active'")
+	@Transactional(readOnly = true)
+	List<NuOffer> findNuOfferByClientPlace(Municipio municipio);
 }
diff --git a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java
index b89ce1569..f49dd1469 100644
--- a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java
@@ -3,6 +3,7 @@ package org.springframework.cheapy.repository;
 
 import java.util.List;
 
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.SpeedOffer;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.data.domain.Pageable;
@@ -34,12 +35,16 @@ public interface SpeedOfferRepository extends PagingAndSortingRepository<SpeedOf
 	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.id =:id AND speedOffer.status!= 'inactive'")
 	@Transactional(readOnly = true)
 	List<SpeedOffer> findSpeedOfferActOclByUserId(@Param("id") Integer id);
-	
+
 	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.name LIKE :name AND speedOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<SpeedOffer> findSpeedOfferByClientName(String name);
-	
+
 	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.food LIKE :name AND speedOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<SpeedOffer> findSpeedOfferByClientFood(String name);
+
+	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.municipio =:municipio AND speedOffer.status= 'active'")
+	@Transactional(readOnly = true)
+	List<SpeedOffer> findSpeedOfferByClientPlace(Municipio municipio);
 }
diff --git a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java
index b031d789c..e3cdd669d 100644
--- a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java
+++ b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java
@@ -4,6 +4,7 @@ package org.springframework.cheapy.repository;
 import java.util.List;
 
 import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.cheapy.model.TimeOffer;
 import org.springframework.data.domain.Pageable;
@@ -33,12 +34,16 @@ public interface TimeOfferRepository extends PagingAndSortingRepository<FoodOffe
 	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.id =:id AND timeOffer.status!= 'inactive'")
 	@Transactional(readOnly = true)
 	List<TimeOffer> findTimeOfferActOclByUserId(@Param("id") Integer id);
-	
+
 	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.name LIKE :name AND timeOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<TimeOffer> findTimeOfferByClientName(String name);
-	
+
 	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.food LIKE :name AND timeOffer.status= 'active'")
 	@Transactional(readOnly = true)
 	List<TimeOffer> findTimeOfferByClientFood(String name);
+
+	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.municipio =:municipio AND timeOffer.status= 'active'")
+	@Transactional(readOnly = true)
+	List<TimeOffer> findTimeOfferByClientPlace(Municipio municipio);
 }
diff --git a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
index fe6675191..0e4c12e50 100644
--- a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
+++ b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java
@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.cheapy.repository.FoodOfferRepository;
 import org.springframework.dao.DataAccessException;
@@ -56,7 +57,7 @@ public class FoodOfferService {
 		return this.foodOfferRepository.findFoodOfferByClientFood(nameEdit);
 	}
 
-	public List<FoodOffer> findFoodOfferByClientPlace(final String municip) {
+	public List<FoodOffer> findFoodOfferByClientPlace(final Municipio municip) {
 		return this.foodOfferRepository.findFoodOfferByClientPlace(municip);
 	}
 }
diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java
index be77144c1..7bf4913b3 100644
--- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java
+++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java
@@ -4,6 +4,7 @@ package org.springframework.cheapy.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.NuOffer;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.cheapy.repository.NuOfferRepository;
@@ -54,14 +55,18 @@ public class NuOfferService {
 	public List<NuOffer> findNuOfferActOclByUserId(final int id) {
 		return this.nuOfferRepository.findNuOfferActOclByUserId(id);
 	}
-	
-	public List<NuOffer> findNuOfferByClientName(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<NuOffer> findNuOfferByClientName(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.nuOfferRepository.findNuOfferByClientName(nameEdit);
 	}
-	
-	public List<NuOffer> findNuOfferByClientFood(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<NuOffer> findNuOfferByClientFood(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.nuOfferRepository.findNuOfferByClientFood(nameEdit);
 	}
+
+	public List<NuOffer> findNuOfferByClientPlace(final Municipio mun) {
+		return this.nuOfferRepository.findNuOfferByClientPlace(mun);
+	}
 }
diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java
index b9e5ffc2a..aeb2f630d 100644
--- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java
+++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java
@@ -4,6 +4,7 @@ package org.springframework.cheapy.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.SpeedOffer;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.cheapy.repository.SpeedOfferRepository;
@@ -49,14 +50,18 @@ public class SpeedOfferService {
 	public List<SpeedOffer> findSpeedOfferActOclByUserId(final int id) {
 		return this.speedOfferRepository.findSpeedOfferActOclByUserId(id);
 	}
-	
-	public List<SpeedOffer> findSpeedOfferByClientName(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<SpeedOffer> findSpeedOfferByClientName(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.speedOfferRepository.findSpeedOfferByClientName(nameEdit);
 	}
-	
-	public List<SpeedOffer> findSpeedOfferByClientFood(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<SpeedOffer> findSpeedOfferByClientFood(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.speedOfferRepository.findSpeedOfferByClientFood(nameEdit);
 	}
+
+	public List<SpeedOffer> findSpeedOfferByClientPlace(final Municipio mun) {
+		return this.speedOfferRepository.findSpeedOfferByClientPlace(mun);
+	}
 }
diff --git a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java
index 4859bca53..68881863b 100644
--- a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java
+++ b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java
@@ -4,6 +4,7 @@ package org.springframework.cheapy.service;
 import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.StatusOffer;
 import org.springframework.cheapy.model.TimeOffer;
 import org.springframework.cheapy.repository.TimeOfferRepository;
@@ -45,14 +46,18 @@ public class TimeOfferService {
 	public List<TimeOffer> findTimeOfferActOclByUserId(final int id) {
 		return this.timeOfferRepository.findTimeOfferActOclByUserId(id);
 	}
-	
-	public List<TimeOffer> findTimeOfferByClientName(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<TimeOffer> findTimeOfferByClientName(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.timeOfferRepository.findTimeOfferByClientName(nameEdit);
 	}
-	
-	public List<TimeOffer> findTimeOfferByClientFood(String name) {
-		String nameEdit = "%"+name+"%";
+
+	public List<TimeOffer> findTimeOfferByClientFood(final String name) {
+		String nameEdit = "%" + name + "%";
 		return this.timeOfferRepository.findTimeOfferByClientFood(nameEdit);
 	}
+
+	public List<TimeOffer> findTimeOfferByClientPlace(final Municipio mun) {
+		return this.timeOfferRepository.findTimeOfferByClientPlace(mun);
+	}
 }
diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java
index 89d4aa4c5..7a069f3ef 100644
--- a/src/main/java/org/springframework/cheapy/web/OfertaController.java
+++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java
@@ -5,6 +5,8 @@ import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Map;
 
+import javax.servlet.http.HttpServletRequest;
+
 import org.springframework.cheapy.model.FoodOffer;
 import org.springframework.cheapy.model.Municipio;
 import org.springframework.cheapy.model.NuOffer;
@@ -108,10 +110,17 @@ public class OfertaController {
 	}
 
 	@GetMapping("/offersByPlace")
-	public String processFindFormByPlace(final Map<String, Object> model, final String municip) {
+	public String processFindFormByPlace(final Map<String, Object> model, final HttpServletRequest request) {
+		Municipio mun = Municipio.valueOf(request.getParameter("municipio"));
 
-		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientPlace(municip);
+		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientPlace(mun);
+		List<NuOffer> nuOfferLs = this.nuOfferService.findNuOfferByClientPlace(mun);
+		List<SpeedOffer> speedOfferLs = this.speedOfferService.findSpeedOfferByClientPlace(mun);
+		List<TimeOffer> timeOfferLs = this.timeOfferService.findTimeOfferByClientPlace(mun);
 		model.put("foodOfferLs", foodOfferLs);
+		model.put("nuOfferLs", nuOfferLs);
+		model.put("speedOfferLs", speedOfferLs);
+		model.put("timeOfferLs", timeOfferLs);
 
 		// Añade la lista de municipios al desplegable
 		model.put("municipios", Municipio.values());
diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
index 275ba308b..56e7fcc83 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp
@@ -50,13 +50,14 @@
 	</form>
 	
 	<form class="example" action="/offersByPlace">
-		<select name="municipios">
-			<option value="" label="Chose Type" />
-        	<options value="${municipios}"/>
-		<select>
-	<button type="submit">Buscar por municipio</button>
+		<select name="municipio">
+		<option value="">Escoge municipio</option>
+		<c:forEach items="${municipios}" var="entry">
+			<option value="${entry}">${entry}</option>
+		</c:forEach>
+		</select>
+		<button type="submit">Buscar por municipio</button>
 	</form>
-	
 
     <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
     

From 3f91497ee6df6096f585d286179313ace0890329 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Franco=20S=C3=A1nchez?=
 <56022165+pabfrasan@users.noreply.github.com>
Date: Thu, 15 Apr 2021 21:50:02 +0200
Subject: [PATCH 4/8] =?UTF-8?q?A=C3=B1adido=20las=20estrellas=20a=20las=20?=
 =?UTF-8?q?rese=C3=B1as?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../springframework/cheapy/model/Client.java  |  7 ----
 src/main/less/cheapy.less                     |  1 +
 src/main/less/starRating.less                 | 40 +++++++++++++++++++
 .../jsp/reviews/createOrUpdateReviewForm.jsp  |  3 +-
 .../WEB-INF/jsp/reviews/reviewsList.jsp       |  8 +++-
 .../WEB-INF/jsp/reviews/reviewsShow.jsp       |  9 +++--
 src/main/webapp/WEB-INF/tags/ratingStar.tag   | 37 +++++++++++++++++
 src/main/webapp/WEB-INF/tags/showStars.tag    | 18 +++++++++
 8 files changed, 111 insertions(+), 12 deletions(-)
 create mode 100644 src/main/less/starRating.less
 create mode 100644 src/main/webapp/WEB-INF/tags/ratingStar.tag
 create mode 100644 src/main/webapp/WEB-INF/tags/showStars.tag

diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java
index e9f56687d..6f4533166 100644
--- a/src/main/java/org/springframework/cheapy/model/Client.java
+++ b/src/main/java/org/springframework/cheapy/model/Client.java
@@ -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/less/cheapy.less b/src/main/less/cheapy.less
index a6a211767..6e05e3f98 100644
--- a/src/main/less/cheapy.less
+++ b/src/main/less/cheapy.less
@@ -642,3 +642,4 @@ hr {
 @import "typography.less";
 @import "header.less";
 @import "responsive.less";
+@import "starRating.less"
diff --git a/src/main/less/starRating.less b/src/main/less/starRating.less
new file mode 100644
index 000000000..0cf338fc6
--- /dev/null
+++ b/src/main/less/starRating.less
@@ -0,0 +1,40 @@
+.rating {
+        display: flex;
+        flex-direction: row-reverse;
+        justify-content: flex-end
+    }
+    
+    .rating>input {
+        display: none
+    }
+    
+    .rating>label {
+        position: relative;
+        width: 1em;
+        font-size: 200%;
+        color: #FFD600;
+        cursor: pointer
+    }
+    
+    .rating>label::before {
+        content: "\2605";
+        position: absolute;
+        opacity: 0
+    }
+    
+    .rating>label:hover:before,
+    .rating>label:hover~label:before {
+        opacity: 1 !important
+    }
+    
+    .rating>input:checked~label:before {
+        opacity: 1
+    }
+    
+    .rating:hover>input:checked~label:before {
+        opacity: 0.4
+    }
+
+
+    
+  
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
index 93f628af0..ac2b3af7a 100644
--- a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
@@ -14,7 +14,8 @@
         <div class="form-group has-feedback">
         	<form:hidden path="id"/>
             <cheapy:textAreaField label="Opinión" name="opinion"/>
-            <cheapy:inputField label="Estrellas" name="stars"/>
+           <!-- <cheapy:inputField label="Estrellas" name="stars"/>  -->
+            <cheapy:ratingStar label="Valoración" name="stars" disabled="false"></cheapy:ratingStar>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp b/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp
index 394e6fbbe..da8323d41 100644
--- a/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/reviews/reviewsList.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" %>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="reviews">
@@ -26,6 +27,7 @@
 	        </c:when>
 	        <c:otherwise>
 	        <c:forEach items="${reviewsLs}" var="review">
+	       
 	            <tr>
 	<!--                 <td> -->
 	<%--                     <c:out value="nombre por definir"/> <!-- ${review.usuario.nombre},${review.usuario.apellidos}  --> --%>
@@ -34,7 +36,10 @@
 	                    <c:out value="${review.escritor.username}"/>
 	                </td>
 	                <td>
-	                    <c:out value="${review.stars}"/>
+	                
+	                    <!--<c:out value="${review.stars}"/> -->
+	                    <cheapy:showStars value='${review.stars}'></cheapy:showStars>
+
 	                </td>
 	                <td>
 	                    <c:out value="${review.opinion}"/>
@@ -51,6 +56,7 @@
 	                </td> 
 	                  
 	            </tr>
+	           
 	        </c:forEach>
 	        </c:otherwise>
         </c:choose>
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp b/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp
index b13c31115..bfbf2c3d1 100644
--- a/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/reviews/reviewsShow.jsp
@@ -6,25 +6,28 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 
 <cheapy:layout pageName="review">
 
     <h2 style="text-align:center;padding:5px"><fmt:message key="review"/></h2>
+    <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
 
 
     <table class="table table-striped" id="review-table">
         <tr>
             <th><fmt:message key="stars"/></th>
-            <td><c:out value="${review.stars}"/></td>
+           <!--  <td><c:out value="${review.stars}"/></td>--> 
+            <td><cheapy:ratingStar label="" name="stars" disabled="true"></cheapy:ratingStar></td>
         </tr>
         <tr>
             <th><fmt:message key="opinion"/></th>
             <td><c:out value="${review.opinion}"/></td>
         </tr>
-        
+    
     </table>
     
-    
+    </form:form>
 
 	<sec:authentication var="principal" property="principal" />
 	<div class="btns-edit">
diff --git a/src/main/webapp/WEB-INF/tags/ratingStar.tag b/src/main/webapp/WEB-INF/tags/ratingStar.tag
new file mode 100644
index 000000000..6d6bcb83d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/ratingStar.tag
@@ -0,0 +1,37 @@
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib uri = "http://java.sun.com/jsp/jstl/functions" prefix = "fn" %>
+<%@ attribute name="name" required="true" rtexprvalue="true"
+              description="Name of corresponding property in bean object" %>
+<%@ attribute name="disabled" required="false" rtexprvalue="true"
+              description="Disable the input" %>
+<%@ attribute name="label" required="true" rtexprvalue="true"
+              description="Label appears in red color if input is considered as invalid after submission" %>
+<%@ attribute name="placeholder" required="false" rtexprvalue="true"
+              description="Example for input field" %>
+
+<spring:bind path="${name}">
+    <c:set var="cssGroup" value="form-group ${status.error ? 'has-error' : '' }"/>
+    <c:set var="valid" value="${not status.error and not empty status.actualValue}"/>
+    <div class="${cssGroup}">
+    <c:if test="${fn:length(label)!=0}">
+        <label class="col-sm-2 control-label">${label}</label>
+	</c:if>
+        <div class="col-sm-10">
+			<div class="rating"> 
+				<form:radiobutton class="form-control" disabled="${disabled}" name="rating" value="5" id="5" path="${name}"/><label for="5"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+				<form:radiobutton class="form-control" disabled="${disabled}" name="rating" value="4" id="4" path="${name}"/><label for="4"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+				<form:radiobutton class="form-control" disabled="${disabled}" name="rating" value="3" id="3" path="${name}"/><label for="3"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+				<form:radiobutton class="form-control" disabled="${disabled}" name="rating" value="2" id="2" path="${name}"/><label for="2"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+				<form:radiobutton class="form-control" disabled="${disabled}" name="rating" value="1" id="1" path="${name}"/><label for="1"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label>
+				
+			</div>            
+		
+            <c:if test="${status.error}">
+                <span class="glyphicon glyphicon-remove form-control-feedback" aria-hidden="true"></span>
+                <span class="help-inline">${status.errorMessage}</span>
+            </c:if>
+        </div>
+    </div>
+</spring:bind>
diff --git a/src/main/webapp/WEB-INF/tags/showStars.tag b/src/main/webapp/WEB-INF/tags/showStars.tag
new file mode 100644
index 000000000..f68844d5c
--- /dev/null
+++ b/src/main/webapp/WEB-INF/tags/showStars.tag
@@ -0,0 +1,18 @@
+<%@tag import="com.sun.org.apache.xalan.internal.xsltc.compiler.sym"%>
+<%@ tag language="java" pageEncoding="ISO-8859-1"%>
+<%@ attribute name="value" required="true" rtexprvalue="true" type="Integer"
+              description="Number of starts" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<form>
+
+
+<div class="rating"> 
+	<input type="radio" class="form-control" disabled name="rating" value="5" id="5" <%= value.equals(5)  ?"checked='checked'" : ""%> /><label for="5"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 		
+	<input type="radio" class="form-control" disabled name="rating" value="4" id="4" <%= value.equals(4) ? "checked='checked'" : ""  %> /><label for="4"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+	<input type="radio" class="form-control" disabled name="rating" value="3" id="3" <%= value.equals(3)  ? "checked='checked'" : ""  %>/><label for="3"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+	<input type="radio" class="form-control" disabled name="rating" value="2" id="2" <%= value.equals(2)  ? "checked='checked'" : ""  %>/><label for="2"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+	<input type="radio" class="form-control" disabled name="rating" value="1" id="1" <%= value.equals(1)  ? "checked='checked'" : ""  %>/><label for="1"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 
+</div>       
+    
+</form>	

From b4bcec89d5c34569bde1523c20adaa5895c6e698 Mon Sep 17 00:00:00 2001
From: "gabgutpri@alum.us.es" <gabgutpri@alum.us.es>
Date: Fri, 16 Apr 2021 12:20:47 +0200
Subject: [PATCH 5/8] Solucionado buscar sin municipio

---
 .../cheapy/web/OfertaController.java          | 38 ++++++++++++-------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java
index 81fdae55e..e203cc1c3 100644
--- a/src/main/java/org/springframework/cheapy/web/OfertaController.java
+++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java
@@ -2,7 +2,6 @@
 package org.springframework.cheapy.web;
 
 import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -114,6 +113,17 @@ public class OfertaController {
 
 	@GetMapping("/offersByPlace")
 	public String processFindFormByPlace(final Map<String, Object> model, final HttpServletRequest request) {
+
+		if (request.getParameter("municipio").equals("") || request.getParameter("municipio").equals(null)) {
+			// Añade la lista de municipios al desplegable
+			model.put("municipios", Municipio.values());
+
+			//Se añade formateador de fecha al modelo
+			model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
+
+			return "redirect:/offers/";
+		}
+
 		Municipio mun = Municipio.valueOf(request.getParameter("municipio"));
 
 		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByClientPlace(mun);
@@ -161,30 +171,30 @@ public class OfertaController {
 
 		return "offers/offersCreate";
 	}
-	
+
 	@GetMapping("/offersRecord")
 	public String processOffersRecordForm(final Map<String, Object> model) {
-		
+
 		Pageable p = PageRequest.of(0, 3);
-		
+
 		Map<Offer, String> datos = new HashMap<Offer, String>();
-		
-		for(Offer of:this.foodOfferService.findAllFoodOffer(p)) {
+
+		for (Offer of : this.foodOfferService.findAllFoodOffer(p)) {
 			datos.put(of, "food");
 		}
-		
-		for(Offer of:this.nuOfferService.findAllNuOffer(p)) {
+
+		for (Offer of : this.nuOfferService.findAllNuOffer(p)) {
 			datos.put(of, "nu");
 		}
-		
-		for(Offer of:this.speedOfferService.findAllSpeedOffer(p)) {
+
+		for (Offer of : this.speedOfferService.findAllSpeedOffer(p)) {
 			datos.put(of, "speed");
 		}
-		
-		for(Offer of:this.timeOfferService.findAllTimeOffer(p)) {
+
+		for (Offer of : this.timeOfferService.findAllTimeOffer(p)) {
 			datos.put(of, "time");
 		}
-		
+
 		model.put("datos", datos);
 
 		//Se añade formateador de fecha al modelo
@@ -192,7 +202,7 @@ public class OfertaController {
 
 		return "offers/offersRecordList";
 	}
-	
+
 	//	@GetMapping("/owners/{ownerId}/edit")
 	//	public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) {
 	//		Owner owner = this.ownerService.findOwnerById(ownerId);

From 0a4db394c2e1e2ddd09ed21ea5b638322bb545a6 Mon Sep 17 00:00:00 2001
From: David <davsotpon@alum.us.es>
Date: Fri, 16 Apr 2021 14:36:28 +0200
Subject: [PATCH 6/8] =?UTF-8?q?Intento=20de=20arreglo=20de=20la=20codifica?=
 =?UTF-8?q?ci=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<FoodOffer, Integer> {
+public interface TimeOfferRepository extends PagingAndSortingRepository<TimeOffer, Integer> {
 
 	TimeOffer findTimeOfferById(int timeOfferId);
 
@@ -21,7 +21,7 @@ public interface TimeOfferRepository extends PagingAndSortingRepository<FoodOffe
 	@Transactional(readOnly = true)
 	List<TimeOffer> 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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere activar esta cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere activar esta cuenta?</em></h2>
 
       		<form:form modelAttribute="client" class="form-horizontal">
 
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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
       		
       		<form:form modelAttribute="client" class="form-horizontal">
             
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="client"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="client"/></h2>
 
 
 	
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="clients">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="clients"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="clients"/></h2>
     
 	<c:if test="${empty clientLs }">
 		<p id="vacio" >No hay ningun Cliente.</p>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="clients">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <fmt:message key="client"/>
     </h2>
     
     <form:form modelAttribute="client" class="form-horizontal" id="add-client-form">
         <div class="form-group has-feedback">
 			                
-            <cheapy:passwordField label="Contraseña" placeholder="Restaurante pepito" name="usuar.password"/>		
+            <cheapy:passwordField label="Contrase�a" placeholder="Restaurante pepito" name="usuar.password"/>		
             <cheapy:inputField label="Hora de inicio" placeholder="HH:mm" name="init"/>
             <cheapy:inputField label="Hora de fin" placeholder="HH:mm" name="finish"/>
             <cheapy:inputField label="Nombre" placeholder="Restaurante pepito" name="name"/>
             <cheapy:inputField label="Email" placeholder="" name="email"/>
-            <cheapy:inputField label="Dirección" placeholder="" name="address"/>
-            <div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
-            <cheapy:inputField label="Teléfono" placeholder="" name="telephone"/>
-            <cheapy:inputField label="descripción" placeholder="" name="description"/>
+            <cheapy:inputField label="Direcci�n" placeholder="" name="address"/>           
+            <cheapy:inputField label="Tel�fono" placeholder="" name="telephone"/>
+            <cheapy:inputField label="descripci�n" placeholder="" name="description"/>
             <cheapy:inputField label="Comida" placeholder="food" name="food"/>
+            <div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio: </label>
+	            <div class="col-sm-10">
+					<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;">
+						<c:forEach items="${municipio}" var="entry">
+							<option value="${entry}">${entry.toString()}</option>
+						</c:forEach>
+					</select>
+				</div>
+			</div>
         </div>
         <div class="form-group">
             <div class="col-sm-offset-2 col-sm-10">
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="client">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="client"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="client"/></h2>
 
 
 	
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" %>
 
 <cheapy:layout pageName="error">
 	<h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>Algo malo ha pasado...</em></h2>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -284,7 +285,7 @@
 	    <div class="fadeIn first">
 	      <img src="/resources/images/Logo Cheapy.png" id="icon" />
 	      <c:if test= "${not empty param}" > 
-	      	<p class="text-danger"> El usuario y/o la contraseña son incorrectos </p> 
+	      	<p class="text-danger"> El usuario y/o la contraseña son incorrectos </p> 
 	      
 	      </c:if>
 	    </div>
@@ -292,16 +293,16 @@
 	    <!-- Login Form -->
 	    <form class='form-signin' action="/login" method='POST'>
 	      <input type="text" id="username" class="fadeIn second" name="username" placeholder="Usuario" required autofocus>
-	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="Contraseña" required>
+	      <input type="password" id="password" class="fadeIn third" name="password" placeholder="Contraseña" required>
 	      <sec:csrfInput />  
 	      <div style="text-align: center;">
-		  	<input type="submit" class="fadeIn fourth" value="Iniciar sesión">
+		  	<input type="submit" class="fadeIn fourth" value="Iniciar sesión">
 		  </div>
 	    </form>
 	
 	    <!-- Remind Passowrd 
 	    <div id="formFooter">
-	      <a class="underlineHover" href="#">¿Olvidó su contraseña?</a>
+	      <a class="underlineHover" href="#">¿Olvidó su contraseña?</a>
 	    </div>
 	-->
 	  </div>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${foodOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="foodOffer"/>
     </h2>
     
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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		<form:form modelAttribute="foodOffer" class="form-horizontal">
             
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas de plato especifico">
@@ -42,10 +43,10 @@
 		</div>
 	</div>
 	
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
     
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato espec�fico activa.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
     <table id="foodOfferTable" class="table table-striped">
@@ -57,6 +58,7 @@
         	<th><fmt:message key="discount"/></th>
             <th><fmt:message key="startDate"/></th>
             <th><fmt:message key="endDate"/></th>
+            <th><fmt:message key="municipio"/></th>
             
             <th> </th>
         </tr>
@@ -79,6 +81,9 @@
                 <td>
                     <c:out value="${localDateTimeFormat.format(foodOffer.end)}"/>
                 </td>
+                <td>
+                    <c:out value="${foodOffer.client.municipio}"/>
+                </td>
                 
                 <td>
 	                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
@@ -95,23 +100,33 @@
         </c:forEach>
         </tbody>
     </table>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <div>
     <c:if test='${page!=0}'>
+   	<div class="text-left">
     	<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>	
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(foodOfferLs) == 5}">
+    <div class="text-right">
+    	
     	<spring:url value="/offers/foodOfferList/{page}" var="foodOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. siguiente</button>
+    	<button type="button" class="btn-pag"  role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>	
 	</c:if>
+	</div>
     </c:if>
 	
 </cheapy:layout>
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="foodOffer">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffer"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:left; font-size:200%;  color: rgb(0, 64, 128); padding:10px; margin-bottom:20px;"><fmt:message key="foodOffer"/>:</h2>
 
 
 	
     <table class="table table-striped" id="foodOfferTable">
     	<thead>
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${foodOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(foodOffer.start)}"/></td>
@@ -31,6 +37,10 @@
             <th><fmt:message key="discount"/></th>
             <td><c:out value="${foodOffer.discount}%"/> </td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${foodOffer.client.municipio}"/> </td>
+        </tr>
 
         <tr>
             <th><fmt:message key="offerCode"/></th>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertasM">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+
+	
+
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato específico creada.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico creada.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
 		<div class="table-responsive">
@@ -21,6 +25,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/food/new" var="newFoodUrl">
 		    </spring:url>
 		    <!--  <a href="${fn:escapeXml(newFoodUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -41,6 +46,9 @@
 		                <td>
 		                    <c:out value="${foodOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${foodOffer.client.municipio}"/>
+		                </td>
 		                <td>
 			                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
 			                        <spring:param name="foodOfferId" value="${foodOffer.id}"/>
@@ -58,9 +66,9 @@
 		    </table>
 		</div>
     </c:if>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por número de comensales creada.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales creada.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
 		<div class="table-responsive">
@@ -71,6 +79,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/nu/new" var="newNuUrl">
 		    </spring:url>
 		    <!--  <a href="${fn:escapeXml(newNuUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -90,6 +99,9 @@
 		                <td>
 		                    <c:out value="${nuOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${nuOffer.client.municipio}"/>
+		                </td>
 		                <td>
 			                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
 			                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
@@ -107,7 +119,7 @@
     	</div>
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer creada.</p>
 	</c:if>
@@ -120,6 +132,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> <spring:url value="/offers/speed/new" var="newSpeedUrl">
 		    </spring:url>
 		   <!-- <a href="${fn:escapeXml(newSpeedUrl)}" class="btn btn-default">Nueva oferta</a></th>-->
@@ -139,6 +152,9 @@
 		                <td>
 		                    <c:out value="${speedOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${speedOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                    <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
 		                        <spring:param name="speedOfferId" value="${speedOffer.id}"/>
@@ -157,7 +173,7 @@
     	</div>
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria creada.</p>
 	</c:if>
@@ -170,6 +186,7 @@
 		            <th><fmt:message key="startDate"/></th>
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="status"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th><spring:url value="/offers/time/new" var="newTimeUrl">
 		    </spring:url>
 		    <!--<a href="${fn:escapeXml(newTimeUrl)}" class="btn btn-default">Nueva oferta</a> </th>-->
@@ -188,6 +205,9 @@
 		                <td>
 		                    <c:out value="${timeOffer.status}"/>
 		                </td>
+		                <td>
+		                    <c:out value="${timeOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
 		                        <spring:param name="timeOfferId" value="${timeOffer.id}"/>
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" %>
 
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
@@ -32,7 +33,7 @@
 <script src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/2.4.4/js/bootstrap-datetimepicker.min.js"></script>
 
 <cheapy:layout pageName="NumOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${nuOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="nuOffer"/>
     </h2>    
     
@@ -66,11 +67,11 @@
 			
 			<cheapy:inputField label="Fecha de Inicio" placeholder="dd/MM/yyyy HH:mm" name="start"/>
             <cheapy:inputField label="Fecha de Fin"  placeholder="dd/MM/yyyy HH:mm" name="end"/> 
-            <cheapy:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
+            <cheapy:inputField label="Número de comensales (nivel Oro)" placeholder="XX (Ej. 6)" name="gold"/>
             <cheapy:inputField label="Descuento de nivel oro" placeholder="XX% (Ej. 30)" name="discountGold"/>
-            <cheapy:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
+            <cheapy:inputField label="Número de comensales (nivel Plata)" placeholder="XX (Ej. 4)" name="silver"/>
             <cheapy:inputField label="Descuento de plata" placeholder="XX% (Ej. 15)" name="discountSilver"/>
-            <cheapy:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
+            <cheapy:inputField label="Número de comensales (nivel Bronce)" placeholder="XX (Ej. 2)" name="bronze"/>
 			<cheapy:inputField label="Descuento de bronce" placeholder="XX% (Ej. 5)" name="discountBronze"/>
  
             </div>
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" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="nuOfferDisable">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		 <form:form modelAttribute="nuOffer" class="form-horizontal">
 
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por numero de comensales">
@@ -15,7 +16,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -40,9 +41,9 @@
 		</div>
 	</div>
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por n�mero de comensales activa.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
     <table id="nuOfferTable" class="table table-striped">
@@ -90,22 +91,31 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>	
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
+    
     <c:if test="${fn:length(nuOfferLs) == 5}">
+    <div class="text-right">
     	<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 	
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="nuOffer">
 
-	<h2 style="text-align: center; padding: 5px">
+	<h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
 		<fmt:message key="nuOffer" />
 	</h2>
 
     <table class="table table-striped" id="nuOffer-table">
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${nuOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(nuOffer.start)}"/></td>
@@ -50,6 +55,12 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${nuOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${nuOffer.client.municipio}"/></td>
+        </tr>
+                    
+                
     </table>
 
     <div class="btn-menu">
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="crearOfertas">
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas">
@@ -46,36 +47,38 @@
 	</div>		
 	
 	<form class="example" action="/offersByName">
-		<h2 class="text-center" style="font-size: 100%" >Búsqueda por nombre del bar/restaurante: </h2>
+		<h2 class="text-center" style="font-family: 'Lobster'; text-align:center; font-size:150%;  color: rgb(0, 64, 128); padding:10px;" >Búsqueda por nombre del bar/restaurante: </h2>
 		<div class="text-center">
-	  		<input type="text" placeholder="Búsqueda por nombre" name="name">
-	  		<button type="submit"><i class="fa fa-search"></i>
+	  		<input type="text" placeholder="Búsqueda por nombre" name="name" style="border:solid; border-color: rgb(0, 64, 128);">
+	  		<button type="submit" class="btn-search"><i class="fa fa-search"></i>
 	  		<span class="glyphicon 	glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
 	  		</button>
   		</div>
 	</form>
 	
 	<form class="example" action="/offersByFood">
-		<h2 class="text-center" style="font-size: 100%" >Búsqueda por comida: </h2>
+		<h2 class="text-center" style="font-family: 'Lobster'; text-align:center; font-size:150%;  color: rgb(0, 64, 128); padding:10px;" >Búsqueda por tipo de comida: </h2>
 		<div class="text-center">
-	  		<input type="text" placeholder="Búsqueda por comida (Ej: Macarrones)" name="name">
-	  		<button type="submit"><i class="fa fa-search"></i>
+	  		<input type="text" placeholder="Búsqueda por tipo comida (Ej: americana)" name="name" style="border:solid; border-color: rgb(0, 64, 128);">
+	  		<button type="submit" class="btn-search"><i class="fa fa-search"></i>
 	  		<span class="glyphicon 	glyphicon glyphicon-search" aria-hidden="true" style="padding: 5px"> </span>
 	  		</button>
   		</div>
 	</form>
 	
 	<form class="example" action="/offersByPlace">
-		<select name="municipio">
-		<option value="">Escoge municipio</option>
-		<c:forEach items="${municipios}" var="entry">
-			<option value="${entry}">${entry}</option>
-		</c:forEach>
-		</select>
-		<button type="submit">Buscar por municipio</button>
+		<div class="text-center">
+			<select name="municipio" class="select-municipio" >
+			
+			<c:forEach items="${municipios}" var="entry">
+				<option value="${entry}">${entry.toString()}</option>
+			</c:forEach>
+			</select>
+			<button type="submit" class="btn-mas">Buscar por municipio</button>
+		</div>
 	</form>
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="foodOffers"/>:</h2>
     
 	<c:if test="${empty foodOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
@@ -134,19 +137,21 @@
         </c:forEach>
         </tbody>
     </table>
-    <button type="button" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-	<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-	Ver más</button>
+    <div class="text-center">
+	    <button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+		Ver más</button>
+	</div>
     </div>
     
     </c:if>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="nuOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="nuOffers"/>:</h2>
 	<c:if test="${empty nuOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por n�mero de comensales activa.</p>
+		<p id="vacio" >No hay ninguna oferta por número de comensales activa.</p>
 	</c:if>
 	<c:if test="${not empty nuOfferLs }">
 
- 		<div class="table-responsive">        
+ 	<div class="table-responsive">        
     <table id="nuOfferTable" class="table table-striped">
         <thead>
         <tr>
@@ -156,6 +161,7 @@
             <th><fmt:message key="endDate"/></th>
             <th><fmt:message key="goldGoal"/></th>
             <th><fmt:message key="goldDiscount"/></th>
+            <th><fmt:message key="municipio"/></th>
             <th> </th>
             
         </tr>
@@ -178,6 +184,9 @@
                 <td>
                     <c:out value="${nuOffer.discountGold}%"/>
                 </td>
+                <td>
+                    <c:out value="${nuOffer.client.municipio}"/>
+                </td>
                 <td>
 	                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
 	                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
@@ -192,14 +201,16 @@
         </c:forEach>
         </tbody>
     </table>
-    <button type="button" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-	<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-	Ver más</button>
+    <div class="text-center">
+	    <button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(nuOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+		Ver más</button>
+	</div>
     </div>
 
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p>
 	</c:if>
@@ -215,6 +226,7 @@
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="goldGoal"/></th>
 		            <th><fmt:message key="goldDiscount"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> </th>
 		            
 		        </tr>
@@ -237,6 +249,9 @@
 		                <td>
 		                    <c:out value="${speedOffer.discountGold}%"/>
 		                </td>
+		                <td>
+		                    <c:out value="${speedOffer.client.municipio}"/>
+		                </td>
 		                <td>
 		                    <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
 		                        <spring:param name="speedOfferId" value="${speedOffer.id}"/>
@@ -252,15 +267,17 @@
 		        </c:forEach>
 		        </tbody>
 		    </table>
-		  	<spring:url value="/offers/speedOfferList" var="speedOfferUrl"></spring:url>
-   			<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-			<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-			Ver más</button>
+		    <div class="text-center">
+			  	<spring:url value="/offers/speedOfferList" var="speedOfferUrl"></spring:url>
+	   			<button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+				<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+				Ver más</button>
+			</div>
 	    </div>
 
     </c:if>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria activa.</p>
 	</c:if>
@@ -276,6 +293,7 @@
 		            <th><fmt:message key="endDate"/></th>
 		            <th><fmt:message key="init"/></th>
 		            <th><fmt:message key="finishOffer"/></th>
+		            <th><fmt:message key="municipio"/></th>
 		            <th> </th>
 		        </tr>
 		        </thead>
@@ -297,6 +315,9 @@
 		                <td>
 		                    <c:out value="${timeOffer.finish}h"/>
 		                </td>
+		                <td>
+		                    <c:out value="${timeOffer.client.municipio}"/>
+		                </td>
 		                
 		                <td>
 		                	<spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
@@ -311,10 +332,12 @@
 		            </tr>
 		        </c:forEach>
 		    </table>
-		    <spring:url value="/offers/timeOfferList" var="timeOfferUrl"></spring:url>
-    		<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-			<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-			Ver más</button>
+		    <div class="text-center">
+			    <spring:url value="/offers/timeOfferList" var="timeOfferUrl"></spring:url>
+	    		<button type="button" class="btn-mas" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+				<span class="glyphicon 	glyphicon glyphicon-plus" aria-hidden="true" style="padding: 5px"> </span>
+				Ver más</button>
+			</div>
   	  </div>
     </c:if>
   
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas">
@@ -13,7 +14,7 @@
     <h2 style="text-align:center;padding:5px"><fmt:message key="foodOffers"/></h2>
     
 	<c:if test="${empty foodOfferLs }">
-		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
+		<p id="vacio" >No hay ninguna oferta por plato específico activa.</p>
 	</c:if>
 	<c:if test="${not empty foodOfferLs }">
 
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertasM">
-    <h2 style="text-align:center;padding:5px">Registro de Ofertas</h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">Historial de Ofertas</h2>
 	<c:if test="${empty datos }">
 		<p id="vacio" >No hay ninguna oferta creada.</p>
 	</c:if>
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${speedOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="speedOffer"/>
     </h2>
     <form:form modelAttribute="speedOffer" class="form-horizontal" id="add-speedOffer-form">
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" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		 <form:form modelAttribute="speedOffer" class="form-horizontal">
 
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por rapidez">
@@ -15,7 +17,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -39,7 +41,7 @@
 			Ofertas de franja horaria</button>
 		</div>
 	</div>
-    <h2 style="text-align:center;padding:5px"><fmt:message key="speedOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="speedOffers"/>:</h2>
 	<c:if test="${empty speedOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por tiempo empleado en comer activa.</p>
 	</c:if>
@@ -90,22 +92,29 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-right">
     	<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(speedOfferLs) == 5}">
+    <div class="text-right">
     	<spring:url value="/offers/speedOfferList/{page}" var="speedOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(speedOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 </cheapy:layout>
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="speedOffer">
 
-	<h2 style="text-align: center; padding: 5px">
+	<h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
 		<fmt:message key="speedOffer" />
 	</h2>
 
     <table class="table table-striped" id="speedOffer-table">
+    	<tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${speedOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(speedOffer.start)}"/></td>
@@ -50,6 +56,10 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${speedOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${speedOffer.client.municipio}"/></td>
+        </tr>
     </table>
 
     <div class="btn-menu">
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="TimeOffers">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${timeOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="timeOffer"/>
     </h2>
     <form:form modelAttribute="timeOffer" class="form-horizontal" id="add-timeOffer-form">
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" %>
 
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <cheapy:layout pageName="timeOffer">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		<form:form modelAttribute="timeOffer" class="form-horizontal">
 
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="ofertas por intervalo de tiempo">
@@ -15,7 +16,7 @@
 		    </spring:url>
 		    <button type="button" role="link" class="btn-filter" onclick="window.location='${fn:escapeXml(foodOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 			<span class="glyphicon 	glyphicon glyphicon-cutlery" aria-hidden="true" style="padding: 5px"> </span>
-			Ofertas de plato especifico</button>
+			Ofertas de plato específico</button>
 			
 			<spring:url value="/offers/nuOfferList/{page}" var="nuOfferListUrl">
 				<spring:param name="page" value="0"/>
@@ -40,7 +41,7 @@
 		</div>
 	</div>
     
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffers"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="timeOffers"/>:</h2>
 	<c:if test="${empty timeOfferLs }">
 		<p id="vacio" >No hay ninguna oferta por franja horaria activa.</p>
 	</c:if>
@@ -90,22 +91,29 @@
         </c:forEach>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(timeOfferLs) == 5}">
-    	<spring:url value="/offers/foodOfferList/{page}" var="timeOfferListUrl">
+    <div class="text-right">
+    	<spring:url value="/offers/timeOfferList/{page}" var="timeOfferListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		P�g. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(timeOfferListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
     </c:if>
 	
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="timeOffer">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="timeOffer"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:left; font-size:200%;  color: rgb(0, 64, 128); padding:10px; margin-bottom:20px;"><fmt:message key="timeOffer"/>:</h2>
 
 
     <table id="timeOfferTable" class="table table-striped">
         <thead>
+        <tr>
+            <th><fmt:message key="client"/></th>
+            <td><c:out value="${timeOffer.client.name}"/> </td>
+        </tr>
         <tr>
             <th><fmt:message key="offerBeginning"/></th>
             <td><c:out value="${localDateTimeFormat.format(timeOffer.start)}"/></td>
@@ -38,6 +44,10 @@
             <th><fmt:message key="offerCode"/></th>
             <td><c:out value="${timeOffer.code}"/></td>
         </tr>
+        <tr>
+            <th><fmt:message key="municipio"/></th>
+            <td><c:out value="${timeOffer.client.municipio}"/> </td>
+        </tr>
         </thead>
     </table>
 
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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="reviewsN">
-    <h2>
-        <c:if test="${review['new']}">Nueva </c:if> Reseña
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
+    	<c:if test="${review['new']}">Nueva </c:if> Reseña
     </h2>
     <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
         <div class="form-group has-feedback">
         	<form:hidden path="id"/>
-            <cheapy:textAreaField label="Opinión" name="opinion"/>
+            <cheapy:textAreaField label="Opinión" name="opinion"/>
             <cheapy:inputField label="Estrellas" name="stars"/>
         </div>
         <div class="form-group">
@@ -23,10 +25,10 @@
                     <c:when test="${review['new']}">
                         <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
 	                        <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
-	                        Crear reseña</button>
+	                        Crear reseña</button>
                     </c:when>
                     <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
+                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
                     </c:otherwise>
                 </c:choose>
                 </div>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="reviews">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="reviews"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="reviews"/></h2>
 
     <table id="reviewTable" class="table table-striped">
         <thead>
@@ -22,7 +23,7 @@
         <tbody>
         <c:choose>
 	        <c:when test="${empty reviewsLs}">
-	        	<tr><td colspan="4"><em><c:out value="No se ha realizado ninguna valoración por el momento."/></em></td></tr>
+	        	<tr><td colspan="4"><em><c:out value="No se ha realizado ninguna valoración por el momento."/></em></td></tr>
 	        </c:when>
 	        <c:otherwise>
 	        <c:forEach items="${reviewsLs}" var="review">
@@ -56,21 +57,28 @@
         </c:choose>
         </tbody>
     </table>
-        <c:if test='${page!=0}'>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-left">
     	<spring:url value="/reviewsList/{page}" var="reviewsListUrl">
     		<spring:param name="page" value="${page-1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		Pág. anterior</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+ 	</div>
     </c:if>
-    <c:out value='${page}'></c:out>
+    
     <c:if test="${fn:length(reviewsLs) == 6}">
+    <div class="text-right">
     	<spring:url value="/reviewsList/{page}" var="reviewsListUrl">
     		<spring:param name="page" value="${page+1}"/>
     	</spring:url>
-    	<button type="button" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
-		<span class="glyphicon 	glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		Pág. siguiente</button>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
 	</c:if>
 </cheapy:layout>
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="review">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="review"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="review"/></h2>
 
 
     <table class="table table-striped" id="review-table">
@@ -35,7 +36,7 @@
 		    
 			<button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 	        <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
-		        Editar opinión</button>
+		        Editar opinión</button>
     	</c:if>
     </div>
     
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -273,31 +274,25 @@
 
 </style>
 <cheapy:layout pageName="singUp">
-    <h2 style="text-align:center;padding:5px">
+<div class="text-center">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <fmt:message key="new"/><fmt:message key="client"/>
     </h2>
+</div>
 	<form:form modelAttribute="cliente" class="form-horizontal"
 		id="add-client-form">
 		<div class="form-group has-feedback">
 			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
 				name="name" />
-			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
-				name="address" />
-			<div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+				name="address" />			
 			<cheapy:inputField label="Hora de apertura" placeholder="Ponga aqui su hora de apertura (formato HH:mm)"
 				name="init" />
 			<cheapy:inputField label="Hora de cierre" placeholder="Ponga aqui su hora de cierre (formato HH:mm)"
 				name="finish" />
-			<cheapy:inputField label="Teléfono" placeholder="Ponga aqui el teléfono del local"
+			<cheapy:inputField label="Teléfono" placeholder="Ponga aqui el teléfono del local"
 				name="telephone" />
-			<cheapy:inputField label="Descripción" placeholder="Ponga aqui su descripción"
+			<cheapy:inputField label="Descripción" placeholder="Ponga aqui su descripción"
 				name="description" />
 			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
 				name="email" />
@@ -305,11 +300,23 @@
 				name="food" />
 			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
 				name="usuar.username" />
-			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+			<cheapy:passwordField label="Contraseña" placeholder="Ponga aqui su contraseña"
 				name="usuar.password" />
-			<cheapy:inputField label="Código de activación" placeholder="Ponga aqui el código que se le suministro al firmar el contrato"
+			<cheapy:inputField label="Código de activación" placeholder="Ponga aqui el código que se le suministro al firmar el contrato"
 				name="code.code" />
-			<input type="submit" class="fadeIn fourth" value="Registrarse">
+			<div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio: </label>
+	            <div class="col-sm-10">
+				<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;">
+					<c:forEach items="${municipio}" var="entry">
+						<option value="${entry}">${entry.toString()}</option>
+					</c:forEach>
+				</select>
+				</div>
+			</div>	
+			<div class="text-center">
+				<input type="submit" class="fadeIn fourth" value="Registrarse">
+			</div>
 		</div>
 	</form:form>
 
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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <script src="//maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"></script>
 <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
@@ -273,33 +274,41 @@
 
 </style>
 <cheapy:layout pageName="singUp">
-    <h2 style="text-align:center;padding:5px">
-        <fmt:message key="new"/><fmt:message key="user"/>
+<div class="text-center">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
+        <fmt:message key="new"/><fmt:message key="usuario"/>
     </h2>
+</div>
 	<form:form modelAttribute="usuario" class="form-horizontal"
-		id="add-foodOffer-form">
+		id="add-user-form">
 		<div class="form-group has-feedback">
 			<cheapy:inputField label="Nombre" placeholder="Ponga aqui su nombre"
 				name="nombre" />
 			<cheapy:inputField label="Apellidos" placeholder="Ponga aqui sus apellidos"
 				name="apellidos" />
-			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
+			<cheapy:inputField label="Direccion" placeholder="Ponga aqui su dirección"
 				name="direccion" />
-			<div class="form-group">                   
-            <label>Municipio: </label>
-			<select name="municipio">
-				<c:forEach items="${municipio}" var="entry">
-					<option value="${entry}">${entry}</option>
-				</c:forEach>
-			</select>
-			</div>
+			
 			<cheapy:inputField label="Email" placeholder="Ponga aqui su email"
 				name="email" />
 			<cheapy:inputField label="Nombre de usuario" placeholder="Ponga aqui su nombre de usuario"
 				name="usuar.username" />
-			<cheapy:inputField label="Contraseña" placeholder="Ponga aqui su contraseña"
+			<cheapy:passwordField label="Contraseña" placeholder="Ponga aqui su contraseña" 
 				name="usuar.password" />
-			<input type="submit" class="fadeIn fourth" value="Registrarse">
+			<div class="form-group">                   
+	            <label class="col-sm-2 control-label">Municipio </label>
+	            <div class="col-sm-10">
+				<select name="municipio" class="select-municipio" style="width:80%;text-align-last:center;" >
+					
+					<c:forEach items="${municipio}" var="entry">
+						<option value="${entry}">${entry.toString()}</option>
+					</c:forEach>
+				</select>
+				</div>
+			</div>
+			<div class="text-center">
+				<input type="submit" class="fadeIn fourth" value="Registrarse">
+			</div>
 		</div>
 	</form: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" %>
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuarios">
-    <h2 style="text-align:center;padding:5px">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
         <c:if test="${usuario['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="usuario"/>
     </h2>
     
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" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuario">
 
 	<jsp:body>
-        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
+        <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su cuenta?</em></h2>
       		
       		 <form:form modelAttribute="usuario" class="form-horizontal">
 
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuarios">
-    <h2 style="text-align:center;padding:5px"><fmt:message key="users"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="users"/></h2>
     
 	<c:if test="${empty usuarioLs }">
-		<p id="vacio" >No hay ningún usuario.</p>
+		<p id="vacio" >No hay ningún usuario.</p>
 	</c:if>
 	<c:if test="${not empty usuarioLs }">
     <table id="usuarioTable" class="table table-striped">
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" %>
+
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 
 <cheapy:layout pageName="usuario">
 
-    <h2 style="text-align:center;padding:5px"><fmt:message key="usuario"/></h2>
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="usuario"/></h2>
 
     <table class="table table-striped" id="usuarioTable">
     	<thead>
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 @@
 <link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
 <!-- %@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %-->  
 <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
 
 <cheapy:layout pageName="home"> 
     <h2 class="text-center" style="font-family: 'Lobster'; font-size: 300%; color: rgb(0, 64, 128); padding:30px"><fmt:message key="welcome"/></h2>
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 @@
 				<sec:authorize access="hasAnyAuthority('admin')">
 				<cheapy:menuItem active="${name eq 'registro'}" url="/offersRecord" title="offersRecord">
 					<span class="glyphicon " aria-hidden="true"></span>
-					<span>Registro de ofertas</span>
+					<span>Historial de ofertas</span>
 				</cheapy:menuItem>
 				</sec:authorize>
 				<!--  
diff --git a/src/main/webapp/WEB-INF/tags/passwordField.tag b/src/main/webapp/WEB-INF/tags/passwordField.tag
index 3fcd43959..358008708 100644
--- a/src/main/webapp/WEB-INF/tags/passwordField.tag
+++ b/src/main/webapp/WEB-INF/tags/passwordField.tag
@@ -15,7 +15,7 @@
         <label class="col-sm-2 control-label">${label}</label>
 		
         <div class="col-sm-10">
-            <form:input type="password" class="form-control" placeholder="${placeholder }" path="${name}"/>
+            <form:input type="password" class="form-control" style="width:80%;" placeholder="${placeholder }" path="${name}"/>
             <c:if test="${valid}">
                 <span class="glyphicon glyphicon-ok form-control-feedback" aria-hidden="true"></span>
             </c:if>

From f1510151dfb8e7c09267b9405b37106f924ec0a0 Mon Sep 17 00:00:00 2001
From: abemorcardc <abemorcar@alum.us.es>
Date: Fri, 16 Apr 2021 17:33:51 +0200
Subject: [PATCH 7/8] =?UTF-8?q?Los=20mensajes=20ahora=20se=20muestran=20po?=
 =?UTF-8?q?r=20defecto=20en=20espa=C3=B1ol?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/messages/messages.properties    | 83 ++++++++++++++++---
 .../resources/messages/messages_es.properties | 73 ----------------
 2 files changed, 73 insertions(+), 83 deletions(-)

diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties
index 1947d786c..68e2c4821 100644
--- a/src/main/resources/messages/messages.properties
+++ b/src/main/resources/messages/messages.properties
@@ -1,10 +1,73 @@
-welcome=Welcome to
-listOffers=List Offers
-
-required=is required
-notFound=has not been found
-duplicate=is already in use
-nonNumeric=must be all numeric
-duplicateFormSubmission=Duplicate form submission is not allowed
-typeMismatch.date=invalid date
-typeMismatch.birthDate=invalid date
+welcome=Bienvenido a
+new=Nuevo 
+deleteOffer=Eliminar Oferta
+cancel=Cancelar
+deleteOfferMessage=Confirme que quiere eliminar su oferta
+listOffers=Ver Ofertas
+createOffers=Crear Ofertas
+foodOffers=Ofertas por plato específico
+foodOffer=Oferta por plato específico
+nuOffers=Ofertas por número de comensales
+nuOffer=Oferta por número de comensales
+speedOffers=Ofertas por tiempo empleado en comer
+speedOffer=Oferta por tiempo empleado en comer
+timeOffers=Ofertas por franja horaria
+timeOffer=Oferta por franja horaria
+food=Plato
+foodInOffer=Plato en oferta
+cuantity=Cantidad
+discount=Descuento
+goldGoal=Meta oro
+goldDiscount=Descuento oro
+silverGoal=Meta plata
+silverDiscount=Descuento plata
+bronzeGoal=Meta bronce
+bronzeDiscount=Descuento bronce
+startDate=Fecha de inicio
+offerBeginning=Inicio de la oferta
+endDate=Fecha de fin
+offerEnding=Fin de la oferta
+details=Detalles
+offerCode=Código de la oferta
+return=Volver
+required=Es requerido
+notFound=No ha sido encontrado
+duplicate=Ya se encuentra en uso
+nonNumeric=Solo debe contener números
+duplicateFormSubmission=No se permite el envío de formularios duplicados
+typeMismatch.date=Fecha inválida
+typeMismatch.birthDate=Fecha inválida
+review= Reseña
+reviews= Reseñas
+stars= Estrellas
+opinion= Opinión
+user = Nombre de usuario
+createFoodOffers= Crear ofertas por plato específico
+createNuOffers= Crear ofertas por número de comensales
+createSpeedOffers= Crear ofertas por rapidez comiendo
+createTimeOffers= Crear ofertas por franja horaria
+init= Inicio del intervalo
+finishOffer= Fin del intervalo
+name= Nombre del bar/restaurante
+status= Estado de oferta
+myOffers= Ver mis Ofertas
+typeMismatch=Debe ser del formato correcto
+typeMismatch.java.lang.Integer=Debe ser un número
+typeMismatch.java.time.LocalDateTime=Debe ser una fecha válida
+typeMismatch.java.time.LocalTime=Debe ser una hora válida
+clientShow= Información del bar/restaurante
+client= Cliente
+clients= Clientes
+email=Dirección de correo electrónico
+addressClient= Dirección del bar/restaurante
+addressUser= Dirección del usuario
+telephone= Número de teléfono
+descriptionClient= Descripción del bar/restaurante
+foodClient= Tipo de comida
+enabled= ¿Está activo el usuario?
+users=Usuarios
+nameUser=Nombre
+surname= Apellidos
+dni= DNI
+usuario=Usuario
+municipio=Municipio
\ No newline at end of file
diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties
index 68e2c4821..e69de29bb 100644
--- a/src/main/resources/messages/messages_es.properties
+++ b/src/main/resources/messages/messages_es.properties
@@ -1,73 +0,0 @@
-welcome=Bienvenido a
-new=Nuevo 
-deleteOffer=Eliminar Oferta
-cancel=Cancelar
-deleteOfferMessage=Confirme que quiere eliminar su oferta
-listOffers=Ver Ofertas
-createOffers=Crear Ofertas
-foodOffers=Ofertas por plato específico
-foodOffer=Oferta por plato específico
-nuOffers=Ofertas por número de comensales
-nuOffer=Oferta por número de comensales
-speedOffers=Ofertas por tiempo empleado en comer
-speedOffer=Oferta por tiempo empleado en comer
-timeOffers=Ofertas por franja horaria
-timeOffer=Oferta por franja horaria
-food=Plato
-foodInOffer=Plato en oferta
-cuantity=Cantidad
-discount=Descuento
-goldGoal=Meta oro
-goldDiscount=Descuento oro
-silverGoal=Meta plata
-silverDiscount=Descuento plata
-bronzeGoal=Meta bronce
-bronzeDiscount=Descuento bronce
-startDate=Fecha de inicio
-offerBeginning=Inicio de la oferta
-endDate=Fecha de fin
-offerEnding=Fin de la oferta
-details=Detalles
-offerCode=Código de la oferta
-return=Volver
-required=Es requerido
-notFound=No ha sido encontrado
-duplicate=Ya se encuentra en uso
-nonNumeric=Solo debe contener números
-duplicateFormSubmission=No se permite el envío de formularios duplicados
-typeMismatch.date=Fecha inválida
-typeMismatch.birthDate=Fecha inválida
-review= Reseña
-reviews= Reseñas
-stars= Estrellas
-opinion= Opinión
-user = Nombre de usuario
-createFoodOffers= Crear ofertas por plato específico
-createNuOffers= Crear ofertas por número de comensales
-createSpeedOffers= Crear ofertas por rapidez comiendo
-createTimeOffers= Crear ofertas por franja horaria
-init= Inicio del intervalo
-finishOffer= Fin del intervalo
-name= Nombre del bar/restaurante
-status= Estado de oferta
-myOffers= Ver mis Ofertas
-typeMismatch=Debe ser del formato correcto
-typeMismatch.java.lang.Integer=Debe ser un número
-typeMismatch.java.time.LocalDateTime=Debe ser una fecha válida
-typeMismatch.java.time.LocalTime=Debe ser una hora válida
-clientShow= Información del bar/restaurante
-client= Cliente
-clients= Clientes
-email=Dirección de correo electrónico
-addressClient= Dirección del bar/restaurante
-addressUser= Dirección del usuario
-telephone= Número de teléfono
-descriptionClient= Descripción del bar/restaurante
-foodClient= Tipo de comida
-enabled= ¿Está activo el usuario?
-users=Usuarios
-nameUser=Nombre
-surname= Apellidos
-dni= DNI
-usuario=Usuario
-municipio=Municipio
\ No newline at end of file

From 0a131ae48fb6f1fe0b64ba8cc790f360c4a50a91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Franco=20S=C3=A1nchez?=
 <56022165+pabfrasan@users.noreply.github.com>
Date: Sat, 17 Apr 2021 13:46:35 +0200
Subject: [PATCH 8/8] Valorar restaurantes
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Se han añadido las funcionalidades y vistas para añadir, editar, listar y enseñar las valoraciones creadas por los usuarios a los clientes
---
 .../cheapy/model/ReviewClient.java            |  67 +++++++++
 .../repository/ReviewClientRepository.java    |  19 +++
 .../cheapy/service/ClientService.java         |  15 +-
 .../cheapy/service/ReviewClientService.java   |  41 ++++++
 .../cheapy/web/ClientController.java          |   4 +-
 .../cheapy/web/ReviewClientController.java    | 139 ++++++++++++++++++
 src/main/resources/db/mysql/data.sql          |  11 ++
 .../WEB-INF/jsp/clients/restaurantShow.jsp    |  29 +++-
 .../jsp/reviews/createOrUpdateReviewForm.jsp  |   4 +-
 .../createOrUpdateReviewForm.jsp              |  42 ++++++
 .../WEB-INF/jsp/reviewsClient/reviewsList.jsp |  93 ++++++++++++
 .../WEB-INF/jsp/reviewsClient/reviewsShow.jsp |  52 +++++++
 src/main/webapp/WEB-INF/tags/showStars.tag    |   7 +-
 13 files changed, 513 insertions(+), 10 deletions(-)
 create mode 100644 src/main/java/org/springframework/cheapy/model/ReviewClient.java
 create mode 100644 src/main/java/org/springframework/cheapy/repository/ReviewClientRepository.java
 create mode 100644 src/main/java/org/springframework/cheapy/service/ReviewClientService.java
 create mode 100644 src/main/java/org/springframework/cheapy/web/ReviewClientController.java
 create mode 100644 src/main/webapp/WEB-INF/jsp/reviewsClient/createOrUpdateReviewForm.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsList.jsp
 create mode 100644 src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsShow.jsp

diff --git a/src/main/java/org/springframework/cheapy/model/ReviewClient.java b/src/main/java/org/springframework/cheapy/model/ReviewClient.java
new file mode 100644
index 000000000..8fe0176f6
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/model/ReviewClient.java
@@ -0,0 +1,67 @@
+package org.springframework.cheapy.model;
+
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.Range;
+
+@Entity
+@Table(name = "review_client")
+public class ReviewClient extends BaseEntity{
+
+private static final long serialVersionUID = 1L;
+	
+	@NotBlank(message = "Debe rellenar la valoración sobre el bar")
+	@Column(length=16777215)
+	private String opinion;
+	
+	@NotNull(message= "Por favor rellene este campo")
+	@Range(min = 1, max = 5,message="Las estrellas deben ir entre 1 y 5")
+	private Integer stars;
+
+	@ManyToOne
+	@JoinColumn(name = "username", referencedColumnName = "username")
+	private User escritor;
+	
+	@ManyToOne
+	@JoinColumn(name = "client", referencedColumnName = "id")
+	private Client bar;
+	
+	public User getEscritor() {
+		return escritor;
+	}
+
+	public Client getBar() {
+		return bar;
+	}
+
+	public void setBar(Client bar) {
+		this.bar = bar;
+	}
+
+	public void setEscritor(User escritor) {
+		this.escritor = escritor;
+	}
+
+	public String getOpinion() {
+		return opinion;
+	}
+
+	public void setOpinion(String opinion) {
+		this.opinion = opinion;
+	}
+
+	public Integer getStars() {
+		return stars;
+	}
+
+	public void setStars(Integer stars) {
+		this.stars = stars;
+	}
+	
+}
diff --git a/src/main/java/org/springframework/cheapy/repository/ReviewClientRepository.java b/src/main/java/org/springframework/cheapy/repository/ReviewClientRepository.java
new file mode 100644
index 000000000..443bbf839
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/repository/ReviewClientRepository.java
@@ -0,0 +1,19 @@
+package org.springframework.cheapy.repository;
+
+import java.util.List;
+
+import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.ReviewClient;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.repository.PagingAndSortingRepository;
+
+public interface ReviewClientRepository extends PagingAndSortingRepository<ReviewClient, Integer> {
+
+	List<ReviewClient> findByBar(String bar);
+	
+	List<ReviewClient> findAllReviewClientByBar(Pageable p, Client client);
+	
+	List<ReviewClient> findAllReviewClientByBar(Client client);
+	
+	ReviewClient findReviewClientById(int id);
+}
diff --git a/src/main/java/org/springframework/cheapy/service/ClientService.java b/src/main/java/org/springframework/cheapy/service/ClientService.java
index e65eec3a7..05b84400a 100644
--- a/src/main/java/org/springframework/cheapy/service/ClientService.java
+++ b/src/main/java/org/springframework/cheapy/service/ClientService.java
@@ -7,9 +7,11 @@ import javax.validation.Valid;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.cheapy.model.Client;
 import org.springframework.cheapy.model.Code;
+import org.springframework.cheapy.model.ReviewClient;
 import org.springframework.cheapy.model.Usuario;
 import org.springframework.cheapy.repository.ClientRepository;
 import org.springframework.cheapy.repository.CodeRepository;
+import org.springframework.cheapy.repository.ReviewClientRepository;
 import org.springframework.dao.DataAccessException;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -21,11 +23,13 @@ public class ClientService {
 
 	private ClientRepository clientRepository;
 	private CodeRepository codeRepository;
+	private ReviewClientRepository reviewRepositoy;
 	
 	@Autowired
-	public ClientService(final ClientRepository clientRepository, CodeRepository codeRepository) {
+	public ClientService(final ClientRepository clientRepository, CodeRepository codeRepository, ReviewClientRepository reviewRepositoy) {
 		this.clientRepository = clientRepository;
 		this.codeRepository = codeRepository;
+		this.reviewRepositoy = reviewRepositoy;
 	}
 
 	@Transactional
@@ -57,4 +61,13 @@ public class ClientService {
 	public List<Client> findAllClient() throws DataAccessException {
 		return this.clientRepository.findAllClient();
 	}
+	
+	public Integer mediaValoraciones(Client client) {
+		List<ReviewClient> valoraciones =this.reviewRepositoy.findAllReviewClientByBar(client);
+		if(valoraciones.size()!=0) {
+			return Integer.valueOf( (int) valoraciones.stream().mapToInt(x->x.getStars()).average().getAsDouble());
+			}else {
+				return 0;
+			}
+	}
 }
diff --git a/src/main/java/org/springframework/cheapy/service/ReviewClientService.java b/src/main/java/org/springframework/cheapy/service/ReviewClientService.java
new file mode 100644
index 000000000..9bcf2e0f8
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/service/ReviewClientService.java
@@ -0,0 +1,41 @@
+package org.springframework.cheapy.service;
+
+import java.util.List;
+
+import javax.transaction.Transactional;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Review;
+import org.springframework.cheapy.model.ReviewClient;
+import org.springframework.cheapy.repository.ReviewClientRepository;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ReviewClientService {
+
+	private ReviewClientRepository repo;
+	
+	@Autowired
+	public ReviewClientService(ReviewClientRepository repo) {
+		super();
+		this.repo = repo;
+	}
+	@Transactional
+	public void saveReview(final ReviewClient entity) {
+		this.repo.save(entity);
+	}
+	@Transactional
+	public List<ReviewClient> findByClient(String idClient){
+		return this.repo.findByBar(idClient);
+	}
+
+	public ReviewClient findReviewById(int reviewId) {
+		return this.repo.findReviewClientById(reviewId);
+	}
+	public List<ReviewClient> findAllReviewsByBar(Pageable p, Client client) {
+		
+		return this.repo.findAllReviewClientByBar(p, client);
+	}
+}
diff --git a/src/main/java/org/springframework/cheapy/web/ClientController.java b/src/main/java/org/springframework/cheapy/web/ClientController.java
index 7bc63dbc7..a195802ac 100644
--- a/src/main/java/org/springframework/cheapy/web/ClientController.java
+++ b/src/main/java/org/springframework/cheapy/web/ClientController.java
@@ -161,9 +161,11 @@ public class ClientController {
 	}
 	@GetMapping(value = "/restaurant/{clientId}")
 	public String showRestaurant(final ModelMap model, @PathVariable("clientId") Integer id) {
-
+		
 		Client client = this.clientRepo.findById(id).get();
+		Integer valoraciones=this.clientService.mediaValoraciones(client);
 		model.put("client", client);
+		model.put("reviews", valoraciones);
 		return "clients/restaurantShow";
 	}
 }
diff --git a/src/main/java/org/springframework/cheapy/web/ReviewClientController.java b/src/main/java/org/springframework/cheapy/web/ReviewClientController.java
new file mode 100644
index 000000000..7e8a925fc
--- /dev/null
+++ b/src/main/java/org/springframework/cheapy/web/ReviewClientController.java
@@ -0,0 +1,139 @@
+package org.springframework.cheapy.web;
+
+import java.util.List;
+import java.util.Map;
+
+import javax.validation.Valid;
+
+import org.springframework.cheapy.model.Client;
+import org.springframework.cheapy.model.Review;
+import org.springframework.cheapy.model.ReviewClient;
+import org.springframework.cheapy.model.User;
+import org.springframework.cheapy.service.ClientService;
+import org.springframework.cheapy.service.ReviewClientService;
+import org.springframework.cheapy.service.UserService;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import net.bytebuddy.asm.Advice.This;
+
+@Controller
+public class ReviewClientController {
+
+	private static final String	VIEWS_REVIEWS_CREATE_OR_UPDATE_FORM	= "reviewsClient/createOrUpdateReviewForm";
+	private final ReviewClientService reviewService;
+	private final UserService	userService;
+	private final ClientService clientService;
+	
+	public ReviewClientController(ReviewClientService reviewService, UserService userService, ClientService clientService) {
+		super();
+		this.clientService = clientService;
+		this.reviewService = reviewService;
+		this.userService = userService;
+	}
+	
+	private boolean checkIdentity(final int reviewId) {
+		boolean res = false;
+		User user = this.userService.getCurrentUser();
+		ReviewClient review = this.reviewService.findReviewById(reviewId);
+		User reviewsAuthor = review.getEscritor();
+		if (user.equals(reviewsAuthor)) {
+			res = true;
+		}
+		return res;
+	}
+	
+	private boolean checkClient(final String client) {
+		User user = this.userService.getCurrentUser();
+		Client bar = this.clientService.findByUsername(client);
+		return (bar == null||user==null)? false: true;
+	}
+	@GetMapping("/reviewsClient/new/{idClient}")
+	public String initCreationForm(final Map<String, Object> model, @PathVariable("idClient") final String idClient) {
+		if(!checkClient(idClient)) {
+			return "error";
+		}
+		
+		ReviewClient review = new ReviewClient();
+
+		model.put("review", review);
+		return ReviewClientController.VIEWS_REVIEWS_CREATE_OR_UPDATE_FORM;
+	}
+
+	@PostMapping("/reviewsClient/new/{idClient}")
+	public String processCreationForm(@Valid final ReviewClient review, @PathVariable("idClient") final String idClient,final BindingResult result) {
+		if (result.hasErrors()) {
+			return ReviewClientController.VIEWS_REVIEWS_CREATE_OR_UPDATE_FORM;
+		} else {
+			User escritor = this.userService.getCurrentUser();
+			review.setEscritor(escritor);
+			Client bar = this.clientService.findByUsername(idClient);
+			review.setBar(bar);
+		
+			this.reviewService.saveReview(review);
+			return "redirect:/reviewsClient/" + review.getId();
+		}
+	}
+	
+	@GetMapping("/reviewsClient/{reviewId}")
+	public String processShowForm(@PathVariable("reviewId") final int reviewId, final Map<String, Object> model) {
+		ReviewClient review = this.reviewService.findReviewById(reviewId);
+
+		model.put("review", review);
+
+		return "reviewsClient/reviewsShow";
+
+	}
+	@GetMapping("/reviewsClientList/{idClient}/{page}")
+	public String processFindForm(@PathVariable("page") final int page, @PathVariable("idClient") final String idClient, final Map<String, Object> model) {
+		Pageable elements = PageRequest.of(page, 6);
+		Client client = this.clientService.findByUsername(idClient);
+
+		List<ReviewClient> reviewsLs = this.reviewService.findAllReviewsByBar(elements,client);
+		model.put("reviewsLs", reviewsLs);
+		model.put("client", idClient);
+
+		return "reviewsClient/reviewsList";
+
+	}
+	
+	@GetMapping("/reviewsClient/{reviewId}/edit")
+	public String updateReviewInit(@PathVariable("reviewId") final int reviewId, final ModelMap model) {
+		if (!this.checkIdentity(reviewId)) {
+			return "error";
+		}
+		ReviewClient review = this.reviewService.findReviewById(reviewId);
+		
+		model.addAttribute("review", review);
+		return ReviewClientController.VIEWS_REVIEWS_CREATE_OR_UPDATE_FORM;
+	}
+	
+	@PostMapping("/reviewsClient/{reviewId}/edit")
+	public String updateReviewPost(@Valid final ReviewClient reviewEdit, final BindingResult result, final ModelMap model) {
+		if (!this.checkIdentity(reviewEdit.getId())) {
+			return "error";
+		}
+		if (result.hasErrors()) {
+			model.addAttribute("review", reviewEdit);
+			return ReviewClientController.VIEWS_REVIEWS_CREATE_OR_UPDATE_FORM;
+
+		} else {
+			Client bar = this.reviewService.findReviewById(reviewEdit.getId()).getBar();
+			User escritor = this.userService.getCurrentUser();
+			reviewEdit.setEscritor(escritor);
+			reviewEdit.setBar(bar);
+
+			this.reviewService.saveReview(reviewEdit);
+			return "redirect:/reviewsClient/" + reviewEdit.getId();
+		}
+
+	}
+	
+	
+}
diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql
index 0c8238235..995fd0cb6 100644
--- a/src/main/resources/db/mysql/data.sql
+++ b/src/main/resources/db/mysql/data.sql
@@ -63,3 +63,14 @@ INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold,
 INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-08-15 12:00:00', '2021-08-16 12:00:00', 'NU-6', 'active',2,20,30,15,10,10,5);
 INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-08-15 12:00:00', '2021-08-16 12:00:00', 'NU-7', 'active',2,20,35,15,15,10,5);
 INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-08-16 12:00:00', '2021-08-17 12:00:00', null, 'hidden',1,15,25,10,15,5,10);
+
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Es un bar muy bueno para ir a comer',5,'paco',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Las ofertas eran buenas pero el servicio mejorable',2,'lolo',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Nos trataron genial a mi y a mi amigo',4,'pepe',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Abren a todas horas!!!',5,'paco',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('La comida de hoy estaba muy rica',4,'lolo',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Recomiendo ir por la noche, tiene muy buenas vistas',4,'pepe',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('No retrasmiten futbol',1,'pepe',1);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Un sitio perfecto para llevar a tu pareja',5,'paco',2);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('En hora punta nunca hay sitio',2,'lolo',2);
+INSERT INTO review_client(opinion, stars, username, client ) VALUES ('Fui una vez por probar y ahora voy todas las tardes',4,'pepe',2);
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp
index 9de6c43ed..59cfe490f 100644
--- a/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clients/restaurantShow.jsp
@@ -45,15 +45,36 @@
         </tr><tr>
             <th><fmt:message key="foodClient"/></th>
             <td><c:out value="${client.food}%"/> </td>
-        </tr>
+   
         
         
         
         </thead>
     </table>
-
+    <div style="font-size: 150%" >
+    <fmt:message key="reviews"/>
+		<cheapy:showStars  value="${reviews}"></cheapy:showStars> 
+	</div>
     <div class="btn-menu">
-    </div>
-  	
+  
+    
+      <div class="text-left">
+    	<spring:url value="/reviewsClientList/{client}/0" var="reviewsListUrl">
+    		<spring:param name="client" value="${client.usuar.username}"/>
+    	</spring:url>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		Valoraciones</button>
+ 	
+ 	<sec:authorize access="hasAnyAuthority('usuario')">
+ 	     
+    	<spring:url value="/reviewsClient/new/{client}/" var="reviewsCreateUrl">
+    		<spring:param name="client" value="${client.usuar.username}"/>
+    	</spring:url>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsCreateUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		Valorar</button>
+ 	
+ 	</sec:authorize>
+  	</div>
+  	</div>
 
 </cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
index 2af06c0d8..db9d3f89e 100644
--- a/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/reviews/createOrUpdateReviewForm.jsp
@@ -10,7 +10,7 @@
 
 <cheapy:layout pageName="reviewsN">
     <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
-    	<c:if test="${review['new']}">Nueva </c:if> Reseña
+    	<c:if test="${review['new']}">Nueva </c:if> Reseña
     </h2>
     <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
         <div class="form-group has-feedback">
@@ -29,7 +29,7 @@
 	                        Crear reseña</button>
                     </c:when>
                     <c:otherwise>
-                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
+                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
                     </c:otherwise>
                 </c:choose>
                 </div>
diff --git a/src/main/webapp/WEB-INF/jsp/reviewsClient/createOrUpdateReviewForm.jsp b/src/main/webapp/WEB-INF/jsp/reviewsClient/createOrUpdateReviewForm.jsp
new file mode 100644
index 000000000..b124b0e26
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/reviewsClient/createOrUpdateReviewForm.jsp
@@ -0,0 +1,42 @@
+<%@ 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="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+
+<cheapy:layout pageName="reviewsN">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px">
+    	<c:if test="${review['new']}">Nueva </c:if> Reseña
+    </h2>
+    <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
+        <div class="form-group has-feedback">
+        	<form:hidden path="id"/>
+            <cheapy:textAreaField label="Opinión" name="opinion"/>
+           <!-- <cheapy:inputField label="Estrellas" name="stars"/>  -->
+            <cheapy:ratingStar label="Valoración" name="stars" disabled="false"></cheapy:ratingStar>
+        </div>
+        <div class="form-group">
+            <div class="col-sm-offset-2 col-sm-10">
+            	<div class="btn-mod">
+                <c:choose>
+                    <c:when test="${review['new']}">
+                        <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
+	                        <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
+	                        Crear reseña</button>
+                    </c:when>
+                    <c:otherwise>
+                        <button class="btn btn-default" type="submit">Modificar Reseña</button>
+                    </c:otherwise>
+                </c:choose>
+                </div>
+            </div>
+        </div>
+        
+        
+	
+    </form:form>
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsList.jsp b/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsList.jsp
new file mode 100644
index 000000000..606ba90c9
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsList.jsp
@@ -0,0 +1,93 @@
+<%@ 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="form" uri="http://www.springframework.org/tags/form" %>
+<%@ page contentType="text/html; charset=UTF-8" %>
+
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+
+<cheapy:layout pageName="reviews">
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="reviews"/></h2>
+
+    <table id="reviewTable" class="table table-striped">
+        <thead>
+	        <tr>
+	        	<!-- <th style="width: 150px;">Restaurante</th> -->
+	        	<th><fmt:message key="user"/></th>
+	        	<th><fmt:message key="stars"/></th>
+	            <th><fmt:message key="opinion"/></th>
+	            <th> </th>
+	        </tr>
+        </thead>
+        <tbody>
+        <c:choose>
+	        <c:when test="${empty reviewsLs}">
+	        	<tr><td colspan="4"><em><c:out value="No se ha realizado ninguna valoración por el momento."/></em></td></tr>
+	        </c:when>
+	        <c:otherwise>
+	        <c:forEach items="${reviewsLs}" var="review">
+	       
+	            <tr>
+	<!--                 <td> -->
+	<%--                     <c:out value="nombre por definir"/> <!-- ${review.usuario.nombre},${review.usuario.apellidos}  --> --%>
+	<!--                 </td> -->
+	                <td>
+	                    <c:out value="${review.escritor.username}"/>
+	                </td>
+	                <td>
+	                
+	                    <!--<c:out value="${review.stars}"/> -->
+	                    <cheapy:showStars value='${review.stars}'></cheapy:showStars>
+
+	                </td>
+	                <td>
+	                    <c:out value="${review.opinion}"/>
+	                </td>
+	                <td>
+		                <spring:url value="/reviewsClient/{reviewId}" var="reviewUrl">
+		                        <spring:param name="reviewId" value="${review.id}"/>
+		                </spring:url>
+		                <div class="btn-detalles">
+	                		<button type="button" role="link" onclick="window.location='${fn:escapeXml(reviewUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+	                		<span class="glyphicon glyphicon-info-sign" aria-hidden="true" style="padding: 5px"> </span>
+		                	<fmt:message key="details"/></button>
+	            		</div>
+	                </td> 
+	                  
+	            </tr>
+	           
+	        </c:forEach>
+	        </c:otherwise>
+        </c:choose>
+        </tbody>
+    </table>
+    <div class="text-center">
+    	<c:out value='Página ${page}'></c:out>
+    </div>
+    <c:if test='${page!=0}'>
+    <div class="text-left">
+    	<spring:url value="/reviewsClientList/{client}/{page}" var="reviewsListUrl">
+    		<spring:param name="page" value="${page-1}"/>
+    		<spring:param name="client" value="${client}"/>
+    	</spring:url>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. anterior</button>
+ 	</div>
+    </c:if>
+    
+    <c:if test="${fn:length(reviewsLs) == 6}">
+    <div class="text-right">
+    	<spring:url value="/reviewsClientList/{client}/{page}" var="reviewsListUrl">
+    		<spring:param name="page" value="${page+1}"/>
+    		<spring:param name="client" value="${client}"/>
+    	</spring:url>
+    	<button type="button" class="btn-pag" role="link" onclick="window.location='${fn:escapeXml(reviewsListUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+		<span class="glyphicon 	glyphicon glyphicon-arrow-right" aria-hidden="true" style="padding: 5px"> </span>
+		Pág. siguiente</button>
+	</div>
+	</c:if>
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsShow.jsp b/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsShow.jsp
new file mode 100644
index 000000000..094bab485
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/reviewsClient/reviewsShow.jsp
@@ -0,0 +1,52 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ 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" %>
+<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+
+<cheapy:layout pageName="review">
+
+
+    <h2 style="font-family: 'Lobster'; text-align:center; font-size:200%;  color: rgb(0, 64, 128); padding:10px"><fmt:message key="review"/></h2>
+
+    <form:form modelAttribute="review" class="form-horizontal" id="add-review-form">
+
+
+
+    <table class="table table-striped" id="review-table">
+        <tr>
+            <th><fmt:message key="stars"/></th>
+           <!--  <td><c:out value="${review.stars}"/></td>--> 
+            <td><cheapy:ratingStar label="" name="stars" disabled="true"></cheapy:ratingStar></td>
+        </tr>
+        <tr>
+            <th><fmt:message key="opinion"/></th>
+            <td><c:out value="${review.opinion}"/></td>
+        </tr>
+    
+    </table>
+    
+    </form:form>
+
+	<sec:authorize access="isAuthenticated()">
+	<sec:authentication var="principal" property="principal"  />
+	<div class="btns-edit">
+		<c:if test="${principal.username eq review.escritor.username}">
+	    	<spring:url value="{reviewId}/edit" var="editUrl">
+		    <spring:param name="reviewId" value="${review.id}"/>
+		    </spring:url>
+		    
+			<button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+	        <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
+		        Editar opinión</button>
+    	</c:if>
+    	
+    </div>
+    </sec:authorize>
+  
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/tags/showStars.tag b/src/main/webapp/WEB-INF/tags/showStars.tag
index f68844d5c..1fb11cb10 100644
--- a/src/main/webapp/WEB-INF/tags/showStars.tag
+++ b/src/main/webapp/WEB-INF/tags/showStars.tag
@@ -2,11 +2,14 @@
 <%@ tag language="java" pageEncoding="ISO-8859-1"%>
 <%@ attribute name="value" required="true" rtexprvalue="true" type="Integer"
               description="Number of starts" %>
+<%@ attribute name="label" required="false" rtexprvalue="true"
+              description="Label appears in red color if input is considered as invalid after submission" %>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
 <form>
-
-
+    <c:if test="${label}">
+        <label class="col-sm-2 control-label">${label}</label>
+	</c:if>
 <div class="rating"> 
 	<input type="radio" class="form-control" disabled name="rating" value="5" id="5" <%= value.equals(5)  ?"checked='checked'" : ""%> /><label for="5"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label> 		
 	<input type="radio" class="form-control" disabled name="rating" value="4" id="4" <%= value.equals(4) ? "checked='checked'" : ""  %> /><label for="4"><span style="font-size: 100%" class="estrella_vacia">&#9734;</span></label>