DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-23 15:55:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #109 from cheapy-ispp/035-Fix-cliente-edita-su-información#108

Browse source 
Corregido el modificar municipio de cliente, y correcciones menores
This commit is contained in:
abemorcardc 2021-04-13 16:38:16 +02:00 committed by GitHub
commit 23fc965308
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 15 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/springframework/cheapy/web/ClientController.java
View file

@ -110,7 +110,7 @@ public class ClientController {
return ClientController.VIEWS_CREATE_OR_UPDATE_CLIENT;
}
BeanUtils.copyProperties(clienteSesion, clientEdit, "name", "email", "address","init", "finish","telephone", "description","food","usuar");
BeanUtils.copyProperties(clienteSesion, clientEdit, "name", "email", "address","init","municipio", "finish","telephone", "description","food","usuar");
clientEdit.getUsuar().setUsername(clienteSesion.getUsuar().getUsername());
clientEdit.getUsuar().setEnabled(true);
this.clientService.saveClient(clientEdit);

3
src/main/less/cheapy.less
View file

@ -81,6 +81,9 @@
}
}
.container {
width: 85%;
}
.container .text-muted {
margin: 20px 0;

3
src/main/resources/messages/messages_es.properties
View file

@ -69,4 +69,5 @@ users=Usuarios
nameUser=Nombre
surname= Apellidos
dni= DNI
usuario=Usuario
usuario=Usuario
municipio=Municipio

2
src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp
View file

@ -37,7 +37,7 @@
<td><c:out value="${client.address}"/> </td>
</tr><tr>
<tr>
<th><fmt:message key="municipioClient"/></th>
<th><fmt:message key="municipio"/></th>
<td><c:out value="${client.municipio}"/> </td>
</tr><tr>
<th><fmt:message key="telephone"/></th>

12
src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp
View file

@ -15,12 +15,12 @@
<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="Name" placeholder="Restaurante pepito" name="name"/>
<cheapy:inputField label="Nombre" placeholder="Restaurante pepito" name="name"/>
<cheapy:inputField label="Email" placeholder="" name="email"/>
<cheapy:inputField label="Dirección" placeholder="" name="address"/>
<cheapy:inputField label="Dirección" placeholder="" name="address"/>
<div class="form-group">
<label>Municipio: </label>
<select name="municipio">
@ -29,9 +29,9 @@
</c:forEach>
</select>
</div>
<cheapy:inputField label="telephone" placeholder="" name="telephone"/>
<cheapy:inputField label="description" placeholder="" name="description"/>
<cheapy:inputField label="food" placeholder="food" name="food"/>
<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>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">

9
src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp
View file

@ -64,13 +64,8 @@
-->
<cheapy:dateField label="Fecha de Inicio" name="start"></cheapy:dateField>
<script>
var date= document.getElementsByName("start")
date.replace('T', ' ');
</script>
<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="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"/>