From 82ab37993471a7e1fc2d4ad8665a696ae190e5f9 Mon Sep 17 00:00:00 2001
From: abemorcardc <abemorcar@alum.us.es>
Date: Sun, 11 Apr 2021 17:58:18 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20funcionalidad=20de=20admin=20act?=
 =?UTF-8?q?iva=20cliente?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cheapy/web/AdministratorController.java   | 16 ++++++++++++
 .../WEB-INF/jsp/clients/clientActivate.jsp    | 25 +++++++++++++++++++
 .../webapp/WEB-INF/jsp/clients/clientShow.jsp | 14 +++++++++--
 3 files changed, 53 insertions(+), 2 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp

diff --git a/src/main/java/org/springframework/cheapy/web/AdministratorController.java b/src/main/java/org/springframework/cheapy/web/AdministratorController.java
index d5e001f77..82571e5f8 100644
--- a/src/main/java/org/springframework/cheapy/web/AdministratorController.java
+++ b/src/main/java/org/springframework/cheapy/web/AdministratorController.java
@@ -89,4 +89,20 @@ public class AdministratorController {
 		this.clientService.saveClient(client);
 		return "redirect:/administrators/clients";
 	}
+	
+	@GetMapping(value = "/administrators/clients/{username}/activate")
+	public String activateClient(@PathVariable("username") final String username, final ModelMap model) {
+
+		Client client = this.clientService.findByUsername(username);
+		model.put("client", client);
+		return "clients/clientActivate";
+	}
+	@PostMapping(value = "/administrators/clients/{username}/activate")
+	public String activateClientForm(@PathVariable("username") final String username, final ModelMap model, final HttpServletRequest request) {
+
+		Client client = this.clientService.findByUsername(username);
+		client.getUsuar().setEnabled(true);
+		this.clientService.saveClient(client);
+		return "redirect:/administrators/clients";
+	}
 }
diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp
new file mode 100644
index 000000000..07f6e365d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/clients/clientActivate.jsp
@@ -0,0 +1,25 @@
+<%@ page session="false" trimDirectiveWhitespaces="true"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%>
+<%@ 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" %>
+
+<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>
+      		
+      		<form:form modelAttribute="client" class="form-horizontal">
+            
+				      <div class="btns-edit2">
+        			<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
+        			<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+        			Activar</button>
+        		</div>
+        	</form:form>
+        
+    </jsp:body>
+    
+</cheapy:layout>
diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
index e83809451..d3e07db78 100644
--- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
+++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
@@ -69,16 +69,26 @@
 	          Borrar  cliente</button>
       </div>
       </sec:authorize>
-      <sec:authorize access="hasAnyAuthority('admin')">
+        <sec:authorize access="hasAnyAuthority('admin')">
 		<sec:authentication var="principal" property="principal" />
     	<div class="btns-edit">
-		
+		<c:if test="${ client.usuar.enabled eq true}">
 	        <spring:url value="/administrators/clients/{username}/disable" var="deactivateUrl">
 	        	<spring:param name="username" value="${client.usuar.username}"/>
 	        </spring:url>
 	        <button type="button" role="link" onclick="window.location='${fn:escapeXml(deactivateUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
 	        	<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
 	         Desactivar cliente</button>
+    	 </c:if>
+    	 
+    	 		<c:if test="${ client.usuar.enabled eq false}">
+	        <spring:url value="/administrators/clients/{username}/activate" var="activateUrl">
+	        	<spring:param name="username" value="${client.usuar.username}"/>
+	        </spring:url>
+	        <button type="button" role="link" onclick="window.location='${fn:escapeXml(activateUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
+	        	<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
+	         Activar cliente</button>
+    	 </c:if>
     	</div>
     </sec:authorize>
     </div>