-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
updated revision (added functional crud)
- Loading branch information
1 parent
1de9b9a
commit d0738d6
Showing
13 changed files
with
270 additions
and
68 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| /* | ||
| * To change this license header, choose License Headers in Project Properties. | ||
| * To change this template file, choose Tools | Templates | ||
| * and open the template in the editor. | ||
| */ | ||
| package dto; | ||
|
|
||
| import java.util.Date; | ||
| import java.util.Objects; | ||
|
|
||
| /** | ||
| * | ||
| * @author eduard | ||
| */ | ||
| public class RevisionCreateDTO { | ||
| private Long id; | ||
|
|
||
| private String dateOfRevision; | ||
|
|
||
| private String userId; | ||
|
|
||
| private String machineId; | ||
|
|
||
| private String info; | ||
|
|
||
| private boolean isFunctionable; | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public String getDateOfRevision() { | ||
| return dateOfRevision; | ||
| } | ||
|
|
||
| public void setDateOfRevision(String dateOfRevision) { | ||
| this.dateOfRevision = dateOfRevision; | ||
| } | ||
|
|
||
| public String getUser() { | ||
| return userId; | ||
| } | ||
|
|
||
| public void setUser(String user) { | ||
| this.userId = user; | ||
| } | ||
|
|
||
| public String getMachine() { | ||
| return machineId; | ||
| } | ||
|
|
||
| public void setMachine(String machine) { | ||
| this.machineId = machine; | ||
| } | ||
|
|
||
| public String getInfo() { | ||
| return info; | ||
| } | ||
|
|
||
| public void setInfo(String info) { | ||
| this.info = info; | ||
| } | ||
|
|
||
| public boolean isFunctionable() { | ||
| return isFunctionable; | ||
| } | ||
|
|
||
| public void setFunctionable(boolean functionable) { | ||
| isFunctionable = functionable; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "RevisionDTO{" + | ||
| "id=" + id + | ||
| ", dateOfRevision=" + dateOfRevision + | ||
| ", user=" + userId + | ||
| ", machine=" + machineId + | ||
| ", info='" + info + '\'' + | ||
| ", isFunctionable=" + isFunctionable + | ||
| '}'; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| final int prime = 13; | ||
| int result = 1; | ||
| result = prime * result + ((dateOfRevision == null) ? 0 : dateOfRevision.hashCode()); | ||
| result = prime * result + ((userId == null) ? 0 : userId.hashCode()); | ||
| result = prime * result + ((machineId == null) ? 0 : machineId.hashCode()); | ||
| result = prime * result + ((info == null) ? 0 : info.hashCode()); | ||
| return result; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object obj) { | ||
| if (obj == null) { | ||
| return false; | ||
| } | ||
| if (getClass() != obj.getClass()) { | ||
| return false; | ||
| } | ||
| final RevisionCreateDTO other = (RevisionCreateDTO) obj; | ||
| if (!Objects.equals(this.dateOfRevision, other.dateOfRevision)) { | ||
| return false; | ||
| } | ||
| if (!Objects.equals(this.userId, other.userId)) { | ||
| return false; | ||
| } | ||
| if (!Objects.equals(this.machineId, other.machineId)) { | ||
| return false; | ||
| } | ||
| if (!Objects.equals(this.info, other.info)) { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -54,6 +54,8 @@ public void loadData() throws IOException { | |
|
|
||
|
|
||
| User u = user("123456", "Luna", "Lovegood", "[email protected]", "800123456", new Date(), true); | ||
| User u1 = user("123456", "Sme", "taky", "[email protected]", "800223456", new Date(), true); | ||
|
|
||
|
|
||
| Revision r = revision(new Date(), m, u); | ||
| Revision r1 = revision(new Date(), m , u); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified
BIN
+216 Bytes
(110%)
service/target/classes/service/facade/RevisionFacadeImpl.class
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,44 @@ | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <%@ taglib prefix="form" uri="https://www.springframework.org/tags/form" %> | ||
|
|
||
| <%@ taglib prefix="c" uri="https://java.sun.com/jsp/jstl/core" %> | ||
| <%@ taglib tagdir="/WEB-INF/tags" prefix="my" %> | ||
| <%@ page contentType="text/html;charset=UTF-8" language="java" %> | ||
| <%@ taglib prefix="fmt" uri="https://java.sun.com/jsp/jstl/fmt" %> | ||
|
|
||
|
|
||
| <my:template title="${revision.id == null ? 'New revision' : 'Edit revision'}"> | ||
| <%@ taglib prefix="form" uri="https://www.springframework.org/tags/form" %> | ||
| <my:template title="Edit rental"> | ||
| <jsp:attribute name="body"> | ||
|
|
||
| <div class="container"> | ||
| <div class="col-md-6"> | ||
| <form:form id="${revision.id}" method="post" modelAttribute="revision" | ||
| action="${pageContext.request.contextPath}/revision/save"> | ||
| <form:hidden path="id" style="display:none"/> | ||
|
|
||
| <div class="form-group"> | ||
| <label for="name">Info about revision</label> | ||
| <form:input path="info" cssClass="form-control" id="name" placeholder="Name"/> | ||
| <p><form:errors path="info" cssClass="error" /></p> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <label for="name">Date of revision</label> | ||
| <form:input type="date" class="date" path="dateOfRevision" cssClass="form-control" id="name" placeholder="Name"/> | ||
| <p><form:errors path="dateOfRevision" cssClass="error" /></p> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <form:label path="machine" cssClass="col-sm-2 control-label">Machine</form:label> | ||
| <div class="col-sm-10"> | ||
| <div class="col-md-4"> | ||
| <form:form method="post" modelAttribute="revision" action="${editAction}"> | ||
| <div class="form-group"> | ||
| <label for="dateOfRevision">Date of Revision</label> | ||
| <form:input path="dateOfRevision" cssClass="form-control" id="dateOfRevision" placeholder="dateOfRevision" value="${revision.dateOfRevision}"/> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="info">Info</label> | ||
| <form:input path="info" cssClass="form-control" id="info" placeholder="info" value="${revision.info}"/> | ||
| </div> | ||
| <div class="form-group"> | ||
| <label for="price">Machine</label> | ||
| <form:select path="machine" cssClass="form-control"> | ||
| <c:forEach items="${machines}" var="m"> | ||
| <form:option value="${m.id}">${m.name}</form:option> | ||
| </c:forEach> | ||
| </form:select> | ||
| <p class="help-block"><form:errors path="machine" cssClass="error"/></p> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div class="form-group"> | ||
| <form:label path="user" cssClass="col-sm-2 control-label">User</form:label> | ||
| <div class="col-sm-10"> | ||
| <label for="usr">User</label> | ||
| <form:select path="user" cssClass="form-control"> | ||
| <c:forEach items="${users}" var="u"> | ||
| <form:option value="${u.id}">${u.surname}</form:option> | ||
| <form:option value="${u.email}">${u.email}</form:option> | ||
| </c:forEach> | ||
| </form:select> | ||
| <p class="help-block"><form:errors path="user" cssClass="error"/></p> | ||
| </div> | ||
| </div> | ||
|
|
||
|
|
||
|
|
||
| <button type="submit" class="btn btn-default">Submit</button> | ||
| <button type="submit" class="btn btn-default">Submit</button> | ||
| </form:form> | ||
| </div> | ||
| <p> | ||
| <a href="${pageContext.request.contextPath}/revision/">Back to revision</a> | ||
| </p> | ||
| </div> | ||
| </jsp:attribute> | ||
| </my:template> | ||
| </my:template> |
Oops, something went wrong.