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

Avance en las vistas de modificacion de las ofertas

Browse source 
Se ha realizado la mayor parte de las vistas de modificacion de las ofertas, así como algunos cambios menores en las vistas de mostrar detalles
This commit is contained in:
Angel Caballero Dominguez 2021-03-28 15:27:46 +02:00
parent 8fc8fb0874
commit e3c9228185
10 changed files with 232 additions and 98 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -240,6 +240,30 @@ img.img-responsive{
background-color: rgb(40, 140, 215); background-color: rgb(40, 140, 215);
} }
.btn-mod{
display: table;
margin: 0 auto;
float:left;
}
.btn-mod button {
background-color: rgb(0, 64, 128);
border: 1px solid rgb(0, 0, 160);
color: white;
padding: 10px 24px;
cursor: pointer;
display: block;
}
.btn-mod button:not(:last-child) {
border-bottom: none;
}
.btn-mod button:hover {
background-color: rgb(40, 140, 215);
}
#foodOfferTable th { #foodOfferTable th {
width: 25%; width: 25%;
} }
@ -278,7 +302,52 @@ img.img-responsive{
.btn-return{ .btn-return{
display: table; display: table;
margin: 0 auto; margin: 0 auto;
width: 100%; float:left;
}
.btns-edit{
display: table;
margin: 0 auto;
float:right;
}
.btns-edit button{
background-color: rgb(0, 64, 128);
border: 1px solid rgb(0, 0, 160);
color: white;
padding: 10px 24px;
cursor: pointer;
}
.btns-edit button:not(:last-child) {
border-bottom: none;
}
.btns-edit button:hover {
background-color: rgb(40, 140, 215);
}
.btns-delete{
display: table;
margin: 0 auto;
float:left;
}
.btns-delete button{
background-color: rgb(0, 64, 128);
border: 1px solid rgb(0, 0, 160);
color: white;
padding: 10px 24px;
cursor: pointer;
}
.btns-delete button:not(:last-child) {
border-bottom: none;
}
.btns-delete button:hover {
background-color: rgb(40, 140, 215);
} }
.btn-return button { .btn-return button {
@ -288,14 +357,12 @@ img.img-responsive{
padding: 10px 24px; padding: 10px 24px;
cursor: pointer; cursor: pointer;
display: block; display: block;
left: 0%;
} }
.btn-return button:not(:last-child) { .btn-return button:not(:last-child) {
border-bottom: none; border-bottom: none;
} }
.btn-return button:hover { .btn-return button:hover {
background-color: rgb(40, 140, 215); background-color: rgb(40, 140, 215);
} }

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

@ -1,4 +1,8 @@
welcome=Bienvenido a welcome=Bienvenido a
new=Nueva
deleteOffer=Eliminar Oferta
cancel=Cancelar
deleteOfferMessage=Confirme que quiere eliminar su oferta
listOffers=Ver Ofertas listOffers=Ver Ofertas
foodOffers=Ofertas por plato especifico foodOffers=Ofertas por plato especifico
foodOffer=Oferta por plato especifico foodOffer=Oferta por plato especifico

27
src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp
View file

@ -5,10 +5,11 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<petclinic:layout pageName="foodOffers"> <petclinic:layout pageName="foodOffers">
<h2> <h2 style="text-align:center;padding:5px">
<c:if test="${foodOffer['new']}">New </c:if> FoodOffer <c:if test="${foodOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="foodOffer"/>
</h2> </h2>
<form:form modelAttribute="foodOffer" class="form-horizontal" id="add-foodOffer-form"> <form:form modelAttribute="foodOffer" class="form-horizontal" id="add-foodOffer-form">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
@ -22,14 +23,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<c:choose> <div class="btn-mod">
<c:when test="${foodOffer['new']}"> <c:choose>
<button class="btn btn-default" type="submit">Crear oferta</button> <c:when test="${foodOffer['new']}">
</c:when> <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<c:otherwise> <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
<button class="btn btn-default" type="submit">Modificar</button> Crear oferta</button>
</c:otherwise> </c:when>
</c:choose> <c:otherwise>
<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>
Modificar</button>
</c:otherwise>
</c:choose>
</div>
</div> </div>
</div> </div>
</form:form> </form:form>

38
src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp
View file

@ -29,7 +29,7 @@
</tr> </tr>
<tr> <tr>
<th><fmt:message key="discount"/></th> <th><fmt:message key="discount"/></th>
<td><c:out value="${foodOffer.discount}"/></td> <td><c:out value="${foodOffer.discount}"/> </td>
</tr> </tr>
<tr> <tr>
@ -39,20 +39,28 @@
</thead> </thead>
</table> </table>
<div class="btn-return"> <div class="btn-menu">
<button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> <div class="btn-return">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
<fmt:message key="return"/> </button> <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
</div> <fmt:message key="return"/> </button>
</div>
<spring:url value="{foodOfferId}/edit" var="editUrl"> <div class="btns-edit">
<spring:param name="foodOfferId" value="${foodOffer.id}"/> <spring:url value="{foodOfferId}/edit" var="editUrl">
</spring:url> <spring:param name="foodOfferId" value="${foodOffer.id}"/>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a> </spring:url>
<button type="button" role="link" onclick="window.location='${fn:escapeXml(editUrl)}'" style="font-family: 'Lobster'; font-size: 20px;">
<spring:url value="{foodOfferId}/disable" var="editUrl"> <span class="glyphicon glyphicon glyphicon-edit" aria-hidden="true" style="padding: 5px"> </span>
<spring:param name="foodOfferId" value="${foodOffer.id}"/> Editar oferta</button>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a> <spring:url value="{foodOfferId}/disable" var="editUrl">
<spring:param name="foodOfferId" value="${foodOffer.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-trash" aria-hidden="true" style="padding: 5px"> </span>
Desactivar oferta</button>
</div>
</div>
</cheapy:layout> </cheapy:layout>

27
src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp
View file

@ -5,10 +5,11 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<petclinic:layout pageName="NumOffers"> <petclinic:layout pageName="NumOffers">
<h2> <h2 style="text-align:center;padding:5px">
<c:if test="${nuOffer['new']}">New </c:if> NuOffer <c:if test="${nuOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="nuOffer"/>
</h2> </h2>
<form:form modelAttribute="nuOffer" class="form-horizontal" id="add-nuOffer-form"> <form:form modelAttribute="nuOffer" class="form-horizontal" id="add-nuOffer-form">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
@ -28,14 +29,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<c:choose> <div class="btn-mod">
<c:when test="${nuOffer['new']}"> <c:choose>
<button class="btn btn-default" type="submit">Crear oferta</button> <c:when test="${nuOffer['new']}">
</c:when> <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<c:otherwise> <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
<button class="btn btn-default" type="submit">Modificar</button> Crear oferta</button>
</c:otherwise> </c:when>
</c:choose> <c:otherwise>
<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>
Modificar</button>
</c:otherwise>
</c:choose>
</div>
</div> </div>
</div> </div>
</form:form> </form:form>

36
src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp
View file

@ -50,20 +50,28 @@
</tr> </tr>
</table> </table>
<div class="btn-return"> <div class="btn-menu">
<button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> <div class="btn-return">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
<fmt:message key="return"/> </button> <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
<fmt:message key="return"/> </button>
</div>
<div class="btns-edit">
<spring:url value="{nuOfferId}/edit" var="editUrl">
<spring:param name="nuOfferId" value="${nuOffer.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 oferta</button>
<spring:url value="{nuOfferId}/disable" var="editUrl">
<spring:param name="nuOfferId" value="${nuOffer.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-trash" aria-hidden="true" style="padding: 5px"> </span>
Desactivar oferta</button>
</div>
</div> </div>
<spring:url value="{nuOfferId}/edit" var="editUrl">
<spring:param name="nuOfferId" value="${nuOffer.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
<spring:url value="{nuOfferId}/disable" var="editUrl">
<spring:param name="nuOfferId" value="${nuOffer.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
</cheapy:layout> </cheapy:layout>

27
src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp
View file

@ -5,10 +5,11 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<petclinic:layout pageName="speedOffers"> <petclinic:layout pageName="speedOffers">
<h2> <h2 style="text-align:center;padding:5px">
<c:if test="${speedOffer['new']}">New </c:if> SpeedOffer <c:if test="${speedOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="speedOffer"/>
</h2> </h2>
<form:form modelAttribute="speedOffer" class="form-horizontal" id="add-speedOffer-form"> <form:form modelAttribute="speedOffer" class="form-horizontal" id="add-speedOffer-form">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
@ -26,14 +27,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<c:choose> <div class="btn-mod">
<c:when test="${speedOffer['new']}"> <c:choose>
<button class="btn btn-default" type="submit">Crear oferta</button> <c:when test="${speedOffer['new']}">
</c:when> <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<c:otherwise> <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
<button class="btn btn-default" type="submit">Modificar</button> Crear oferta</button>
</c:otherwise> </c:when>
</c:choose> <c:otherwise>
<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>
Modificar</button>
</c:otherwise>
</c:choose>
</div>
</div> </div>
</div> </div>
</form:form> </form:form>

35
src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp
View file

@ -50,20 +50,29 @@
</tr> </tr>
</table> </table>
<div class="btn-return"> <div class="btn-menu">
<button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> <div class="btn-return">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
<fmt:message key="return"/> </button> <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
<fmt:message key="return"/> </button>
</div>
<div class="btns-edit">
<spring:url value="{speedOfferId}/edit" var="editUrl">
<spring:param name="speedOfferId" value="${speedOffer.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 oferta</button>
<spring:url value="{speedOfferId}/disable" var="editUrl">
<spring:param name="speedOfferId" value="${speedOffer.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-trash" aria-hidden="true" style="padding: 5px"> </span>
Desactivar oferta</button>
</div>
</div> </div>
<spring:url value="{speedOfferId}/edit" var="editUrl">
<spring:param name="speedOfferId" value="${speedOffer.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a>
<spring:url value="{speedOfferId}/disable" var="editUrl">
<spring:param name="speedOfferId" value="${speedOffer.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
</cheapy:layout> </cheapy:layout>

27
src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp
View file

@ -5,10 +5,11 @@
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %> <%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags" %>
<link href='https://fonts.googleapis.com/css?family=Lobster' rel='stylesheet'>
<petclinic:layout pageName="TimeOffers"> <petclinic:layout pageName="TimeOffers">
<h2> <h2 style="text-align:center;padding:5px">
<c:if test="${timeOffer['new']}">New </c:if> TimeOffer <c:if test="${timeOffer['new']}"><fmt:message key="new"/> </c:if> <fmt:message key="timeOffer"/>
</h2> </h2>
<form:form modelAttribute="timeOffer" class="form-horizontal" id="add-timeOffer-form"> <form:form modelAttribute="timeOffer" class="form-horizontal" id="add-timeOffer-form">
<div class="form-group has-feedback"> <div class="form-group has-feedback">
@ -25,14 +26,20 @@
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-10"> <div class="col-sm-offset-2 col-sm-10">
<c:choose> <div class="btn-mod">
<c:when test="${timeOffer['new']}"> <c:choose>
<button class="btn btn-default" type="submit">Add Offer</button> <c:when test="${timeOffer['new']}">
</c:when> <button class="btn btn-default" type="submit" style="font-family: 'Lobster'; font-size: 20px;">
<c:otherwise> <span class="glyphicon glyphicon-floppy-save" aria-hidden="true" style="padding: 5px"> </span>
<button class="btn btn-default" type="submit">Update Offer</button> Crear oferta</button>
</c:otherwise> </c:when>
</c:choose> <c:otherwise>
<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>
Modificar</button>
</c:otherwise>
</c:choose>
</div>
</div> </div>
</div> </div>
</form:form> </form:form>

36
src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp
View file

@ -32,20 +32,30 @@
</thead> </thead>
</table> </table>
<spring:url value="{timeOfferId}/edit" var="editUrl"> <div class="btn-menu">
<spring:param name="timeOfferId" value="${timeOffer.id}"/> <div class="btn-return">
</spring:url> <button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;">
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Editar oferta</a> <span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span>
<fmt:message key="return"/> </button>
<spring:url value="{timeOfferId}/disable" var="editUrl"> </div>
<spring:param name="timeOfferId" value="${timeOffer.id}"/>
</spring:url>
<a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Desactivar oferta</a>
<div class="btn-return"> <div class="btns-edit">
<button type="button" role="link" onclick="window.location='/offers'" style="font-family: 'Lobster'; font-size: 20px;"> <spring:url value="{timeOfferId}/edit" var="editUrl">
<span class="glyphicon glyphicon-arrow-left" aria-hidden="true" style="padding: 5px"> </span> <spring:param name="timeOfferId" value="${timeOffer.id}"/>
<fmt:message key="return"/> </button> </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 oferta</button>
<spring:url value="{timeOfferId}/disable" var="editUrl">
<spring:param name="timeOfferId" value="${timeOffer.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-trash" aria-hidden="true" style="padding: 5px"> </span>
Desactivar oferta</button>
</div>
</div> </div>
</cheapy:layout> </cheapy:layout>